From: Qian Cai <cai@lca.pw>
To: peterz@infradead.org, mingo@kernel.org
Cc: vincent.guittot@linaro.org, linux-kernel@vger.kernel.org,
Qian Cai <cai@lca.pw>
Subject: [PATCH] sched/fair: fix variable "done" set but not used
Date: Sat, 25 May 2019 12:18:21 -0400 [thread overview]
Message-ID: <20190525161821.1025-1-cai@lca.pw> (raw)
The commit f643ea220701 ("sched/nohz: Stop NOHZ stats when decayed")
introduced a compilation warning if CONFIG_NO_HZ_COMMON=n,
kernel/sched/fair.c: In function 'update_blocked_averages':
kernel/sched/fair.c:7750:7: warning: variable 'done' set but not used
[-Wunused-but-set-variable]
Fix it by adding a couple of "ifdef" macros as the variable is only
needed when CONFIG_NO_HZ_COMMON=y.
Signed-off-by: Qian Cai <cai@lca.pw>
---
kernel/sched/fair.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index f35930f5e528..c8682acf4508 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7747,7 +7747,9 @@ static void update_blocked_averages(int cpu)
struct cfs_rq *cfs_rq, *pos;
const struct sched_class *curr_class;
struct rq_flags rf;
+#ifdef CONFIG_NO_HZ_COMMON
bool done = true;
+#endif
rq_lock_irqsave(rq, &rf);
update_rq_clock(rq);
@@ -7774,20 +7776,22 @@ static void update_blocked_averages(int cpu)
if (cfs_rq_is_decayed(cfs_rq))
list_del_leaf_cfs_rq(cfs_rq);
+#ifdef CONFIG_NO_HZ_COMMON
/* Don't need periodic decay once load/util_avg are null */
if (cfs_rq_has_blocked(cfs_rq))
done = false;
}
+#endif
curr_class = rq->curr->sched_class;
update_rt_rq_load_avg(rq_clock_pelt(rq), rq, curr_class == &rt_sched_class);
update_dl_rq_load_avg(rq_clock_pelt(rq), rq, curr_class == &dl_sched_class);
update_irq_load_avg(rq, 0);
+#ifdef CONFIG_NO_HZ_COMMON
/* Don't need periodic decay once load/util_avg are null */
if (others_have_blocked(rq))
done = false;
-#ifdef CONFIG_NO_HZ_COMMON
rq->last_blocked_load_update_tick = jiffies;
if (done)
rq->has_blocked_load = 0;
--
2.20.1 (Apple Git-117)
next reply other threads:[~2019-05-25 16:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-25 16:18 Qian Cai [this message]
2019-05-26 23:56 ` [PATCH] sched/fair: fix variable "done" set but not used Valentin Schneider
2019-05-27 0:53 ` Qian Cai
2019-05-27 13:25 ` Valentin Schneider
2019-06-02 16:41 ` [PATCH] sched/fair: Cleanup definition of NOHZ blocked load functions Valentin Schneider
2019-06-03 9:38 ` Peter Zijlstra
2019-06-03 9:53 ` Vincent Guittot
2019-06-03 10:22 ` Valentin Schneider
2019-06-03 11:26 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190525161821.1025-1-cai@lca.pw \
--to=cai@lca.pw \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).