Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ba36197cf4ff68f631bb1b3d4cc442d567279fe3
Commit:     ba36197cf4ff68f631bb1b3d4cc442d567279fe3
Parent:     f3d2229852697062d530f19742f0ab792b92873d
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Mon May 14 17:48:00 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Fri Jun 8 02:43:38 2007 +0000

    sh: Fixup cmdline handling from machvec changes.
    
    The command line wasn't being saved off properly after the machvec
    changes went in, fix it up.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/setup.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 0ad7158..65c0931 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -194,10 +194,6 @@ void __init setup_arch(char **cmdline_p)
 {
        enable_mmu();
 
-#ifdef CONFIG_CMDLINE_BOOL
-       strcpy(COMMAND_LINE, CONFIG_CMDLINE);
-#endif
-
        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
 
 #ifdef CONFIG_BLK_DEV_RAM
@@ -221,9 +217,14 @@ void __init setup_arch(char **cmdline_p)
        memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
        memory_end = memory_start + __MEMORY_SIZE;
 
-       /* Save unparsed command line copy for /proc/cmdline */
-       strlcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
+#ifdef CONFIG_CMDLINE_BOOL
+       strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line));
+#else
+       strlcpy(command_line, COMMAND_LINE, sizeof(command_line));
+#endif
 
+       /* Save unparsed command line copy for /proc/cmdline */
+       memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
        *cmdline_p = command_line;
 
        parse_early_param();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to