From abd7f977069de9b6008a94183cf37350c9c520b8 Mon Sep 17 00:00:00 2001 From: Erwei Deng Date: Tue, 1 Sep 2020 10:08:31 +0800 Subject: [PATCH 2066/2944] alinux: sched: Fix a branch prediction error in static_key fix #30159924 Fix a logical error for static_key API usage. It should be the static_branch_likely instead of static_branch_unlikely. And the sched_blocked_averages value is turned on in most cases. Fixes: bb48b716f496 (alinux: sched: Add switch for update_blocked_averages) Signed-off-by: Erwei Deng Acked-by: Michael Wang --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 296bbdf..703eb33 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7287,7 +7287,7 @@ static bool __update_blocked_fair(struct rq *rq, bool *done) bool decayed = false; int cpu = cpu_of(rq); - if (!static_branch_unlikely(&sched_blocked_averages)) + if (!static_branch_likely(&sched_blocked_averages)) return false; /* -- 1.8.3.1