OSDN Git Service

x86/speculation: Create spec-ctrl.h to avoid include hell
authorThomas Gleixner <tglx@linutronix.de>
Sun, 29 Apr 2018 13:01:37 +0000 (15:01 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 3 May 2018 11:55:50 +0000 (13:55 +0200)
commit28a2775217b17208811fa43a9e96bd1fdf417b86
treeb72832cf4df7520d6de538c78db27218b5286dde
parentda39556f66f5cfe8f9c989206974f1cb16ca5d7c
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>
arch/x86/include/asm/nospec-branch.h
arch/x86/include/asm/spec-ctrl.h [new file with mode: 0644]
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/bugs.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c