aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2007-02-12 03:54:25 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:39 -0500
commitadf48856db47f4f0f661f2f4b7004890408135cf (patch)
tree04bc4bf2ffb77458aa9945829b3eeb616334f2b3 /arch/x86_64/kernel/setup.c
parent712f77b5659208b43c925e1b28c4f44891c4d94f (diff)
[PATCH] Dynamic kernel command-line: x86_64
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> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r--arch/x86_64/kernel/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index af425a8049fb..60477244d1a3 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -100,7 +100,7 @@ EXPORT_SYMBOL_GPL(edid_info);
100 100
101extern int root_mountflags; 101extern int root_mountflags;
102 102
103char command_line[COMMAND_LINE_SIZE]; 103char __initdata command_line[COMMAND_LINE_SIZE];
104 104
105struct resource standard_io_resources[] = { 105struct resource standard_io_resources[] = {
106 { .name = "dma1", .start = 0x00, .end = 0x1f, 106 { .name = "dma1", .start = 0x00, .end = 0x1f,
@@ -343,7 +343,7 @@ static void discover_ebda(void)
343 343
344void __init setup_arch(char **cmdline_p) 344void __init setup_arch(char **cmdline_p)
345{ 345{
346 printk(KERN_INFO "Command line: %s\n", saved_command_line); 346 printk(KERN_INFO "Command line: %s\n", boot_command_line);
347 347
348 ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); 348 ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
349 screen_info = SCREEN_INFO; 349 screen_info = SCREEN_INFO;
@@ -373,7 +373,7 @@ void __init setup_arch(char **cmdline_p)
373 373
374 early_identify_cpu(&boot_cpu_data); 374 early_identify_cpu(&boot_cpu_data);
375 375
376 strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE); 376 strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
377 *cmdline_p = command_line; 377 *cmdline_p = command_line;
378 378
379 parse_early_param(); 379 parse_early_param();