hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7PNAF

-------------------------------

Fix build error if defined(!CONFIG_JUMP_LABEL) && defined(CONFIG_QOS_SCHED_DYNAMIC_AFFINITY).

Fixes: d8f77f894df3 ("sched: fix performance degradation on lmbench") Signed-off-by: Hui Tang tanghui20@huawei.com --- kernel/sched/fair.c | 9 --------- 1 file changed, 9 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 003ebd244d31..5c8b48150862 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7070,8 +7070,6 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) }

#ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY - -#ifdef CONFIG_JUMP_LABEL static DEFINE_STATIC_KEY_FALSE(__dynamic_affinity_used);

static __always_inline bool dynamic_affinity_used(void) @@ -7084,13 +7082,6 @@ void dynamic_affinity_enable(void) static_branch_enable_cpuslocked(&__dynamic_affinity_used); }

-#else /* CONFIG_JUMP_LABEL */ -static __always_inline bool dynamic_affinity_used(void) -{ - return true; -} -#endif - /* * Low utilization threshold for CPU *