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

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

[PATCH] Dynamic kernel command-line: sh 



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>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e06b1a35

arch/sh/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static struct sh_machine_vector* __init get_mv_byname(const char* name); 
#define RAMDISK_PROMPT_FLAG		0x8000

#define RAMDISK_LOAD_FLAG		0x4000



static char command_line[COMMAND_LINE_SIZE] = { 0, };

static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, };



static struct resource code_resource = { .name = "Kernel code", };

static struct resource data_resource = { .name = "Kernel data", };
@@ -90,8 +90,8 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE], 
	int len = 0;



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

	memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);

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

	memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);

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



	memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;

	memory_end = memory_start + __MEMORY_SIZE;