From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from nf-out-0910.google.com ([64.233.182.186]:63718 "EHLO nf-out-0910.google.com") by vger.kernel.org with ESMTP id S1759478AbWLBK7j (ORCPT ); Sat, 2 Dec 2006 05:59:39 -0500 Received: by nf-out-0910.google.com with SMTP id o25so3809425nfa for ; Sat, 02 Dec 2006 02:59:38 -0800 (PST) From: Alon Bar-Lev Subject: [PATCH 19/26] Dynamic kernel command-line - sh Date: Sat, 2 Dec 2006 12:55:18 +0200 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: <200612021255.19181.alon.barlev@gmail.com> Sender: linux-arch-owner@vger.kernel.org To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: 1. Rename saved_command_line into boot_command_line. 2. Set command_line as __initdata. Signed-off-by: Alon Bar-Lev Acked-by: Paul Mundt --- diff -urNp linux-2.6.19.org/arch/sh/kernel/setup.c linux-2.6.19/arch/sh/kernel/setup.c --- linux-2.6.19.org/arch/sh/kernel/setup.c 2006-11-29 23:57:37.000000000 +0200 +++ linux-2.6.19/arch/sh/kernel/setup.c 2006-12-02 11:31:33.000000000 +0200 @@ -75,7 +75,7 @@ static struct sh_machine_vector* __init #define RAMDISK_PROMPT_FLAG 0x8000 #define RAMDISK_LOAD_FLAG 0x4000 -static char command_line[COMMAND_LINE_SIZE] = { 0, }; +static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, }; static struct resource code_resource = { .name = "Kernel code", }; static struct resource data_resource = { .name = "Kernel data", }; @@ -91,8 +91,8 @@ static inline void parse_cmdline (char * int len = 0; /* Save unparsed command line copy for /proc/cmdline */ - memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); - saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; + memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); + boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; memory_end = memory_start + __MEMORY_SIZE;