Offering: HULK hulk inclusion category: other bugzilla: 189013 -------------------------------- The solution has been fixed in the community. So revert "[Huawei] sched/smt: fix unbalance sched_smt_present dec/inc" This reverts commit 0a948df174ce31f30a70c3a2adc668e23262b063. Conflicts: kernel/sched/core.c [Some contexts around sched_cpu_deactivate different. No functional impact.] Signed-off-by: Zheng Zucheng <zhengzucheng@huawei.com> --- kernel/sched/core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index fe9f91f39e2f..a87b7b3a6c12 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5897,10 +5897,6 @@ int sched_cpu_deactivate(unsigned int cpu) ret = cpuset_cpu_inactive(cpu); if (ret) { -#ifdef CONFIG_SCHED_SMT - if (cpumask_weight(cpu_smt_mask(cpu)) == 2) - static_branch_inc_cpuslocked(&sched_smt_present); -#endif set_cpu_active(cpu, true); return ret; } -- 2.34.1