From: tip-bot for Ingo Molnar <mingo@kernel.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, riel@redhat.com, hpa@zytor.com,
mingo@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de
Subject: [tip:numa/core] sched: Fix !CONFIG_SCHED_NUMA account_numa_enqueue () variant
Date: Fri, 19 Oct 2012 18:09:16 -0700 [thread overview]
Message-ID: <tip-aacc9ac4dc832613f12e4022f4a51f5d0d5136a7@git.kernel.org> (raw)
Commit-ID: aacc9ac4dc832613f12e4022f4a51f5d0d5136a7
Gitweb: http://git.kernel.org/tip/aacc9ac4dc832613f12e4022f4a51f5d0d5136a7
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Sat, 20 Oct 2012 02:22:53 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 20 Oct 2012 02:22:53 +0200
sched: Fix !CONFIG_SCHED_NUMA account_numa_enqueue() variant
This build warning:
kernel/sched/fair.c:1015:1: warning: no return statement in function returning non-void
Triggers because the dummy account_numa_enqueue() should return the
rq's task list.
It's not possible to trigger this bug runtime, nevertheless fix the
warning.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rik van Riel <riel@redhat.com>
Link: http://lkml.kernel.org/n/tip-qauskiJfwddwtkf5pivzht5U@git.kernel.org
---
kernel/sched/fair.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index e93032d..05d568f 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -967,6 +967,7 @@ void task_tick_numa(struct rq *rq, struct task_struct *curr)
#else
static struct list_head *account_numa_enqueue(struct rq *rq, struct task_struct *p)
{
+ return &rq->cfs_tasks;
}
static void account_numa_dequeue(struct rq *rq, struct task_struct *p)
next reply other threads:[~2012-10-20 1:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-20 1:09 tip-bot for Ingo Molnar [this message]
2012-10-20 1:19 tip-bot for Ingo Molnar
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=tip-aacc9ac4dc832613f12e4022f4a51f5d0d5136a7@git.kernel.org \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
/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
Powered by JetHome