---

yaml --- r: 13665 b: refs/heads/master c: e4d76e1 h: refs/heads/master i: 13663: 1863002 v: v3
git-mirror · Nov 10, 2005 · 007ad19 · 007ad19
1 parent 8cc3c0d
commit 007ad19
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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