LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Alon Bar-Lev <alon.barlev@gmail.com> To: Andi Kleen <ak@suse.de> Cc: Matt Domsch <Matt_Domsch@dell.com>, Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org, johninsd@san.rr.com, davej@codemonkey.org.uk, Riley@williams.name, trini@kernel.crashing.org, davem@davemloft.net, ecd@brainaid.de, jj@sunsite.ms.mff.cuni.cz, anton@samba.org, wli@holomorphy.com, lethal@linux-sh.org, rc@rc0.org.uk, spyro@f2s.com, rth@twiddle.net, avr32@atmel.com, hskinnemoen@atmel.com, starvik@axis.com, ralf@linux-mips.org, matthew@wil.cx, grundler@parisc-linux.org, geert@linux-m68k.org, zippel@linux-m68k.org, paulus@samba.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, uclinux-v850@lsi.nec.co.jp, chris@zankel.net Subject: [PATCH 25/26] Dynamic kernel command-line - x86_64 Date: Mon, 4 Sep 2006 01:03:20 +0300 [thread overview] Message-ID: <200609040103.22000.alon.barlev@gmail.com> (raw) In-Reply-To: <200609040050.13410.alon.barlev@gmail.com> 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
next prev parent reply other threads:[~2006-09-03 22:10 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2006-09-03 21:50 [PATCH 00/26] Dynamic kernel command-line Alon Bar-Lev 2006-09-03 21:52 ` [PATCH 01/26] Dynamic kernel command-line - common Alon Bar-Lev 2006-09-03 22:10 ` Matthew Wilcox 2006-09-03 22:12 ` Alon Bar-Lev 2006-09-05 23:52 ` Bill Davidsen 2006-09-03 21:52 ` [PATCH 02/26] Dynamic kernel command-line - alpha Alon Bar-Lev 2006-09-03 21:53 ` [PATCH 03/26] Dynamic kernel command-line - arm Alon Bar-Lev 2006-09-03 21:54 ` [PATCH 04/26] Dynamic kernel command-line - arm26 Alon Bar-Lev 2006-09-03 21:54 ` [PATCH 05/26] Dynamic kernel command-line - avr32 Alon Bar-Lev 2006-09-03 21:55 ` [PATCH 06/26] Dynamic kernel command-line - cris Alon Bar-Lev 2006-09-03 21:55 ` [PATCH 07/26] Dynamic kernel command-line - frv Alon Bar-Lev 2006-09-03 21:56 ` [PATCH 08/26] Dynamic kernel command-line - h8300 Alon Bar-Lev 2006-09-03 21:56 ` [PATCH 09/26] Dynamic kernel command-line - i386 Alon Bar-Lev 2006-09-03 21:56 ` [PATCH 10/26] Dynamic kernel command-line - ia64 Alon Bar-Lev 2006-09-03 21:57 ` [PATCH 11/26] Dynamic kernel command-line - m32r Alon Bar-Lev 2006-09-03 21:57 ` [PATCH 12/26] Dynamic kernel command-line - m68k Alon Bar-Lev 2006-09-03 21:58 ` [PATCH 13/26] Dynamic kernel command-line - m68knommu Alon Bar-Lev 2006-09-03 21:58 ` [PATCH 14/26] Dynamic kernel command-line - mips Alon Bar-Lev 2006-09-03 21:59 ` [PATCH 15/26] Dynamic kernel command-line - parisc Alon Bar-Lev 2006-09-03 21:59 ` [PATCH 16/26] Dynamic kernel command-line - powerpc Alon Bar-Lev 2006-09-03 22:00 ` [PATCH 17/26] Dynamic kernel command-line - ppc Alon Bar-Lev 2006-09-03 22:00 ` [PATCH 18/26] Dynamic kernel command-line - s390 Alon Bar-Lev 2006-09-03 22:01 ` [PATCH 19/26] Dynamic kernel command-line - sh Alon Bar-Lev 2006-09-03 22:01 ` [PATCH 20/26] Dynamic kernel command-line - sh64 Alon Bar-Lev 2006-09-03 22:01 ` [PATCH 21/26] Dynamic kernel command-line - sparc Alon Bar-Lev 2006-09-03 22:02 ` [PATCH 22/26] Dynamic kernel command-line - sparc64 Alon Bar-Lev 2006-09-03 22:02 ` [PATCH 23/26] Dynamic kernel command-line - um Alon Bar-Lev 2006-09-03 22:03 ` [PATCH 24/26] Dynamic kernel command-line - v850 Alon Bar-Lev 2006-09-03 22:03 ` Alon Bar-Lev [this message] 2006-09-03 22:03 ` [PATCH 26/26] Dynamic kernel command-line - xtensa Alon Bar-Lev 2006-09-03 23:33 ` [PATCH 00/26] Dynamic kernel command-line Paul Mackerras 2006-09-04 2:50 ` Nigel Cunningham 2006-09-04 8:32 ` Martin Schwidefsky 2006-09-04 8:42 ` Alon Bar-Lev 2006-09-04 5:05 ` Alon Bar-Lev 2006-09-04 6:12 ` Andi Kleen 2006-09-04 17:09 ` Luca 2006-09-04 1:01 ` Josh Boyer 2006-09-04 5:07 ` Alon Bar-Lev 2006-09-04 19:59 ` Josh Boyer 2006-09-03 22:15 [PATCH 00/26] Dynamic kernel command-line - Resend please ignore last Alon Bar-Lev 2006-09-03 22:24 ` [PATCH 25/26] Dynamic kernel command-line - x86_64 Alon Bar-Lev 2006-12-02 10:47 [PATCH 00/26] Dynamic kernel command-line Alon Bar-Lev 2006-12-02 10:57 ` [PATCH 25/26] Dynamic kernel command-line - x86_64 Alon Bar-Lev 2007-01-18 12:58 [patch 00/26] Dynamic kernel command-line Bernhard Walle 2007-01-18 12:59 ` [patch 25/26] Dynamic kernel command-line - x86_64 Bernhard Walle
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=200609040103.22000.alon.barlev@gmail.com \ --to=alon.barlev@gmail.com \ --cc=Matt_Domsch@dell.com \ --cc=Riley@williams.name \ --cc=ak@suse.de \ --cc=akpm@osdl.org \ --cc=anton@samba.org \ --cc=avr32@atmel.com \ --cc=chris@zankel.net \ --cc=davej@codemonkey.org.uk \ --cc=davem@davemloft.net \ --cc=ecd@brainaid.de \ --cc=geert@linux-m68k.org \ --cc=grundler@parisc-linux.org \ --cc=heiko.carstens@de.ibm.com \ --cc=hskinnemoen@atmel.com \ --cc=jj@sunsite.ms.mff.cuni.cz \ --cc=johninsd@san.rr.com \ --cc=lethal@linux-sh.org \ --cc=linux-kernel@vger.kernel.org \ --cc=matthew@wil.cx \ --cc=paulus@samba.org \ --cc=ralf@linux-mips.org \ --cc=rc@rc0.org.uk \ --cc=rth@twiddle.net \ --cc=schwidefsky@de.ibm.com \ --cc=spyro@f2s.com \ --cc=starvik@axis.com \ --cc=trini@kernel.crashing.org \ --cc=uclinux-v850@lsi.nec.co.jp \ --cc=wli@holomorphy.com \ --cc=zippel@linux-m68k.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).