Commit 4e498b66104af914ef04d6e7fbbbc13a4f7c936e

Authored by Alon Bar-Lev
Committed by Linus Torvalds
1 parent 5ff625904c

[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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

arch/i386/kernel/head.S
... ... @@ -103,7 +103,7 @@
103 103 movzwl OLD_CL_OFFSET,%esi
104 104 addl $(OLD_CL_BASE_ADDR),%esi
105 105 2:
106   - movl $(saved_command_line - __PAGE_OFFSET),%edi
  106 + movl $(boot_command_line - __PAGE_OFFSET),%edi
107 107 movl $(COMMAND_LINE_SIZE/4),%ecx
108 108 rep
109 109 movsl
arch/i386/kernel/setup.c
... ... @@ -132,7 +132,7 @@
132 132 #define RAMDISK_PROMPT_FLAG 0x8000
133 133 #define RAMDISK_LOAD_FLAG 0x4000
134 134  
135   -static char command_line[COMMAND_LINE_SIZE];
  135 +static char __initdata command_line[COMMAND_LINE_SIZE];
136 136  
137 137 unsigned char __initdata boot_params[PARAM_SIZE];
138 138  
... ... @@ -576,7 +576,7 @@
576 576 print_memory_map("user");
577 577 }
578 578  
579   - strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
  579 + strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
580 580 *cmdline_p = command_line;
581 581  
582 582 max_low_pfn = setup_memory();