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

8ffa5b65 · Linus Torvalds <[email protected]> · 2008-07-24 12:53:51 -07:00

* '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

Commit: 8ffa5b65968262ba6bb046329972791c0d960745
Parents: 6209ed9d · 58838cf3

Merge commit. Changes below are compared with the first parent: 6209ed9d.

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
kernel/Kconfig.hz	modified	+1	−1	View file
kernel/sched_rt.c	modified	+1	−1	View file

kernel/Kconfig.hz

View file

diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 2a202a8..382dd5a 100644
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -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

View file

diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index f85a763..908c04f 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -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;