From 007ad1928222981585cc9be20b0094be3053153e Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 9 Nov 2005 15:45:30 -0800 Subject: [PATCH] --- yaml --- r: 13665 b: refs/heads/master c: e4d76e1c0b15590f2ad9bba89426c2520cd22ca6 h: refs/heads/master i: 13663: 1863002bd306032186cb156c0560f3d62936e155 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/smp.c | 1 + trunk/arch/ppc/kernel/idle.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca8f7d407413..3acd9e85e0b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a47ab9371e664952b1104a70ec8e9b74db3f7a5f +refs/heads/master: e4d76e1c0b15590f2ad9bba89426c2520cd22ca6 diff --git a/trunk/arch/powerpc/kernel/smp.c b/trunk/arch/powerpc/kernel/smp.c index 5c330c3366e4..36d67a8d7cbb 100644 --- a/trunk/arch/powerpc/kernel/smp.c +++ b/trunk/arch/powerpc/kernel/smp.c @@ -510,6 +510,7 @@ int __devinit start_secondary(void *unused) smp_store_cpu_info(cpu); set_dec(tb_ticks_per_jiffy); + preempt_disable(); cpu_callin_map[cpu] = 1; smp_ops->setup_cpu(cpu); diff --git a/trunk/arch/ppc/kernel/idle.c b/trunk/arch/ppc/kernel/idle.c index 3c4e4cb61074..821a75e45602 100644 --- a/trunk/arch/ppc/kernel/idle.c +++ b/trunk/arch/ppc/kernel/idle.c @@ -63,7 +63,7 @@ void cpu_idle(void) int cpu = smp_processor_id(); for (;;) { - while (need_resched()) { + while (!need_resched()) { if (ppc_md.idle != NULL) ppc_md.idle(); else