* [tip:numa/core] sched: Fix !CONFIG_SCHED_NUMA account_numa_enqueue () variant
@ 2012-10-20 1:19 tip-bot for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Ingo Molnar @ 2012-10-20 1:19 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, riel, hpa, mingo, a.p.zijlstra, tglx
Commit-ID: 9744d7978477bddc141284876b6544f3d8f7dbd8
Gitweb: http://git.kernel.org/tip/9744d7978477bddc141284876b6544f3d8f7dbd8
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 03:12:17 +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..a66a1b6 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 NULL;
}
static void account_numa_dequeue(struct rq *rq, struct task_struct *p)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:numa/core] sched: Fix !CONFIG_SCHED_NUMA account_numa_enqueue () variant
@ 2012-10-20 1:09 tip-bot for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Ingo Molnar @ 2012-10-20 1:09 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, riel, hpa, mingo, a.p.zijlstra, tglx
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-20 1:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-20 1:19 [tip:numa/core] sched: Fix !CONFIG_SCHED_NUMA account_numa_enqueue () variant tip-bot for Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2012-10-20 1:09 tip-bot for Ingo Molnar
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