Unverified Commit 85c2b796 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1611 sched: Fix build error for dynamic_affinity_enable() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hui Tang <tanghui20@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6VOVLX7JNJMSBWIH6TBFRFMXDKVTP6ME/ 
 
https://gitee.com/openeuler/kernel/issues/I7PNAF 
 
Link:https://gitee.com/openeuler/kernel/pulls/1611

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1c9231cb 5cd4e53a

kernel/sched/fair.c

+0 −9
Original line number Diff line number Diff line
@@ -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

 *