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>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index de0c9d8097c25f9e304d19449e44eef86091ffe7..202f4d4a892ab18f34a51d4f28a5caa41d5f6c24 100644 (file)
--- 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);