[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200609040059.12081.alon.barlev@gmail.com>
Date: Mon, 4 Sep 2006 00:59:11 +0300
From: Alon Bar-Lev <alon.barlev@...il.com>
To: Andi Kleen <ak@...e.de>
Cc: Matt Domsch <Matt_Domsch@...l.com>, Andrew Morton <akpm@...l.org>,
linux-kernel@...r.kernel.org, johninsd@....rr.com,
davej@...emonkey.org.uk, Riley@...liams.name,
trini@...nel.crashing.org, davem@...emloft.net, ecd@...inaid.de,
jj@...site.ms.mff.cuni.cz, anton@...ba.org, wli@...omorphy.com,
lethal@...ux-sh.org, rc@....org.uk, spyro@....com, rth@...ddle.net,
avr32@...el.com, hskinnemoen@...el.com, starvik@...s.com,
ralf@...ux-mips.org, matthew@....cx, grundler@...isc-linux.org,
geert@...ux-m68k.org, zippel@...ux-m68k.org, paulus@...ba.org,
schwidefsky@...ibm.com, heiko.carstens@...ibm.com,
uclinux-v850@....nec.co.jp, chris@...kel.net
Subject: [PATCH 15/26] Dynamic kernel command-line - parisc
1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.
Signed-off-by: Alon Bar-Lev <alon.barlev@...il.com>
---
diff -urNp
linux-2.6.18-rc5-mm1.org/arch/parisc/kernel/setup.c
linux-2.6.18-rc5-mm1/arch/parisc/kernel/setup.c
--- linux-2.6.18-rc5-mm1.org/arch/parisc/kernel/setup.c
2006-09-03 18:55:13.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/parisc/kernel/setup.c
2006-09-03 21:01:13.000000000 +0300
@@ -45,7 +45,7 @@
#include <asm/io.h>
#include <asm/setup.h>
-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.18-rc5-mm1.org/arch/parisc/mm/init.c
linux-2.6.18-rc5-mm1/arch/parisc/mm/init.c
--- linux-2.6.18-rc5-mm1.org/arch/parisc/mm/init.c
2006-09-03 18:56:50.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/parisc/mm/init.c 2006-09-03
23:52:54.000000000 +0300
@@ -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);
--
VGER BF report: U 0.494487
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists