[PATCH 16/26] Dynamic kernel command-line - powerpc

[Alon Bar-Lev <alon.barlev@gmail.com>]

Rename saved_command_line into boot_command_line.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

---

diff -urNp linux-2.6.18-rc5-mm1.org/arch/powerpc/kernel/legacy_serial.c linux-2.6.18-rc5-mm1/arch/powerpc/kernel/legacy_serial.c
--- linux-2.6.18-rc5-mm1.org/arch/powerpc/kernel/legacy_serial.c	2006-09-03 18:56:50.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/powerpc/kernel/legacy_serial.c	2006-09-03 19:47:58.000000000 +0300
@@ -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 -urNp linux-2.6.18-rc5-mm1.org/arch/powerpc/kernel/prom.c linux-2.6.18-rc5-mm1/arch/powerpc/kernel/prom.c
--- linux-2.6.18-rc5-mm1.org/arch/powerpc/kernel/prom.c	2006-09-03 18:56:50.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/powerpc/kernel/prom.c	2006-09-03 19:47:58.000000000 +0300
@@ -909,7 +909,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 -urNp linux-2.6.18-rc5-mm1.org/arch/powerpc/kernel/udbg.c linux-2.6.18-rc5-mm1/arch/powerpc/kernel/udbg.c
--- linux-2.6.18-rc5-mm1.org/arch/powerpc/kernel/udbg.c	2006-09-03 18:55:13.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/powerpc/kernel/udbg.c	2006-09-03 19:47:58.000000000 +0300
@@ -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 -urNp linux-2.6.18-rc5-mm1.org/arch/powerpc/platforms/powermac/setup.c linux-2.6.18-rc5-mm1/arch/powerpc/platforms/powermac/setup.c
--- linux-2.6.18-rc5-mm1.org/arch/powerpc/platforms/powermac/setup.c	2006-09-03 18:56:51.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/powerpc/platforms/powermac/setup.c	2006-09-03 19:47:58.000000000 +0300
@@ -505,8 +505,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) {

-- 
VGER BF report: H 0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/