hulk inclusion category: other bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAOXYI CVE: CVE-2024-44958
--------------------------------
The solution has been fixed in the community. So revert "[Huawei] sched/smt: fix unbalance sched_smt_present dec/inc"
This reverts commit 5da5a36af93b4a1ccdd62a74a124e2413f1944af.
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 18f0dc8275d3..c4da19b0b7bf 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8111,10 +8111,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; }