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

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

[PATCH] Dynamic kernel command-line: m32r 



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: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8d91b84

arch/m32r/kernel/setup.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ struct screen_info screen_info = { 




extern int root_mountflags;

extern int root_mountflags;





static char command_line[COMMAND_LINE_SIZE];

static char __initdata command_line[COMMAND_LINE_SIZE];





static struct resource data_resource = {

static struct resource data_resource = {

	.name   = "Kernel data",

	.name   = "Kernel data",
@@ -95,8 +95,8 @@ static __inline__ void parse_mem_cmdline(char ** cmdline_p) 
	int usermem = 0;

	int usermem = 0;





	/* Save unparsed command line copy for /proc/cmdline */

	/* Save unparsed command line copy for /proc/cmdline */

	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';





	memory_start = (unsigned long)CONFIG_MEMORY_START+PAGE_OFFSET;

	memory_start = (unsigned long)CONFIG_MEMORY_START+PAGE_OFFSET;

	memory_end = memory_start+(unsigned long)CONFIG_MEMORY_SIZE;

	memory_end = memory_start+(unsigned long)CONFIG_MEMORY_SIZE;