2007-09-19 12:45:31

by Robert P. J. Day

Subject: [PATCH] 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.

Signed-off-by: Robert P. J. Day <[email protected]>

---

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.

diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 82cf708..480760b 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -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
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================

2007-09-20 06:53:44

by Haavard Skinnemoen

Subject: Re: [PATCH] AVR32: Drop support for redundant "keepinitrd" boot-time parm.

On Wed, 19 Sep 2007 08:43:42 -0400 (EDT)
"Robert P. J. Day" <[email protected]> wrote:

>
> Given the existing "retain_initrd" boot-time parameter defined in
> init/initramfs.c, there appears to be no need for the equivalent
> "keepinitrd" parameter.
>
> Signed-off-by: Robert P. J. Day <[email protected]>

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