diff options
| author | Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2019-01-17 11:10:59 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-01-29 22:20:24 +0100 |
| commit | 34d66caf251df91ff27b24a3a786810d29989eca (patch) | |
| tree | d4a0aebc5672f47e21590f8f2955812f120a99a9 /kernel | |
| parent | Revert "mm, memory_hotplug: initialize struct pages for the full memory section" (diff) | |
| download | linux-34d66caf251df91ff27b24a3a786810d29989eca.tar.xz linux-34d66caf251df91ff27b24a3a786810d29989eca.zip | |
x86/speculation: Remove redundant arch_smt_update() invocation
With commit a74cfffb03b7 ("x86/speculation: Rework SMT state change"),
arch_smt_update() is invoked from each individual CPU hotplug function.
Therefore the extra arch_smt_update() call in the sysfs SMT control is
redundant.
Fixes: a74cfffb03b7 ("x86/speculation: Rework SMT state change")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: <konrad.wilk@oracle.com>
Cc: <dwmw@amazon.co.uk>
Cc: <bp@suse.de>
Cc: <srinivas.eeda@oracle.com>
Cc: <peterz@infradead.org>
Cc: <hpa@zytor.com>
Link: https://lkml.kernel.org/r/e2e064f2-e8ef-42ca-bf4f-76b612964752@default
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 91d5c38eb7e5..c0c7f64573ed 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2090,10 +2090,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; } @@ -2104,7 +2102,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))) |