aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-07-21 11:10:05 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 21:37:08 -0400
commitd9c6d69145ec696128961204f755a3b01edc2ff6 (patch)
tree368a627dceb105a15c164ec9c5b04120abffa932
parentaf3e9a2e33952204e070bf5dfeebe293e90444b8 (diff)
x86_64: Don't use softirq safe locks in smp_call_function
It is not fully softirq safe anyways. Can't do a WARN_ON unfortunately because it could trigger in the panic case. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86_64/kernel/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 0694940b2e73..df4a82812adb 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -386,9 +386,9 @@ int smp_call_function_single (int cpu, void (*func) (void *info), void *info,
386 return 0; 386 return 0;
387 } 387 }
388 388
389 spin_lock_bh(&call_lock); 389 spin_lock(&call_lock);
390 __smp_call_function_single(cpu, func, info, nonatomic, wait); 390 __smp_call_function_single(cpu, func, info, nonatomic, wait);
391 spin_unlock_bh(&call_lock); 391 spin_unlock(&call_lock);
392 put_cpu(); 392 put_cpu();
393 return 0; 393 return 0;
394} 394}