diff options
| author | Greg Kroah-Hartman | 2018-11-21 19:11:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-23 08:17:07 +0100 |
| commit | 6b188783345f6a8acd1d30f1aa14bfdf43e8aa82 (patch) | |
| tree | 1a5312734570772627013c9355cf9203f3a9483b /kernel | |
| parent | usbnet: smsc95xx: disable carrier check while suspending (diff) | |
| download | kernel-qcow2-linux-6b188783345f6a8acd1d30f1aa14bfdf43e8aa82.tar.gz kernel-qcow2-linux-6b188783345f6a8acd1d30f1aa14bfdf43e8aa82.tar.xz kernel-qcow2-linux-6b188783345f6a8acd1d30f1aa14bfdf43e8aa82.zip | |
Revert "x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation"
This reverts commit 233b9d7df0e114c7e7c3674559fb0fc41ada3e8f which is
commit 53c613fe6349994f023245519265999eed75957f upstream.
It's not ready for the stable trees as there are major slowdowns
involved with this patch.
Reported-by: Jiri Kosina <jkosina@suse.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: "WoodhouseDavid" <dwmw@amazon.co.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: "SchauflerCasey" <casey.schaufler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 3adecda21444..0097acec1c71 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2026,12 +2026,6 @@ static void cpuhp_online_cpu_device(unsigned int cpu) kobject_uevent(&dev->kobj, KOBJ_ONLINE); } -/* - * Architectures that need SMT-specific errata handling during SMT hotplug - * should override this. - */ -void __weak arch_smt_update(void) { }; - static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval) { int cpu, ret = 0; @@ -2058,10 +2052,8 @@ static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval) */ cpuhp_offline_cpu_device(cpu); } - if (!ret) { + if (!ret) cpu_smt_control = ctrlval; - arch_smt_update(); - } cpu_maps_update_done(); return ret; } @@ -2072,7 +2064,6 @@ static int cpuhp_smt_enable(void) cpu_maps_update_begin(); cpu_smt_control = CPU_SMT_ENABLED; - arch_smt_update(); for_each_present_cpu(cpu) { /* Skip online CPUs and CPUs on offline nodes */ if (cpu_online(cpu) || !node_online(cpu_to_node(cpu))) |