summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/svm.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-04-29 15:01:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-22 18:54:03 +0200
commit81c3c2b5917af382a90d116a5ccd034fe5d32c2a (patch)
tree91748afd86b6dcd5095dbf4fc1616daac6f34d69 /arch/x86/kvm/svm.c
parent97224b3da69810155b44f173cc8959eea565a98d (diff)
downloadlinux-stable-81c3c2b5917af382a90d116a5ccd034fe5d32c2a.tar.gz
linux-stable-81c3c2b5917af382a90d116a5ccd034fe5d32c2a.tar.bz2
linux-stable-81c3c2b5917af382a90d116a5ccd034fe5d32c2a.zip
x86/speculation: Create spec-ctrl.h to avoid include hell
commit 28a2775217b17208811fa43a9e96bd1fdf417b86 upstream 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r--arch/x86/kvm/svm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 2625bae3ac5a..f432968fe42e 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -46,7 +46,7 @@
#include <asm/kvm_para.h>
#include <asm/irq_remapping.h>
#include <asm/microcode.h>
-#include <asm/nospec-branch.h>
+#include <asm/spec-ctrl.h>
#include <asm/virtext.h>
#include "trace.h"