[PATCH] Dynamic kernel command-line: powerpc
Rename saved_command_line into boot_command_line. Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
668f9931c8
Коммит
b8757b21f7
|
@ -498,7 +498,7 @@ static int __init check_legacy_serial_console(void)
|
||||||
DBG(" -> check_legacy_serial_console()\n");
|
DBG(" -> check_legacy_serial_console()\n");
|
||||||
|
|
||||||
/* The user has requested a console so this is already set up. */
|
/* 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");
|
DBG(" console was specified !\n");
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
|
@ -991,7 +991,7 @@ void __init early_init_devtree(void *params)
|
||||||
of_scan_flat_dt(early_init_dt_scan_memory, NULL);
|
of_scan_flat_dt(early_init_dt_scan_memory, NULL);
|
||||||
|
|
||||||
/* Save command line for /proc/cmdline and then parse parameters */
|
/* 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();
|
parse_early_param();
|
||||||
|
|
||||||
/* Reserve LMB regions used by kernel, initrd, dt, etc... */
|
/* Reserve LMB regions used by kernel, initrd, dt, etc... */
|
||||||
|
|
|
@ -150,7 +150,7 @@ void __init disable_early_printk(void)
|
||||||
{
|
{
|
||||||
if (!early_console_initialized)
|
if (!early_console_initialized)
|
||||||
return;
|
return;
|
||||||
if (strstr(saved_command_line, "udbg-immortal")) {
|
if (strstr(boot_command_line, "udbg-immortal")) {
|
||||||
printk(KERN_INFO "early console immortal !\n");
|
printk(KERN_INFO "early console immortal !\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -506,8 +506,8 @@ void note_bootable_part(dev_t dev, int part, int goodness)
|
||||||
if ((goodness <= current_root_goodness) &&
|
if ((goodness <= current_root_goodness) &&
|
||||||
ROOT_DEV != DEFAULT_ROOT_DEVICE)
|
ROOT_DEV != DEFAULT_ROOT_DEVICE)
|
||||||
return;
|
return;
|
||||||
p = strstr(saved_command_line, "root=");
|
p = strstr(boot_command_line, "root=");
|
||||||
if (p != NULL && (p == saved_command_line || p[-1] == ' '))
|
if (p != NULL && (p == boot_command_line || p[-1] == ' '))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!found_boot) {
|
if (!found_boot) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче