diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /arch/sparc/kernel/setup.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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) | |||
| 348 | init_mm.context = (unsigned long) NO_CONTEXT; | 348 | init_mm.context = (unsigned long) NO_CONTEXT; |
| 349 | init_task.thread.kregs = &fake_swapper_regs; | 349 | init_task.thread.kregs = &fake_swapper_regs; |
| 350 | 350 | ||
| 351 | smp_setup_cpu_possible_map(); | ||
| 352 | |||
| 353 | paging_init(); | 351 | paging_init(); |
| 352 | |||
| 353 | smp_setup_cpu_possible_map(); | ||
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | static int __init set_preferred_console(void) | 356 | static int __init set_preferred_console(void) |