Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8757b21 authored by Alon Bar-Lev's avatar Alon Bar-Lev Committed by Linus Torvalds
Browse files

[PATCH] Dynamic kernel command-line: powerpc 



Rename saved_command_line into boot_command_line.

Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 668f9931

arch/powerpc/kernel/legacy_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int __init check_legacy_serial_console(void) 
	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;

	}

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ void __init early_init_devtree(void *params) 
	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... */

arch/powerpc/kernel/udbg.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,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;

	}

arch/powerpc/platforms/powermac/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -506,8 +506,8 @@ void note_bootable_part(dev_t dev, int part, int goodness) 
	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) {