Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162931AbWLBLAq (ORCPT ); Sat, 2 Dec 2006 06:00:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1162934AbWLBLAf (ORCPT ); Sat, 2 Dec 2006 06:00:35 -0500 Received: from ug-out-1314.google.com ([66.249.92.172]:17093 "EHLO ug-out-1314.google.com") by vger.kernel.org with ESMTP id S1759454AbWLBK71 (ORCPT ); Sat, 2 Dec 2006 05:59:27 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:subject:date:user-agent:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=TpnIk2Wj449Yj8lr4diZebLRvirfkTlUxNBzOwmdvvhfigoyhMGwV+GKYDqI6ho1RDGqLfm9/JEP55HXLLnQS8NzEo8YAweXaxgjuYWPZPTIuqJK0UQ8fdQ4jFmo8iFrP5zg1F7i1tntCox1FXYJNHAQcpYxHE/uZhQIzFl7EXs= From: Alon Bar-Lev To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/26] Dynamic kernel command-line - i386 Date: Sat, 2 Dec 2006 12:51:22 +0200 User-Agent: KMail/1.9.5 References: <200612021247.43291.alon.barlev@gmail.com> In-Reply-To: <200612021247.43291.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: <200612021251.23244.alon.barlev@gmail.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1710 Lines: 46 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.19.org/arch/i386/kernel/head.S linux-2.6.19/arch/i386/kernel/head.S --- linux-2.6.19.org/arch/i386/kernel/head.S 2006-11-29 23:57:37.000000000 +0200 +++ linux-2.6.19/arch/i386/kernel/head.S 2006-12-02 11:31:32.000000000 +0200 @@ -97,7 +97,7 @@ ENTRY(startup_32) movzwl OLD_CL_OFFSET,%esi addl $(OLD_CL_BASE_ADDR),%esi 2: - movl $(saved_command_line - __PAGE_OFFSET),%edi + movl $(boot_command_line - __PAGE_OFFSET),%edi movl $(COMMAND_LINE_SIZE/4),%ecx rep movsl diff -urNp linux-2.6.19.org/arch/i386/kernel/setup.c linux-2.6.19/arch/i386/kernel/setup.c --- linux-2.6.19.org/arch/i386/kernel/setup.c 2006-11-29 23:57:37.000000000 +0200 +++ linux-2.6.19/arch/i386/kernel/setup.c 2006-12-02 11:31:32.000000000 +0200 @@ -145,7 +145,7 @@ unsigned long saved_videomode; #define RAMDISK_PROMPT_FLAG 0x8000 #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]; @@ -1405,7 +1405,7 @@ void __init setup_arch(char **cmdline_p) 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; max_low_pfn = setup_memory(); - 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/