projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.9-rc1' into x86/urgent, to pick up updates
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
smp.c
diff --git
a/arch/x86/kernel/smp.c
b/arch/x86/kernel/smp.c
index
68f8cc2
..
c00cb64
100644
(file)
--- a/
arch/x86/kernel/smp.c
+++ b/
arch/x86/kernel/smp.c
@@
-261,8
+261,10
@@
static inline void __smp_reschedule_interrupt(void)
__visible void smp_reschedule_interrupt(struct pt_regs *regs)
{
+ irq_enter();
ack_APIC_irq();
__smp_reschedule_interrupt();
+ irq_exit();
/*
* KVM uses this interrupt to force a cpu out of guest mode
*/