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 'pm-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
[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
98dafc1
..
b2f5660
100644
(file)
--- a/
arch/x86/kernel/kvm.c
+++ b/
arch/x86/kernel/kvm.c
@@
-311,7
+311,7
@@
static void kvm_guest_cpu_init(void)
if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF) && kvmapf) {
u64 pa = slow_virt_to_phys(this_cpu_ptr(&apf_reason));
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPT
ION
pa |= KVM_ASYNC_PF_SEND_ALWAYS;
#endif
pa |= KVM_ASYNC_PF_ENABLED;