From bfc551d41dc302ef46f3fb4b426cd69f05c03a87 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Mon, 12 Feb 2007 00:54:23 -0800 Subject: [PATCH] --- yaml --- r: 48020 b: refs/heads/master c: 19bf7e7a414711dec0058556feda778105798f99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/include/user_util.h | 2 +- trunk/arch/um/kernel/um_arch.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca40a1ddb118..d928cc906c03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 383464c0fb067f5beb96e28ff376d2280808dd54 +refs/heads/master: 19bf7e7a414711dec0058556feda778105798f99 diff --git a/trunk/arch/um/include/user_util.h b/trunk/arch/um/include/user_util.h index 06625fefef33..0f63003a2a35 100644 --- a/trunk/arch/um/include/user_util.h +++ b/trunk/arch/um/include/user_util.h @@ -38,7 +38,7 @@ extern unsigned long long highmem; extern char host_info[]; -extern char saved_command_line[]; +extern char __initdata boot_command_line[]; extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; extern unsigned long _unprotected_end; diff --git a/trunk/arch/um/kernel/um_arch.c b/trunk/arch/um/kernel/um_arch.c index 84e57f6da1d3..668eba2d2e83 100644 --- a/trunk/arch/um/kernel/um_arch.c +++ b/trunk/arch/um/kernel/um_arch.c @@ -481,7 +481,7 @@ void __init setup_arch(char **cmdline_p) atomic_notifier_chain_register(&panic_notifier_list, &panic_exit_notifier); paging_init(); - strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); + strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; setup_hostinfo(); }