From 42752a0b0332d008709079f82acc28b804ade4ff Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 3 Sep 2008 02:15:30 -0700 Subject: [PATCH] --- yaml --- r: 109669 b: refs/heads/master c: 4d084617fb0d025c42c242362d1f27d337e2d407 h: refs/heads/master i: 109667: b4888021858a4e773737bbc78f44329111f23688 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/smp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 44ba784898bc..8d6ef4225ddc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5bd1c3fdd06b6c0fa6dfb98ce31cea1820ce4e9 +refs/heads/master: 4d084617fb0d025c42c242362d1f27d337e2d407 diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c index 0712a445f98e..2be166c544ca 100644 --- a/trunk/arch/sparc64/kernel/smp.c +++ b/trunk/arch/sparc64/kernel/smp.c @@ -1303,10 +1303,6 @@ int __cpu_disable(void) c->core_id = 0; c->proc_id = -1; - ipi_call_lock(); - cpu_clear(cpu, cpu_online_map); - ipi_call_unlock(); - smp_wmb(); /* Make sure no interrupts point to this cpu. */ @@ -1316,6 +1312,10 @@ int __cpu_disable(void) mdelay(1); local_irq_disable(); + ipi_call_lock(); + cpu_clear(cpu, cpu_online_map); + ipi_call_unlock(); + return 0; }