git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
smpboot.c
diff --git
a/arch/m32r/kernel/smpboot.c
b/arch/m32r/kernel/smpboot.c
index
655ea1c
..
e034844
100644
(file)
--- a/
arch/m32r/kernel/smpboot.c
+++ b/
arch/m32r/kernel/smpboot.c
@@
-178,7
+178,7
@@
void __init smp_prepare_cpus(unsigned int max_cpus)
for (phys_id = 0 ; phys_id < nr_cpu ; phys_id++)
physid_set(phys_id, phys_cpu_present_map);
#ifndef CONFIG_HOTPLUG_CPU
-
cpu_present_map = cpu_possible_map
;
+
init_cpu_present(&cpu_possible_map)
;
#endif
show_mp_info(nr_cpu);