diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-15 13:53:05 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-08 22:20:30 +0200 |
| commit | 26d05b368a5c0a4e12da527fab98903a204bdc88 (patch) | |
| tree | 98b87efa58a348f470f780e09b6fa25c2ea8a69c /arch/x86/include | |
| parent | KVM: MIPS: fix spelling mistake "Exteneded" -> "Extended" (diff) | |
| parent | KVM: x86: Switch KVM guest to using interrupts for page ready APF delivery (diff) | |
| download | linux-26d05b368a5c0a4e12da527fab98903a204bdc88.tar.xz linux-26d05b368a5c0a4e12da527fab98903a204bdc88.zip | |
Merge branch 'kvm-async-pf-int' into HEAD
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/idtentry.h | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/kvm_para.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h index cf51c50eb356..cecc603eed35 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -647,6 +647,10 @@ DECLARE_IDTENTRY_SYSVEC(HYPERVISOR_CALLBACK_VECTOR, sysvec_acrn_hv_callback); DECLARE_IDTENTRY_SYSVEC(HYPERVISOR_CALLBACK_VECTOR, sysvec_xen_hvm_callback); #endif +#ifdef CONFIG_KVM_GUEST +DECLARE_IDTENTRY_SYSVEC(HYPERVISOR_CALLBACK_VECTOR, sysvec_kvm_asyncpf_interrupt); +#endif + #undef X86_TRAP_OTHER #endif diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index 49d3a9edb06f..ceb599c8cf79 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -4,6 +4,7 @@ #include <asm/processor.h> #include <asm/alternative.h> +#include <linux/interrupt.h> #include <uapi/asm/kvm_para.h> extern void kvmclock_init(void); |