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

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

[PATCH] Dynamic kernel command-line: cris 



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

Signed-off-by: default avatarAlon Bar-Lev <alon.barlev@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bf4352c0

arch/cris/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct screen_info screen_info; 
extern int root_mountflags;

extern char _etext, _edata, _end;



char cris_command_line[COMMAND_LINE_SIZE] = { 0, };

char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };



extern const unsigned long text_start, edata; /* set by the linker script */

extern unsigned long dram_start, dram_end;
@@ -153,8 +153,8 @@ setup_arch(char **cmdline_p) 
#endif



	/* Save command line for future references. */

	memcpy(saved_command_line, cris_command_line, COMMAND_LINE_SIZE);

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

	memcpy(boot_command_line, cris_command_line, COMMAND_LINE_SIZE);

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



	/* give credit for the CRIS port */

	show_etrax_copyright();