]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
committerBrian Maly <brian.maly@oracle.com>
Mon, 21 May 2018 22:04:09 +0000 (18:04 -0400)
commit091d0bdc3e8a68ce352c26bd1da0373fe337bf32
tree0ea8eaf19c526ea8c96221692eeb9fd50eab10b4
parent1dc1d6e204b3aa16c90249f21935d0c3687303bd
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.

OraBug: 28041771
CVE: CVE-2018-3639

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 28a2775217b17208811fa43a9e96bd1fdf417b86)
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Mihai Carabas <mihai.carabas@oracle.com>
 Conflicts:
arch/x86/kernel/cpu/bugs.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c

Signed-off-by: Brian Maly <brian.maly@oracle.com>
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_64.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c