OSDN Git Service

x86/speculation: Move arch_smt_update() call to after mitigation decisions
authorJosh Poimboeuf <jpoimboe@redhat.com>
Tue, 2 Apr 2019 15:00:14 +0000 (10:00 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 May 2019 17:19:41 +0000 (19:19 +0200)
commit98c4b3c2ee37ca65d72d23243b621006b69158fd
tree7ff0547ff664d79ffbdd31722a840f8f7c49681b
parentf02eee68e2fc2ded5d620684599826d10392d055
x86/speculation: Move arch_smt_update() call to after mitigation decisions

commit 7c3658b20194a5b3209a143f63bc9c643c6a3ae2 upstream.

arch_smt_update() now has a dependency on both Spectre v2 and MDS
mitigations.  Move its initial call to after all the mitigation decisions
have been made.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/cpu/bugs.c