[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-aacc9ac4dc832613f12e4022f4a51f5d0d5136a7@git.kernel.org>
Date: Fri, 19 Oct 2012 18:09:16 -0700
From: tip-bot for Ingo Molnar <mingo@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, riel@...hat.com, hpa@...or.com,
mingo@...nel.org, a.p.zijlstra@...llo.nl, tglx@...utronix.de
Subject: [tip:numa/core] sched: Fix !CONFIG_SCHED_NUMA account_numa_enqueue
() variant
Commit-ID: aacc9ac4dc832613f12e4022f4a51f5d0d5136a7
Gitweb: http://git.kernel.org/tip/aacc9ac4dc832613f12e4022f4a51f5d0d5136a7
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Sat, 20 Oct 2012 02:22:53 +0200
Committer: Ingo Molnar <mingo@...nel.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@...nel.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Rik van Riel <riel@...hat.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists