lkml.org 
[lkml]   [2006]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 25/26] Dynamic kernel command-line - x86_64
Date

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>

---
diff -urNp
linux-2.6.18-rc5-mm1.org/include/asm-x86_64/bootsetup.h
linux-2.6.18-rc5-mm1/include/asm-x86_64/bootsetup.h
--- linux-2.6.18-rc5-mm1.org/include/asm-x86_64/bootsetup.h
2006-06-18 04:49:35.000000000 +0300
+++ linux-2.6.18-rc5-mm1/include/asm-x86_64/bootsetup.h
2006-09-03 19:47:59.000000000 +0300
@@ -31,7 +31,7 @@ extern char x86_boot_params[BOOT_PARAM_S
#define EDD_MBR_SIG_NR (*(unsigned char *)
(PARAM+EDD_MBR_SIG_NR_BUF))
#define EDD_MBR_SIGNATURE ((unsigned int *)
(PARAM+EDD_MBR_SIG_BUF))
#define EDD_BUF ((struct edd_info *) (PARAM+EDDBUF))
-#define COMMAND_LINE saved_command_line
+#define COMMAND_LINE boot_command_line

#define RAMDISK_IMAGE_START_MASK 0x07FF
#define RAMDISK_PROMPT_FLAG 0x8000
diff -urNp
linux-2.6.18-rc5-mm1.org/arch/x86_64/kernel/head64.c
linux-2.6.18-rc5-mm1/arch/x86_64/kernel/head64.c
--- linux-2.6.18-rc5-mm1.org/arch/x86_64/kernel/head64.c
2006-09-03 18:56:53.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/x86_64/kernel/head64.c
2006-09-03 23:47:39.000000000 +0300
@@ -34,7 +34,7 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022

-extern char saved_command_line[];
+extern char __initdata boot_command_line[];

static void __init copy_bootdata(char *real_mode_data)
{
@@ -50,7 +50,7 @@ static void __init copy_bootdata(char *r
new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
}
command_line = (char *) ((u64)(new_data));
- memcpy(saved_command_line, command_line,
COMMAND_LINE_SIZE);
+ memcpy(boot_command_line, command_line,
COMMAND_LINE_SIZE);
}

void __init x86_64_start_kernel(char * real_mode_data)
diff -urNp
linux-2.6.18-rc5-mm1.org/arch/x86_64/kernel/setup.c
linux-2.6.18-rc5-mm1/arch/x86_64/kernel/setup.c
--- linux-2.6.18-rc5-mm1.org/arch/x86_64/kernel/setup.c
2006-09-03 18:56:53.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/x86_64/kernel/setup.c
2006-09-03 20:55:20.000000000 +0300
@@ -100,7 +100,7 @@ EXPORT_SYMBOL_GPL(edid_info);

extern int root_mountflags;

-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];

struct resource standard_io_resources[] = {
{ .name = "dma1", .start = 0x00, .end = 0x1f,
@@ -376,7 +376,7 @@ void __init setup_arch(char **cmdline_p)

early_identify_cpu(&boot_cpu_data);

- strlcpy(command_line, saved_command_line,
COMMAND_LINE_SIZE);
+ strlcpy(command_line, boot_command_line,
COMMAND_LINE_SIZE);
*cmdline_p = command_line;

parse_early_param();
--
VGER BF report: U 0.499555
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-09-04 00:15    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site