From: Alon Bar-Lev 1. Rename saved_command_line into boot_command_line. 2. Set command_line as __initdata. Signed-off-by: Alon Bar-Lev Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/i386/kernel/head.S | 2 +- arch/i386/kernel/setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/i386/kernel/head.S~dynamic-kernel-command-line-i386 arch/i386/kernel/head.S --- a/arch/i386/kernel/head.S~dynamic-kernel-command-line-i386 +++ a/arch/i386/kernel/head.S @@ -104,7 +104,7 @@ ENTRY(startup_32) movzwl OLD_CL_OFFSET,%esi addl $(OLD_CL_BASE_ADDR),%esi 2: - movl $(saved_command_line - __PAGE_OFFSET),%edi + movl $(boot_command_line - __PAGE_OFFSET),%edi movl $(COMMAND_LINE_SIZE/4),%ecx rep movsl diff -puN arch/i386/kernel/setup.c~dynamic-kernel-command-line-i386 arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c~dynamic-kernel-command-line-i386 +++ a/arch/i386/kernel/setup.c @@ -133,7 +133,7 @@ unsigned long saved_videomode; #define RAMDISK_PROMPT_FLAG 0x8000 #define RAMDISK_LOAD_FLAG 0x4000 -static char command_line[COMMAND_LINE_SIZE]; +static char __initdata command_line[COMMAND_LINE_SIZE]; unsigned char __initdata boot_params[PARAM_SIZE]; @@ -577,7 +577,7 @@ void __init setup_arch(char **cmdline_p) print_memory_map("user"); } - strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE); + strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; max_low_pfn = setup_memory(); _