diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-30 17:08:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-30 17:08:27 +0300 |
| commit | 7e86548e2cc8d308cb75439480f428137151b0de (patch) | |
| tree | fa3bcdedb64f4642a21080bc2b4ddc69ce2b2285 /arch/x86/kvm/mmu.h | |
| parent | 64e16720ea0879f8ab4547e3b9758936d483909b (diff) | |
| parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff (diff) | |
| download | linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.xz | |
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/mmu.h')
| -rw-r--r-- | arch/x86/kvm/mmu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h index efc857615d8e..5b408c0ad612 100644 --- a/arch/x86/kvm/mmu.h +++ b/arch/x86/kvm/mmu.h @@ -66,8 +66,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly, bool accessed_dirty); bool kvm_can_do_async_pf(struct kvm_vcpu *vcpu); int kvm_handle_page_fault(struct kvm_vcpu *vcpu, u64 error_code, - u64 fault_address, char *insn, int insn_len, - bool need_unprotect); + u64 fault_address, char *insn, int insn_len); static inline unsigned int kvm_mmu_available_pages(struct kvm *kvm) { |