From: Robert P. J. Day <rpjday@mindspring.com>
Date: Wed, 19 Sep 2007 12:43:42 +0000 (-0400)
Subject: [AVR32] Drop support for redundant "keepinitrd" boot-time parm.
X-Git-Tag: v2.6.24-rc1~1461^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193fdd1a99db8623697cb18a13dbcaa4eadbb1f2;p=linux-2.6

[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 <rpjday@mindspring.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---

diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 82cf70854b..480760bde6 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