diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 00:54:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:48:39 -0800 |
| commit | 7a3a06d0e158fc82a6bf13e18439285c7791d2b8 (patch) | |
| tree | 0418ae2c23ee398e3926fe2f5ed3290aba883fff /arch/um | |
| parent | d3e9cceafd9c886561f602bcdcb03efd96e187ab (diff) | |
| download | linux-3.10-7a3a06d0e158fc82a6bf13e18439285c7791d2b8.tar.gz linux-3.10-7a3a06d0e158fc82a6bf13e18439285c7791d2b8.tar.bz2 linux-3.10-7a3a06d0e158fc82a6bf13e18439285c7791d2b8.zip | |
[PATCH] Dynamic kernel command-line: fixups
Remove in-source externs, linux/init.h is included in all cases.
This is a fixups for "Dynamic kernel command-line" patch.
It also includes some uml __init fixups so that we can __initdata also its
command_line.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
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.h | 2 | ||||
| -rw-r--r-- | arch/um/kernel/um_arch.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index 0f63003a2a3..023575f6734 100644 --- a/arch/um/include/user_util.h +++ b/arch/um/include/user_util.h @@ -38,8 +38,6 @@ extern unsigned long long highmem; extern char host_info[]; -extern char __initdata boot_command_line[]; - extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; extern unsigned long _unprotected_end; extern unsigned long brk_start; diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 668eba2d2e8..89c6dba731f 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -43,9 +43,9 @@ #define DEFAULT_COMMAND_LINE "root=98:0" /* Changed in linux_main and setup_arch, which run before SMP is started */ -static char command_line[COMMAND_LINE_SIZE] = { 0 }; +static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 }; -static void add_arg(char *arg) +static void __init add_arg(char *arg) { if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) { printf("add_arg: Too many command line arguments!\n"); @@ -330,7 +330,7 @@ EXPORT_SYMBOL(end_iomem); extern char __binary_start; -int linux_main(int argc, char **argv) +int __init linux_main(int argc, char **argv) { unsigned long avail, diff; unsigned long virtmem_size, max_physmem; |