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

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

[PATCH] Dynamic kernel command-line: xtensa 



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: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent adf48856

arch/xtensa/kernel/setup.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ extern unsigned long loops_per_jiffy; 




/* Command line specified as configuration option. */

/* Command line specified as configuration option. */





static char command_line[COMMAND_LINE_SIZE];

static char __initdata command_line[COMMAND_LINE_SIZE];





#ifdef CONFIG_CMDLINE_BOOL

#ifdef CONFIG_CMDLINE_BOOL

static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;

static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
@@ -253,8 +253,8 @@ void __init setup_arch(char **cmdline_p) 
	extern int mem_reserve(unsigned long, unsigned long, int);

	extern int mem_reserve(unsigned long, unsigned long, int);

	extern void bootmem_init(void);

	extern void bootmem_init(void);





	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);

	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);

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

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

	*cmdline_p = command_line;

	*cmdline_p = command_line;





	/* Reserve some memory regions */

	/* Reserve some memory regions */