summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup_32.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-05 01:27:50 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-05 01:27:50 +0100
commit602d4a7e2f4b843d1a67375d4d7104073495b758 (patch)
tree0b9f184e54fa693c27bd5986c114bdcf6949f788 /arch/powerpc/kernel/setup_32.c
parentNFS,SUNRPC,NLM: fix unused variable warnings when CONFIG_SYSCTL is disabled (diff)
parentpowerpc: Fix vmlinux.lds.S for 32-bit (diff)
downloadlinux-602d4a7e2f4b843d1a67375d4d7104073495b758.tar.xz
linux-602d4a7e2f4b843d1a67375d4d7104073495b758.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
-rw-r--r--arch/powerpc/kernel/setup_32.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 9680ae99b084..b45eedbb4b3a 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -288,6 +288,8 @@ void __init setup_arch(char **cmdline_p)
unflatten_device_tree();
finish_device_tree();
+ smp_setup_cpu_maps();
+
#ifdef CONFIG_BOOTX_TEXT
init_boot_display();
#endif