On Sun, Dec 20, 2020, Uros Bizjak wrote: > Merge __kvm_handle_fault_on_reboot with its sole user There's also a comment in vmx.c above kvm_cpu_vmxoff() that should be updated. Alternatively, and probably preferably for me, what about keeping the long __kvm_handle_fault_on_reboot() name for the macro itself and simply moving the __ex() macro? That would also allow keeping kvm_spurious_fault() and __kvm_handle_fault_on_reboot() where they are (for no reason other than to avoid code churn). Though I'm also ok if folks would prefer to move everything to x86.h. > and move the definition of __ex to a common include to be > shared between VMX and SVM.