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

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

diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 2a202a846757f238cccb290033633e5778bd3bb9..382dd5a8b2d7f5dd97359895358610f2f4866595 100644 (file)
--- 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

diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index f85a76363eee873e23edd0983e7427be65b4fb08..908c04f9dad02d23df66fbc55a28f5619fc10081 100644 (file)
--- 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;