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

Commit 64d5a70f authored by Alon Bar-Lev's avatar Alon Bar-Lev Committed by Linus Torvalds
Browse files

[PATCH] Dynamic kernel command-line: arm26 



1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.

Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: Ian Molton <spyro@f2s.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd81899a

arch/arm26/kernel/setup.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ unsigned long phys_initrd_size __initdata = 0; 
static struct meminfo meminfo __initdata = { 0, };

static struct meminfo meminfo __initdata = { 0, };

static struct proc_info_item proc_info;

static struct proc_info_item proc_info;

static const char *machine_name;

static const char *machine_name;

static char command_line[COMMAND_LINE_SIZE];

static char __initdata command_line[COMMAND_LINE_SIZE];





static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;

static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
@@ -492,8 +492,8 @@ void __init setup_arch(char **cmdline_p) 
	init_mm.end_data   = (unsigned long) &_edata;

	init_mm.end_data   = (unsigned long) &_edata;

	init_mm.brk	   = (unsigned long) &_end;

	init_mm.brk	   = (unsigned long) &_end;





	memcpy(saved_command_line, from, COMMAND_LINE_SIZE);

	memcpy(boot_command_line, from, COMMAND_LINE_SIZE);

	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';

	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';

	parse_cmdline(&meminfo, cmdline_p, from);

	parse_cmdline(&meminfo, cmdline_p, from);

	bootmem_init(&meminfo);

	bootmem_init(&meminfo);

	paging_init(&meminfo);

	paging_init(&meminfo);