[patch 02/26] Dynamic kernel command-line - alpha

Bernhard Walle
2007-01-18T13:04:17Z

[-- Attachment #1: dynamic-kernel-command-line-alpha.diff --]
[-- Type: text/plain, Size: 1351 bytes --]

1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.

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

---
arch/alpha/kernel/setup.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.20-rc4-mm1/arch/alpha/kernel/setup.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/arch/alpha/kernel/setup.c
+++ linux-2.6.20-rc4-mm1/arch/alpha/kernel/setup.c
@@ -122,7 +122,7 @@ static void get_sysnames(unsigned long,
char **, char **);
static void determine_cpu_caches (unsigned int);

-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

/*
* The format of "screen_info" is strange, and due to early
@@ -547,7 +547,7 @@ setup_arch(char **cmdline_p)
} else {
strlcpy(command_line, COMMAND_LINE, sizeof command_line);
}
- strcpy(saved_command_line, command_line);
+ strcpy(boot_command_line, command_line);
*cmdline_p = command_line;

/*
@@ -589,7 +589,7 @@ setup_arch(char **cmdline_p)
}

/* Replace the command line, now that we've killed it with strsep. */
- strcpy(command_line, saved_command_line);
+ strcpy(command_line, boot_command_line);

/* If we want SRM console printk echoing early, do it now. */
if (alpha_using_srm && srmcons_output) {

--