diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 07:45:48 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 07:45:48 +0200 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/sparc/kernel/setup.c | |
| parent | [POWERPC] Only offer CONFIG_BRIQ_PANEL if CONFIG_PPC_CHRP is enabled (diff) | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| download | linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.tar.xz linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/sparc/kernel/setup.c')
| -rw-r--r-- | arch/sparc/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 35488d6c7457..0251cab4708b 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c @@ -348,9 +348,9 @@ void __init setup_arch(char **cmdline_p) init_mm.context = (unsigned long) NO_CONTEXT; init_task.thread.kregs = &fake_swapper_regs; - smp_setup_cpu_possible_map(); - paging_init(); + + smp_setup_cpu_possible_map(); } static int __init set_preferred_console(void) |