浏览代码

[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>
Alon Bar-Lev 18 年之前
父节点
当前提交
7a3a06d0e1
共有 6 个文件被更改,包括 3 次插入12 次删除
  1. 0 2
      arch/ia64/kernel/efi.c
  2. 0 2
      arch/ia64/kernel/sal.c
  3. 0 1
      arch/parisc/mm/init.c
  4. 0 2
      arch/um/include/user_util.h
  5. 3 3
      arch/um/kernel/um_arch.c
  6. 0 2
      arch/x86_64/kernel/head64.c

+ 0 - 2
arch/ia64/kernel/efi.c

@@ -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)
 {
 {

+ 0 - 2
arch/ia64/kernel/sal.c

@@ -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)
 {
 {

+ 0 - 1
arch/parisc/mm/init.c

@@ -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 */
 
 

+ 0 - 2
arch/um/include/user_util.h

@@ -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;

+ 3 - 3
arch/um/kernel/um_arch.c

@@ -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;

+ 0 - 2
arch/x86_64/kernel/head64.c

@@ -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;