diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 06:54:00 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 06:54:00 -0400 |
| commit | 7063e6c717f6108c4b3fc3135a516c86ef944870 (patch) | |
| tree | ec6eec10b4dc93474100e6e366df028bd3314fda /arch/ppc | |
| parent | 7ca0026495dbb644b4e32ede76be44072cb2bc7a (diff) | |
| parent | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 5dfb42f1a152..309797d7f96d 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
| @@ -753,6 +753,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 753 | strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE); | 753 | strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE); |
| 754 | *cmdline_p = cmd_line; | 754 | *cmdline_p = cmd_line; |
| 755 | 755 | ||
| 756 | parse_early_param(); | ||
| 757 | |||
| 756 | /* set up the bootmem stuff with available memory */ | 758 | /* set up the bootmem stuff with available memory */ |
| 757 | do_init_bootmem(); | 759 | do_init_bootmem(); |
| 758 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); | 760 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); |