Skip to contentSkip to conversation

AVR32: Drop support for redundant "keepinitrd" boot-time parm.

PATCH Applied Robert P. J. Day 2 participants 2 messages Sep 19, 2007 – Sep 20, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 AVR32: Drop support for redundant "keepinitrd" boot-time parm.

Given the existing "retain_initrd" boot-time parameter defined in init/initramfs.c, there appears to be no need for the equivalent "keepinitrd" parameter.

---

not compile-tested, so i'll leave it with haavard to make the final
call.

the arm architecture also defines that same parm, and it may very
well be redundant, too.

arch/avr32/mm/init.c +1 -11
index 82cf708..480760b 100644
@@ -224,19 +224,9 @@ void free_initmem(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
 
-static int keep_initrd;
-
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-	if (!keep_initrd)
-		free_area(start, end, "initrd");
-}
-
-static int __init keepinitrd_setup(char *__unused)
-{
-	keep_initrd = 1;
-	return 1;
+	free_area(start, end, "initrd");
 }
 
-__setup("keepinitrd", keepinitrd_setup);
 #endif
Signature · 7 lines
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================
#1 lore raw
Quoted 6 lines · On Wed, 19 Sep 2007 08:43:42 -0400 (EDT) "Robert P. J. Day"…

Given the existing "retain_initrd" boot-time parameter defined in init/initramfs.c, there appears to be no need for the equivalent "keepinitrd" parameter.

Applied, thanks.

If anyone are actually using the "keepinitrd" option on AVR32 (I doubt it since you have to read the source to know that it even exists), please use "retain_initrd" instead.

Håvard