diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-27 23:40:37 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-27 23:40:37 +1030 |
| commit | 25bf48b74b9fb23b347d00656b604f9e55c72183 (patch) | |
| tree | d54b94939bd67c444b9ce2157c02920729d83b56 /arch | |
| parent | dedd902376e79079babb5bc5b5cecb5b3ef9d3c2 (diff) | |
Fix powerpc (tested on ppc64) command line handling.
Powerpc used to call parse_early_param() really early; the change made
it too late. Put it back.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index d36cbd0c4574..e5f23876fb25 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -32,6 +32,7 @@ #include <linux/debugfs.h> #include <linux/irq.h> #include <linux/lmb.h> +#include <linux/start_kernel.h> #include <asm/prom.h> #include <asm/rtas.h> @@ -1188,6 +1189,7 @@ void __init early_init_devtree(void *params) /* Save command line for /proc/cmdline and then parse parameters */ strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); + parse_early_and_core_params(boot_command_line); /* Reserve LMB regions used by kernel, initrd, dt, etc... */ lmb_reserve(PHYSICAL_START, __pa(klimit) - PHYSICAL_START); diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index a2373712679c..52ca63a0c852 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -264,12 +264,6 @@ static void __init exc_lvl_early_init(void) #define exc_lvl_early_init() #endif -void arch_get_boot_command_line(void) -{ - /* FIXME: Get rid of cmd_line in favor of boot_command_line? */ - strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); -} - /* Warning, IO base is not yet inited */ void __init setup_arch(void) { diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 7d25b425a67f..348bc8aa94c7 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -502,12 +502,6 @@ static void __init emergency_stack_init(void) } } -void arch_get_boot_command_line(void) -{ - /* FIXME: Get rid of cmd_line in favor of boot_command_line? */ - strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); -} - /* * Called into from start_kernel, after lock_kernel has been called. * Initializes bootmem, which is unsed to manage page allocation until |