Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ce1e41c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix nohz balance kick
  sched: Fix user time incorrectly accounted as system time on 32-bit
parents 87ac6fa2 f6c3f168

kernel/sched.c

+4 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);