aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2007-02-12 03:54:23 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:39 -0500
commit19bf7e7a414711dec0058556feda778105798f99 (patch)
tree6b3bed6c16e14c8c0ef80ce7a299a5c0a78fe151 /arch/um
parent383464c0fb067f5beb96e28ff376d2280808dd54 (diff)
[PATCH] Dynamic kernel command-line: um
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: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/user_util.h2
-rw-r--r--arch/um/kernel/um_arch.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 06625fefef3..0f63003a2a3 100644
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -38,7 +38,7 @@ extern unsigned long long highmem;
38 38
39extern char host_info[]; 39extern char host_info[];
40 40
41extern char saved_command_line[]; 41extern char __initdata boot_command_line[];
42 42
43extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; 43extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
44extern unsigned long _unprotected_end; 44extern unsigned long _unprotected_end;
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 84e57f6da1d..668eba2d2e8 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -481,7 +481,7 @@ void __init setup_arch(char **cmdline_p)
481 atomic_notifier_chain_register(&panic_notifier_list, 481 atomic_notifier_chain_register(&panic_notifier_list,
482 &panic_exit_notifier); 482 &panic_exit_notifier);
483 paging_init(); 483 paging_init();
484 strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); 484 strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
485 *cmdline_p = command_line; 485 *cmdline_p = command_line;
486 setup_hostinfo(); 486 setup_hostinfo();
487} 487}