From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 25 Dec 2008 17:02:25 +0000 (+0100)
Subject: Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz... 
X-Git-Tag: v2.6.29-rc1~571^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32e8d18683adb322c994d1a0fe02d66380991f45;p=platform%2Fkernel%2Flinux-exynos.git

Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/rtc' into timers/core
---

32e8d18683adb322c994d1a0fe02d66380991f45
diff --cc kernel/sched.c
index e4bb1dd,e4bb1dd,9b1e793,5ac5e95,e4bb1dd,e4bb1dd,e4bb1dd,57c933f..22c532a
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@@@@@@@ -1453,12 -1453,12 -1453,11 -1451,11 -1453,12 -1453,12 -1453,12 -1445,9 +1451,12 @@@@@@@@@ static int task_hot(struct task_struct 
        static unsigned long cpu_avg_load_per_task(int cpu)
        {
        	struct rq *rq = cpu_rq(cpu);
  ++   +	unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
        
  --   -	if (rq->nr_running)
  --   -		rq->avg_load_per_task = rq->load.weight / rq->nr_running;
  ++   +	if (nr_running)
  ++   +		rq->avg_load_per_task = rq->load.weight / nr_running;
       +	else
       +		rq->avg_load_per_task = 0;
        
        	return rq->avg_load_per_task;
        }