summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-09-19 08:43:42 -0400
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2007-10-11 12:16:57 +0200
commit193fdd1a99db8623697cb18a13dbcaa4eadbb1f2 (patch)
tree72dfb77b4168a59b9e15bcd86103a5982ef6f263
parentb5a8e7362a0a5088ac080086d41cd98a54e0791b (diff)
downloadop-kernel-dev-193fdd1a99db8623697cb18a13dbcaa4eadbb1f2.zip
op-kernel-dev-193fdd1a99db8623697cb18a13dbcaa4eadbb1f2.tar.gz
[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>
-rw-r--r--arch/avr32/mm/init.c12
1 files changed, 1 insertions, 11 deletions
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
OpenPOWER on IntegriCloud