diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:35:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:35:56 +0100 |
| commit | 67b16c801606b467d11ca33838f305a6b4180f3b (patch) | |
| tree | 4e8f4e1b58d8c2066b5910e01f2a392741e772cd /arch/x86/kvm/vmx.c | |
| parent | a8f8523d853f8705cd3b7e74f0497860d5381991 (diff) | |
| parent | 606b3effb9ce2ab6f67eeecace381c701d411ecf (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.07-rt
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 63c44a9bf6bb..18143886b186 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -48,7 +48,7 @@ #include <asm/kexec.h> #include <asm/apic.h> #include <asm/irq_remapping.h> -#include <asm/nospec-branch.h> +#include <asm/spec-ctrl.h> #include "trace.h" #include "pmu.h" |