[PATCH] Dynamic kernel command-line: i386
1. Rename saved_command_line into boot_command_line. 2. Set command_line as __initdata. Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
5ff625904c
commit
4e498b6610
|
@ -103,7 +103,7 @@ ENTRY(startup_32)
|
||||||
movzwl OLD_CL_OFFSET,%esi
|
movzwl OLD_CL_OFFSET,%esi
|
||||||
addl $(OLD_CL_BASE_ADDR),%esi
|
addl $(OLD_CL_BASE_ADDR),%esi
|
||||||
2:
|
2:
|
||||||
movl $(saved_command_line - __PAGE_OFFSET),%edi
|
movl $(boot_command_line - __PAGE_OFFSET),%edi
|
||||||
movl $(COMMAND_LINE_SIZE/4),%ecx
|
movl $(COMMAND_LINE_SIZE/4),%ecx
|
||||||
rep
|
rep
|
||||||
movsl
|
movsl
|
||||||
|
|
|
@ -132,7 +132,7 @@ unsigned long saved_videomode;
|
||||||
#define RAMDISK_PROMPT_FLAG 0x8000
|
#define RAMDISK_PROMPT_FLAG 0x8000
|
||||||
#define RAMDISK_LOAD_FLAG 0x4000
|
#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];
|
unsigned char __initdata boot_params[PARAM_SIZE];
|
||||||
|
|
||||||
|
@ -576,7 +576,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
print_memory_map("user");
|
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;
|
*cmdline_p = command_line;
|
||||||
|
|
||||||
max_low_pfn = setup_memory();
|
max_low_pfn = setup_memory();
|
||||||
|
|
Loading…
Reference in New Issue