summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/smp.c
diff options
context:
space:
mode:
authorAndi Kleen2007-07-21 17:10:05 +0200
committerLinus Torvalds2007-07-22 03:37:08 +0200
commitd9c6d69145ec696128961204f755a3b01edc2ff6 (patch)
tree368a627dceb105a15c164ec9c5b04120abffa932 /arch/x86_64/kernel/smp.c
parentx86_64: remove extra extern declaring about dmi_ioremap (diff)
downloadkernel-qcow2-linux-d9c6d69145ec696128961204f755a3b01edc2ff6.tar.gz
kernel-qcow2-linux-d9c6d69145ec696128961204f755a3b01edc2ff6.tar.xz
kernel-qcow2-linux-d9c6d69145ec696128961204f755a3b01edc2ff6.zip
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>
Diffstat (limited to 'arch/x86_64/kernel/smp.c')
-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,
return 0;
}
- spin_lock_bh(&call_lock);
+ spin_lock(&call_lock);
__smp_call_function_single(cpu, func, info, nonatomic, wait);
- spin_unlock_bh(&call_lock);
+ spin_unlock(&call_lock);
put_cpu();
return 0;
}