projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
arch
/
ppc
/
kernel
/
smp.c
diff --git
a/arch/ppc/kernel/smp.c
b/arch/ppc/kernel/smp.c
index
bc5bf11
..
43b8fc2
100644
(file)
--- a/
arch/ppc/kernel/smp.c
+++ b/
arch/ppc/kernel/smp.c
@@
-341,6
+341,7
@@
int __devinit start_secondary(void *unused)
cpu = smp_processor_id();
smp_store_cpu_info(cpu);
set_dec(tb_ticks_per_jiffy);
+ preempt_disable();
cpu_callin_map[cpu] = 1;
printk("CPU %d done callin...\n", cpu);