diff options
| author | Sean Christopherson <sean.j.christopherson@intel.com> | 2019-07-19 22:41:09 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-25 15:30:14 +0200 |
| commit | 98cd382d509061a9c6ae4cac38ff0721be05adef (patch) | |
| tree | 6ea31d049220d79d813dedb1968db0b9ae6549e1 /arch/x86 | |
| parent | KVM: VMX: Add error handling to VMREAD helper (diff) | |
| download | linux-98cd382d509061a9c6ae4cac38ff0721be05adef.tar.xz linux-98cd382d509061a9c6ae4cac38ff0721be05adef.zip | |
KVM: x86: Drop ____kvm_handle_fault_on_reboot()
Remove the variation of __kvm_handle_fault_on_reboot() that accepts a
post-fault cleanup instruction now that its sole user (VMREAD) uses
a different method for handling faults.
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index de0c9d8097c2..202f4d4a892a 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1542,7 +1542,7 @@ asmlinkage void kvm_spurious_fault(void); * Usually after catching the fault we just panic; during reboot * instead the instruction is ignored. */ -#define ____kvm_handle_fault_on_reboot(insn, cleanup_insn) \ +#define __kvm_handle_fault_on_reboot(insn) \ "666: \n\t" \ insn "\n\t" \ "jmp 668f \n\t" \ @@ -1551,16 +1551,12 @@ asmlinkage void kvm_spurious_fault(void); "668: \n\t" \ ".pushsection .fixup, \"ax\" \n\t" \ "700: \n\t" \ - cleanup_insn "\n\t" \ "cmpb $0, kvm_rebooting\n\t" \ "je 667b \n\t" \ "jmp 668b \n\t" \ ".popsection \n\t" \ _ASM_EXTABLE(666b, 700b) -#define __kvm_handle_fault_on_reboot(insn) \ - ____kvm_handle_fault_on_reboot(insn, "") - #define KVM_ARCH_WANT_MMU_NOTIFIER int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end); int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end); |