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

Commit 8ffa5b65 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: clean up compiler warning
  sched: fix hrtick & generic-ipi dependency
parents 6209ed9d 58838cf3

kernel/Kconfig.hz

+1 −1
Original line number Diff line number Diff line
@@ -55,4 +55,4 @@ config HZ 
	default 1000 if HZ_1000



config SCHED_HRTICK

	def_bool HIGH_RES_TIMERS
 
	def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS

kernel/sched_rt.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static int do_balance_runtime(struct rt_rq *rt_rq) 


		diff = iter->rt_runtime - iter->rt_time;

		if (diff > 0) {

			do_div(diff, weight);

			diff = div_u64((u64)diff, weight);

			if (rt_rq->rt_runtime + diff > rt_period)

				diff = rt_period - rt_rq->rt_runtime;

			iter->rt_runtime -= diff;