projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
kvm.c
diff --git
a/arch/x86/kernel/kvm.c
b/arch/x86/kernel/kvm.c
index
a26643d
..
b656456
100644
(file)
--- a/
arch/x86/kernel/kvm.c
+++ b/
arch/x86/kernel/kvm.c
@@
-884,10
+884,11
@@
static void kvm_wait(u8 *ptr, u8 val)
} else {
local_irq_disable();
+ /* safe_halt() will enable IRQ */
if (READ_ONCE(*ptr) == val)
safe_halt();
-
- local_irq_enable();
+ else
+
local_irq_enable();
}
}