Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162924AbWLBLEH (ORCPT ); Sat, 2 Dec 2006 06:04:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1162920AbWLBLAI (ORCPT ); Sat, 2 Dec 2006 06:00:08 -0500 Received: from nf-out-0910.google.com ([64.233.182.185]:55527 "EHLO nf-out-0910.google.com") by vger.kernel.org with ESMTP id S1759470AbWLBK7e (ORCPT ); Sat, 2 Dec 2006 05:59:34 -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=Q9WYH5BrZyvGPLOvv4zBHyZsYAfkY8iFOePsKXelDIUHlwSEnjJcSkbxZdmbCVgfUsHehTbzxsxbrlWljI78RDq3pAcgIQ6KeRfOUhlIIvay2iC55QOlJKp9zAbyXahdseWRiHExEQ6eeSQwi4JoZESDfiDlWw6tOyRGOuTRKgs= From: Alon Bar-Lev To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/26] Dynamic kernel command-line - parisc Date: Sat, 2 Dec 2006 12:53:44 +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: <200612021253.45260.alon.barlev@gmail.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2321 Lines: 64 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/parisc/kernel/setup.c linux-2.6.19/arch/parisc/kernel/setup.c --- linux-2.6.19.org/arch/parisc/kernel/setup.c 2006-11-29 23:57:37.000000000 +0200 +++ linux-2.6.19/arch/parisc/kernel/setup.c 2006-12-02 11:31:33.000000000 +0200 @@ -45,7 +45,7 @@ #include #include -char command_line[COMMAND_LINE_SIZE] __read_mostly; +char __initdata command_line[COMMAND_LINE_SIZE] __read_mostly; /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ struct proc_dir_entry * proc_runway_root __read_mostly = NULL; @@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ if (boot_args[0] < 64) { /* called from hpux boot loader */ - saved_command_line[0] = '\0'; + boot_command_line[0] = '\0'; } else { - strcpy(saved_command_line, (char *)__va(boot_args[1])); + strcpy(boot_command_line, (char *)__va(boot_args[1])); #ifdef CONFIG_BLK_DEV_INITRD if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ @@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline #endif } - strcpy(command_line, saved_command_line); + strcpy(command_line, boot_command_line); *cmdline_p = command_line; } diff -urNp linux-2.6.19.org/arch/parisc/mm/init.c linux-2.6.19/arch/parisc/mm/init.c --- linux-2.6.19.org/arch/parisc/mm/init.c 2006-11-29 23:57:37.000000000 +0200 +++ linux-2.6.19/arch/parisc/mm/init.c 2006-12-02 11:31:33.000000000 +0200 @@ -77,12 +77,12 @@ static void __init mem_limit_func(void) { char *cp, *end; unsigned long limit; - extern char saved_command_line[]; + extern char __initdata boot_command_line[]; /* We need this before __setup() functions are called */ limit = MAX_MEM; - for (cp = saved_command_line; *cp; ) { + for (cp = boot_command_line; *cp; ) { if (memcmp(cp, "mem=", 4) == 0) { cp += 4; limit = memparse(cp, &end); - 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/