Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a3a06d0 authored by Alon Bar-Lev's avatar Alon Bar-Lev Committed by Linus Torvalds
Browse files

[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: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d3e9ccea

arch/ia64/kernel/efi.c

+0 −2
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ efi_map_pal_code (void) 
	ia64_srlz_i();

}



extern char __initdata boot_command_line[];



void __init

efi_init (void)

{

arch/ia64/kernel/sal.c

+0 −2
Original line number Diff line number Diff line
@@ -190,8 +190,6 @@ sal_desc_ap_wakeup (void *p) 
	}

}



extern char __initdata boot_command_line[];



static void __init

chk_nointroute_opt(void)

{

arch/parisc/mm/init.c

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static void __init mem_limit_func(void) 
{

	char *cp, *end;

	unsigned long limit;

	extern char __initdata boot_command_line[];



	/* We need this before __setup() functions are called */

arch/um/include/user_util.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

arch/um/kernel/um_arch.c

+3 −3
Original line number Diff line number Diff line
@@ -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;