diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:38 -0500 |
commit | 668f9931c812224ab2a6d57cdf2f0ec3865b68d2 (patch) | |
tree | 23d0cf10508d6a152acde7568a994993e6e40495 /arch/parisc/kernel/setup.c | |
parent | 43cd34645d3bf35cbaa68f28b85d12d0b9e08ab9 (diff) |
[PATCH] 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@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/parisc/kernel/setup.c')
-rw-r--r-- | arch/parisc/kernel/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 3c7a3faf78ed..74b3686dd1e0 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
46 | #include <asm/setup.h> | 46 | #include <asm/setup.h> |
47 | 47 | ||
48 | char command_line[COMMAND_LINE_SIZE] __read_mostly; | 48 | char __initdata command_line[COMMAND_LINE_SIZE] __read_mostly; |
49 | 49 | ||
50 | /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ | 50 | /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ |
51 | struct proc_dir_entry * proc_runway_root __read_mostly = NULL; | 51 | struct proc_dir_entry * proc_runway_root __read_mostly = NULL; |
@@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline_p) | |||
71 | /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ | 71 | /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ |
72 | if (boot_args[0] < 64) { | 72 | if (boot_args[0] < 64) { |
73 | /* called from hpux boot loader */ | 73 | /* called from hpux boot loader */ |
74 | saved_command_line[0] = '\0'; | 74 | boot_command_line[0] = '\0'; |
75 | } else { | 75 | } else { |
76 | strcpy(saved_command_line, (char *)__va(boot_args[1])); | 76 | strcpy(boot_command_line, (char *)__va(boot_args[1])); |
77 | 77 | ||
78 | #ifdef CONFIG_BLK_DEV_INITRD | 78 | #ifdef CONFIG_BLK_DEV_INITRD |
79 | if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ | 79 | if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ |
@@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline_p) | |||
84 | #endif | 84 | #endif |
85 | } | 85 | } |
86 | 86 | ||
87 | strcpy(command_line, saved_command_line); | 87 | strcpy(command_line, boot_command_line); |
88 | *cmdline_p = command_line; | 88 | *cmdline_p = command_line; |
89 | } | 89 | } |
90 | 90 | ||