[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <2261.1190276148@neuling.org>
Date: Thu, 20 Sep 2007 18:15:48 +1000
From: Michael Neuling <mikey@...ling.org>
To: Russell King <rmk+lkml@....linux.org.uk>
cc: "Robert P. J. Day" <rpjday@...dspring.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] ARM: Drop support for redundant "keepinitrd" boot-time param.
> NAK. "keepinitrd" is what people expect on ARM.
>
> I'm frustrated that whoever invented "retain_initrd" didn't look
> around in the documentation to see if there was any existing
> implementation first. The generic implementation should be fixed
> IMHO, or at least the option string moved into init/initramfs.c.
Sorry about that. I'm happy to change retain_initrd to keep keepinitrd.
I don't think many people are using retain_initrd anyway (other than me
and some people I work with).
Otherwise we can support both for a while with something like (and
Robert's patch)....
From: Michael Neuling <mikey@...ling.org>
Make keepinitrd the same as retain_initrd for backwards compatibility
with ARM/AVR32
Signed-off-by: Michael Neuling <mikey@...ling.org>
---
init/initramfs.c | 7 +++++++
1 file changed, 7 insertions(+)
Index: linux-2.6-ozlabs/init/initramfs.c
===================================================================
--- linux-2.6-ozlabs.orig/init/initramfs.c
+++ linux-2.6-ozlabs/init/initramfs.c
@@ -502,6 +502,13 @@ static int __init retain_initrd_param(ch
}
__setup("retain_initrd", retain_initrd_param);
+/* for backwards compatibility with ARM/AVR32 */
+static int __init keepinitrd_param(char *str)
+{
+ return retain_initrd_param(str);
+}
+__setup("keepinitrd", keepinitrd_param);
+
extern char __initramfs_start[], __initramfs_end[];
#ifdef CONFIG_BLK_DEV_INITRD
#include <linux/initrd.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists