Merge branch 'sh/stable-updates' into sh/for-2.6.30

1 files changed, 6 insertions, 1 deletions

diff --git a/init/main.c b/init/main.c
index 3585f073d636..3bbf93be744c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -492,6 +492,11 @@ static int __init do_early_param(char *param, char *val)
         return 0;
 }
 
+void __init parse_early_options(char *cmdline)
+{
+        parse_args("early options", cmdline, NULL, 0, do_early_param);
+}
+
 /* Arch code calls this early on, or if not, just before other parsing. */
 void __init parse_early_param(void)
 {
@@ -503,7 +508,7 @@ void __init parse_early_param(void)
 
         /* All fall through to do_early_param. */
         strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
-        parse_args("early options", tmp_cmdline, NULL, 0, do_early_param);
+        parse_early_options(tmp_cmdline);
         done = 1;
 }