diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-31 23:06:39 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-31 23:06:39 +1100 |
commit | 45ff2beda53a8a2edf43a29e8d4d9282b43b83a9 (patch) | |
tree | 9cfc6ddd7e05a9bd0bf72006c7f0c5254f782e9d /arch/alpha/kernel/setup.c | |
parent | fd70d10173487db8c68385fc83710e45cfe52af5 (diff) | |
parent | 25bf48b74b9fb23b347d00656b604f9e55c72183 (diff) |
Merge commit 'boot-params/master'
Conflicts:
arch/arm/kernel/setup.c
arch/parisc/kernel/setup.c
arch/sh/boards/mach-microdev/setup.c
arch/sh/boards/mach-migor/setup.c
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'arch/alpha/kernel/setup.c')
-rw-r--r-- | arch/alpha/kernel/setup.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 02bee6983ce2..fda7c7c23d93 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -496,8 +496,27 @@ register_cpus(void) arch_initcall(register_cpus); +void arch_get_boot_command_line(void) +{ + /* + * Locate the command line. + */ + /* Hack for Jensen... since we're restricted to 8 or 16 chars for + boot flags depending on the boot mode, we need some shorthand. + This should do for installation. */ + if (strcmp(COMMAND_LINE, "INSTALL") == 0) { + strlcpy(command_line, "root=/dev/fd0 load_ramdisk=1", + sizeof command_line); + } else { + strlcpy(command_line, COMMAND_LINE, sizeof command_line); + } + + /* FIXME: Can we skip command_line and just use boot_command_line? */ + strcpy(boot_command_line, command_line); +} + void __init -setup_arch(char **cmdline_p) +setup_arch(void) { extern char _end[]; @@ -542,21 +561,8 @@ setup_arch(char **cmdline_p) kernel_end = callback_init(kernel_end); /* - * Locate the command line. - */ - /* Hack for Jensen... since we're restricted to 8 or 16 chars for - boot flags depending on the boot mode, we need some shorthand. - This should do for installation. */ - if (strcmp(COMMAND_LINE, "INSTALL") == 0) { - strlcpy(command_line, "root=/dev/fd0 load_ramdisk=1", sizeof command_line); - } else { - strlcpy(command_line, COMMAND_LINE, sizeof command_line); - } - strcpy(boot_command_line, command_line); - *cmdline_p = command_line; - - /* * Process command-line arguments. + * FIXME: Use core_param. */ while ((p = strsep(&args, " \t")) != NULL) { if (!*p) continue; |