Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750939AbWICWK1 (ORCPT ); Sun, 3 Sep 2006 18:10:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750996AbWICWKR (ORCPT ); Sun, 3 Sep 2006 18:10:17 -0400 Received: from wx-out-0506.google.com ([66.249.82.233]:25868 "EHLO wx-out-0506.google.com") by vger.kernel.org with ESMTP id S1750966AbWICWKI (ORCPT ); Sun, 3 Sep 2006 18:10:08 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:subject:date:user-agent:cc:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=oRupVvkUXHU7oLwouMA/k29/A6A0yZV1pU1bpQSzdtR4bvkMy3peU9HUuxKDvpE4LysjKpH4We1YJWdeRvUMw1CH3mQ9EYQ80BQc9txPXAGnjHHWv+9+ltE+ilQMCkbG7tPvhGxcobL6QuQhIgdDI2XOnyLf1XZFDRZbvOycEcw= From: Alon Bar-Lev To: Andi Kleen Subject: [PATCH 25/26] Dynamic kernel command-line - x86_64 Date: Mon, 4 Sep 2006 01:03:20 +0300 User-Agent: KMail/1.9.4 Cc: Matt Domsch , Andrew Morton , 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 References: <200609040050.13410.alon.barlev@gmail.com> In-Reply-To: <200609040050.13410.alon.barlev@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200609040103.22000.alon.barlev@gmail.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2938 Lines: 88 1. Rename saved_command_line into boot_command_line. 2. Set command_line as __initdata. Signed-off-by: Alon Bar-Lev --- 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/