Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz...
Ingo Molnar [Thu, 25 Dec 2008 17:02:25 +0000 (18:02 +0100)]
1  2  3  4  5  6  7  8 
kernel/posix-timers.c
kernel/sched.c
kernel/time/tick-sched.c

Simple merge
diff --cc 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;
        }
Simple merge