OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Alon Bar-Lev 2007-02-12 00:54:26 -08:00 committed by Linus Torvalds
parent d3e9cceafd
commit 7a3a06d0e1
6 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/kernel/efi.c
View File

@ -405,8 +405,6 @@ efi_map_pal_code (void)
ia64_srlz_i(); ia64_srlz_i();
} }
extern char __initdata boot_command_line[];
void __init void __init
efi_init (void) efi_init (void)
{ {

2
arch/ia64/kernel/sal.c
View File

@ -190,8 +190,6 @@ sal_desc_ap_wakeup (void *p)
} }
} }
extern char __initdata boot_command_line[];
static void __init static void __init
chk_nointroute_opt(void) chk_nointroute_opt(void)
{ {

1
arch/parisc/mm/init.c
View File

@ -77,7 +77,6 @@ static void __init mem_limit_func(void)
{ {
char *cp, *end; char *cp, *end;
unsigned long limit; unsigned long limit;
extern char __initdata boot_command_line[];
/* We need this before __setup() functions are called */ /* We need this before __setup() functions are called */

2
arch/um/include/user_util.h
View File

@ -38,8 +38,6 @@ extern unsigned long long highmem;
extern char host_info[]; extern char host_info[];
extern char __initdata boot_command_line[];
extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
extern unsigned long _unprotected_end; extern unsigned long _unprotected_end;
extern unsigned long brk_start; extern unsigned long brk_start;

6
arch/um/kernel/um_arch.c
View File

@ -43,9 +43,9 @@
#define DEFAULT_COMMAND_LINE "root=98:0" #define DEFAULT_COMMAND_LINE "root=98:0"
/* Changed in linux_main and setup_arch, which run before SMP is started */ /* 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) { if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
printf("add_arg: Too many command line arguments!\n"); printf("add_arg: Too many command line arguments!\n");
@ -330,7 +330,7 @@ EXPORT_SYMBOL(end_iomem);
extern char __binary_start; 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 avail, diff;
unsigned long virtmem_size, max_physmem; unsigned long virtmem_size, max_physmem;

2
arch/x86_64/kernel/head64.c
View File

@ -34,8 +34,6 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000 #define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022 #define OLD_CL_OFFSET 0x90022
extern char __initdata boot_command_line[];
static void __init copy_bootdata(char *real_mode_data) static void __init copy_bootdata(char *real_mode_data)
{ {
int new_data; int new_data;