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

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

[PATCH] Dynamic kernel command-line: i386 



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: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ff62590

arch/i386/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ ENTRY(startup_32) 
	movzwl OLD_CL_OFFSET,%esi

	addl $(OLD_CL_BASE_ADDR),%esi

2:

	movl $(saved_command_line - __PAGE_OFFSET),%edi

	movl $(boot_command_line - __PAGE_OFFSET),%edi

	movl $(COMMAND_LINE_SIZE/4),%ecx

	rep

	movsl

arch/i386/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ unsigned long saved_videomode; 
#define RAMDISK_PROMPT_FLAG		0x8000

#define RAMDISK_LOAD_FLAG		0x4000	



static char command_line[COMMAND_LINE_SIZE];

static char __initdata command_line[COMMAND_LINE_SIZE];



unsigned char __initdata boot_params[PARAM_SIZE];
@@ -576,7 +576,7 @@ void __init setup_arch(char **cmdline_p) 
		print_memory_map("user");

	}



	strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);

	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);

	*cmdline_p = command_line;



	max_low_pfn = setup_memory();