[tip:sched/core] sched: Fix UP update_avg() build warning
in [Kernel]
|
Prev: [PATCH] Speedup link loss detection for 3c59x
Next: Fix regression in O_DIRECT|O_SYNC writes to block devices
From: tip-bot for Mike Galbraith on 15 Apr 2010 05:20 Commit-ID: 09a40af5240de02d848247ab82440ad75b31ab11 Gitweb: http://git.kernel.org/tip/09a40af5240de02d848247ab82440ad75b31ab11 Author: Mike Galbraith <efault(a)gmx.de> AuthorDate: Thu, 15 Apr 2010 07:29:59 +0200 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Thu, 15 Apr 2010 09:36:47 +0200 sched: Fix UP update_avg() build warning update_avg() is only used for SMP builds, move it to the nearest SMP block. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Mike Galbraith <efault(a)gmx.de> Cc: Peter Zijlstra <peterz(a)infradead.org> LKML-Reference: <1271309399.14779.17.camel(a)marge.simson.net> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- kernel/sched.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index ab562ae..de0da71 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1872,12 +1872,6 @@ static void set_load_weight(struct task_struct *p) p->se.load.inv_weight = prio_to_wmult[p->static_prio - MAX_RT_PRIO]; } -static void update_avg(u64 *avg, u64 sample) -{ - s64 diff = sample - *avg; - *avg += diff >> 3; -} - static void enqueue_task(struct rq *rq, struct task_struct *p, int flags) { update_rq_clock(rq); @@ -2332,6 +2326,12 @@ int select_task_rq(struct rq *rq, struct task_struct *p, int sd_flags, int wake_ return cpu; } + +static void update_avg(u64 *avg, u64 sample) +{ + s64 diff = sample - *avg; + *avg += diff >> 3; +} #endif /*** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |