Messages in this thread Patch in this message | | | Date | Tue, 05 Apr 2022 08:22:00 -0000 | From | "tip-bot2 for Sven Schnelle" <> | Subject | [tip: sched/urgent] entry: Fix compile error in dynamic_irqentry_exit_cond_resched() |
| |
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 0a70045ed8516dfcff4b5728557e1ef3fd017c53 Gitweb: https://git.kernel.org/tip/0a70045ed8516dfcff4b5728557e1ef3fd017c53 Author: Sven Schnelle <svens@linux.ibm.com> AuthorDate: Wed, 30 Mar 2022 10:43:28 +02:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Tue, 05 Apr 2022 09:59:36 +02:00
entry: Fix compile error in dynamic_irqentry_exit_cond_resched()
kernel/entry/common.c: In function ‘dynamic_irqentry_exit_cond_resched’: kernel/entry/common.c:409:14: error: implicit declaration of function ‘static_key_unlikely’; did you mean ‘static_key_enable’? [-Werror=implicit-function-declaration] 409 | if (!static_key_unlikely(&sk_dynamic_irqentry_exit_cond_resched)) | ^~~~~~~~~~~~~~~~~~~ | static_key_enable
static_key_unlikely() should be static_branch_unlikely().
Fixes: 99cf983cc8bca ("sched/preempt: Add PREEMPT_DYNAMIC using static keys") Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20220330084328.1805665-1-svens@linux.ibm.com --- kernel/entry/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index e57a224..93c3b86 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -392,7 +392,7 @@ DEFINE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched); DEFINE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched); void dynamic_irqentry_exit_cond_resched(void) { - if (!static_key_unlikely(&sk_dynamic_irqentry_exit_cond_resched)) + if (!static_branch_unlikely(&sk_dynamic_irqentry_exit_cond_resched)) return; raw_irqentry_exit_cond_resched(); }
| |