scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Stanislaw Gruszka (1):
sched: Fix user time incorrectly accounted as system time on 32-bit
Suresh Siddha (1):
sched: Fix nohz balance kick
kernel/sched.c | 8 ++++---- kernel/sched_fair.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
kernel/sched.c +4 -4
@@ -3513,9 +3513,9 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st) rtime =nsecs_to_cputime (p->se.sum_exec_runtime);if (total) { -u64 temp; +u64 temp = rtime; - temp = (u64)(rtime * utime); + temp *= utime;do_div (temp, total); utime = (cputime_t )temp; }else
@@ -3546,9 +3546,9 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) rtime =nsecs_to_cputime (cputime.sum_exec_runtime);if (total) { -u64 temp; +u64 temp = rtime; - temp = (u64)(rtime * cputime.utime); + temp *= cputime.utime;do_div (temp, total); utime = (cputime_t )temp; }else
kernel/sched_fair.c +1 -1
@@ -3630,7 +3630,7 @@ static inline int nohz_kick_needed(struct rq *rq, int cpu)if (time_before (now, nohz.next_balance))return 0 ; -if (!rq->nr_running) +if (rq->idle_at_tick)return 0 ; first_pick_cpu =atomic_read (&nohz.first_pick_cpu);