diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-22 13:18:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-22 13:18:15 +0100 |
| commit | d68321dec1b2234fb32f423e32c3af5915eae36c (patch) | |
| tree | 7c62b2c76d62ab607238bc2cccc24eed0b32687a /arch/x86/kernel/kvm.c | |
| parent | 19a049f1a44d18e38a311e723c19c33c81020a30 (diff) | |
| parent | d89c69f42bf0fe42d1f52ea9b3dca15b1ade7601 (diff) | |
Merge tag 'kvm-ppc-fixes-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
PPC KVM fix for 5.5
- Fix a bug where we try to do an ultracall on a system without an
ultravisor.
Diffstat (limited to 'arch/x86/kernel/kvm.c')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index e820568ed4d5..32ef1ee733b7 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -33,6 +33,7 @@ #include <asm/apicdef.h> #include <asm/hypervisor.h> #include <asm/tlb.h> +#include <asm/cpuidle_haltpoll.h> static int kvmapf = 1; |