From: Alon Bar-Lev Rename saved_command_line into boot_command_line. Signed-off-by: Alon Bar-Lev Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton --- arch/powerpc/kernel/legacy_serial.c | 2 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/udbg.c | 2 +- arch/powerpc/platforms/powermac/setup.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/powerpc/kernel/legacy_serial.c~dynamic-kernel-command-line-powerpc arch/powerpc/kernel/legacy_serial.c --- a/arch/powerpc/kernel/legacy_serial.c~dynamic-kernel-command-line-powerpc +++ a/arch/powerpc/kernel/legacy_serial.c @@ -498,7 +498,7 @@ static int __init check_legacy_serial_co DBG(" -> check_legacy_serial_console()\n"); /* The user has requested a console so this is already set up. */ - if (strstr(saved_command_line, "console=")) { + if (strstr(boot_command_line, "console=")) { DBG(" console was specified !\n"); return -EBUSY; } diff -puN arch/powerpc/kernel/prom.c~dynamic-kernel-command-line-powerpc arch/powerpc/kernel/prom.c --- a/arch/powerpc/kernel/prom.c~dynamic-kernel-command-line-powerpc +++ a/arch/powerpc/kernel/prom.c @@ -991,7 +991,7 @@ void __init early_init_devtree(void *par of_scan_flat_dt(early_init_dt_scan_memory, NULL); /* Save command line for /proc/cmdline and then parse parameters */ - strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE); + strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); parse_early_param(); /* Reserve LMB regions used by kernel, initrd, dt, etc... */ diff -puN arch/powerpc/kernel/udbg.c~dynamic-kernel-command-line-powerpc arch/powerpc/kernel/udbg.c --- a/arch/powerpc/kernel/udbg.c~dynamic-kernel-command-line-powerpc +++ a/arch/powerpc/kernel/udbg.c @@ -146,7 +146,7 @@ void __init disable_early_printk(void) { if (!early_console_initialized) return; - if (strstr(saved_command_line, "udbg-immortal")) { + if (strstr(boot_command_line, "udbg-immortal")) { printk(KERN_INFO "early console immortal !\n"); return; } diff -puN arch/powerpc/platforms/powermac/setup.c~dynamic-kernel-command-line-powerpc arch/powerpc/platforms/powermac/setup.c --- a/arch/powerpc/platforms/powermac/setup.c~dynamic-kernel-command-line-powerpc +++ a/arch/powerpc/platforms/powermac/setup.c @@ -506,8 +506,8 @@ void note_bootable_part(dev_t dev, int p if ((goodness <= current_root_goodness) && ROOT_DEV != DEFAULT_ROOT_DEVICE) return; - p = strstr(saved_command_line, "root="); - if (p != NULL && (p == saved_command_line || p[-1] == ' ')) + p = strstr(boot_command_line, "root="); + if (p != NULL && (p == boot_command_line || p[-1] == ' ')) return; if (!found_boot) { _