summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/vmx.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-04-29 15:01:37 +0200
committerThomas Gleixner <tglx@linutronix.de>2018-05-03 13:55:50 +0200
commit28a2775217b17208811fa43a9e96bd1fdf417b86 (patch)
treeb72832cf4df7520d6de538c78db27218b5286dde /arch/x86/kvm/vmx.c
parentda39556f66f5cfe8f9c989206974f1cb16ca5d7c (diff)
downloadblackbird-obmc-linux-28a2775217b17208811fa43a9e96bd1fdf417b86.tar.gz
blackbird-obmc-linux-28a2775217b17208811fa43a9e96bd1fdf417b86.zip
x86/speculation: Create spec-ctrl.h to avoid include hell
Having everything in nospec-branch.h creates a hell of dependencies when adding the prctl based switching mechanism. Move everything which is not required in nospec-branch.h to spec-ctrl.h and fix up the includes in the relevant files. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 4197942b6d9b..16a111e44691 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -51,7 +51,7 @@
#include <asm/apic.h>
#include <asm/irq_remapping.h>
#include <asm/mmu_context.h>
-#include <asm/nospec-branch.h>
+#include <asm/spec-ctrl.h>
#include <asm/mshyperv.h>
#include "trace.h"
OpenPOWER on IntegriCloud