* - dynamic-kernel-command-line-parisc.patch removed from -mm tree
@ 2007-02-12 22:48 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2007-02-12 22:48 UTC (permalink / raw)
To: alon.barlev, ralf, mm-commits
The patch titled
Dynamic kernel command-line: parisc
has been removed from the -mm tree. Its filename was
dynamic-kernel-command-line-parisc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Dynamic kernel command-line: parisc
From: Alon Bar-Lev <alon.barlev@gmail.com>
1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/parisc/kernel/setup.c | 8 ++++----
arch/parisc/mm/init.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/parisc/kernel/setup.c~dynamic-kernel-command-line-parisc arch/parisc/kernel/setup.c
--- a/arch/parisc/kernel/setup.c~dynamic-kernel-command-line-parisc
+++ a/arch/parisc/kernel/setup.c
@@ -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 -puN arch/parisc/mm/init.c~dynamic-kernel-command-line-parisc arch/parisc/mm/init.c
--- a/arch/parisc/mm/init.c~dynamic-kernel-command-line-parisc
+++ a/arch/parisc/mm/init.c
@@ -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);
_
Patches currently in -mm which might be from alon.barlev@gmail.com are
origin.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-02-12 22:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-12 22:48 - dynamic-kernel-command-line-parisc.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.