x86/speculation: Create spec-ctrl.h to avoid include hell

Browse source

commit 28a2775217 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>

...

This commit is contained in:

Thomas Gleixner 2018-04-29 15:01:37 +02:00 • committed by Greg Kroah-Hartman

parent 97224b3da6

commit 81c3c2b591

6 changed files with 25 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

arch/x86/include/asm/nospec-branch.h

View file

21

arch/x86/include/asm/spec-ctrl.h

View file

2

arch/x86/kernel/cpu/amd.c

View file

2

arch/x86/kernel/cpu/bugs.c

View file

2

arch/x86/kvm/svm.c

View file

2

arch/x86/kvm/vmx.c

View file