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

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

[PATCH] Dynamic kernel command-line: arm 



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: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3c253ca0

arch/arm/kernel/setup.c

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

static struct meminfo meminfo __initdata = { 0, };

static const char *cpu_name;

static const char *cpu_name;

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;

static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };

static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@ -803,8 +803,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(cmdline_p, from);

	parse_cmdline(cmdline_p, from);

	paging_init(&meminfo, mdesc);

	paging_init(&meminfo, mdesc);

	request_standard_resources(&meminfo, mdesc);

	request_standard_resources(&meminfo, mdesc);