Commit f5349d4b authored by Zheng Zucheng's avatar Zheng Zucheng
Browse files

sched: Revert fix unbalance sched_smt_present dec/inc

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 5da5a36a.

Conflicts:
    kernel/sched/core.c
[Some contexts around sched_cpu_deactivate different. No functional impact.]
Signed-off-by: default avatarZheng Zucheng <zhengzucheng@huawei.com>
parent e1994ce0
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -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;
	}