From a66f5804aa6796e18d89ef79063968cafa6f6406 Mon Sep 17 00:00:00 2001 From: Erwei Deng Date: Mon, 31 Aug 2020 15:56:43 +0800 Subject: [PATCH 2065/2944] alinux: sched: Fix compiling error without CONFIG_FAIR_GROUP_SCHED fix #30159924 Fix the compiling errors when close the CONFIG_FAIR_GROUP_SCHED. Fixes: bb48b716f496 (alinux: sched: Add switch for update_blocked_averages) Signed-off-by: Erwei Deng Acked-by: Michael Wang --- kernel/sched/fair.c | 7 +++---- kernel/sysctl.c | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 44b549c..296bbdf 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7234,9 +7234,8 @@ static bool __update_blocked_others(struct rq *rq, bool *done) return decayed; } -#ifdef CONFIG_FAIR_GROUP_SCHED DEFINE_STATIC_KEY_TRUE(sched_blocked_averages); - +#ifdef CONFIG_FAIR_GROUP_SCHED static void set_blocked_averages(bool enabled) { if (enabled) @@ -7419,8 +7418,8 @@ static bool __update_blocked_fair(struct rq *rq, bool *done) struct cfs_rq *cfs_rq = &rq->cfs; bool decayed; - if (!static_key_true(&sched_blocked_averages)) - return; + if (!static_branch_likely(&sched_blocked_averages)) + return false; decayed = update_cfs_rq_load_avg(cfs_rq_clock_task(cfs_rq), cfs_rq); if (cfs_rq_has_blocked(cfs_rq)) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2bf58ad..d3879b9 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -363,6 +363,7 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write, .extra1 = &zero, .extra2 = &one, }, +#ifdef CONFIG_FAIR_GROUP_SCHED { .procname = "sched_blocked_averages", .data = NULL, @@ -372,6 +373,7 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write, .extra1 = &zero, .extra2 = &one, }, +#endif /* CONFIG_FAIR_GROUP_SCHED */ { .procname = "sched_tunable_scaling", .data = &sysctl_sched_tunable_scaling, -- 1.8.3.1