Skip to content

Commit

Permalink
[PATCH] Dynamic kernel command-line: fixups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alon Bar-Lev authored and Linus Torvalds committed Feb 12, 2007
1 parent d3e9cce commit 7a3a06d
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 12 deletions.
2 changes: 0 additions & 2 deletions arch/ia64/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,6 @@ efi_map_pal_code (void)
ia64_srlz_i();
}

extern char __initdata boot_command_line[];

void __init
efi_init (void)
{
Expand Down
2 changes: 0 additions & 2 deletions arch/ia64/kernel/sal.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ sal_desc_ap_wakeup (void *p)
}
}

extern char __initdata boot_command_line[];

static void __init
chk_nointroute_opt(void)
{
Expand Down
1 change: 0 additions & 1 deletion arch/parisc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
2 changes: 0 additions & 2 deletions arch/um/include/user_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions arch/um/kernel/um_arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions arch/x86_64/kernel/head64.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022

extern char __initdata boot_command_line[];

static void __init copy_bootdata(char *real_mode_data)
{
int new_data;
Expand Down

0 comments on commit 7a3a06d

Please sign in to comment.