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 branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kvm
/
mmu
/
mmu_internal.h
diff --git
a/arch/x86/kvm/mmu/mmu_internal.h
b/arch/x86/kvm/mmu/mmu_internal.h
index
0669a8a
..
5390a59
100644
(file)
--- a/
arch/x86/kvm/mmu/mmu_internal.h
+++ b/
arch/x86/kvm/mmu/mmu_internal.h
@@
-315,7
+315,7
@@
static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
if (!prefetch)
vcpu->stat.pf_taken++;
- if (IS_ENABLED(CONFIG_RETPOLINE) && fault.is_tdp)
+ if (IS_ENABLED(CONFIG_
MITIGATION_
RETPOLINE) && fault.is_tdp)
r = kvm_tdp_page_fault(vcpu, &fault);
else
r = vcpu->arch.mmu->page_fault(vcpu, &fault);