diff options
-rw-r--r-- | kernel/Kconfig.hz | 2 | ||||
-rw-r--r-- | kernel/sched_rt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz index 2a202a846757..382dd5a8b2d7 100644 --- a/kernel/Kconfig.hz +++ b/kernel/Kconfig.hz | |||
@@ -55,4 +55,4 @@ config HZ | |||
55 | default 1000 if HZ_1000 | 55 | default 1000 if HZ_1000 |
56 | 56 | ||
57 | config SCHED_HRTICK | 57 | config SCHED_HRTICK |
58 | def_bool HIGH_RES_TIMERS | 58 | def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index f85a76363eee..908c04f9dad0 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) | |||
253 | 253 | ||
254 | diff = iter->rt_runtime - iter->rt_time; | 254 | diff = iter->rt_runtime - iter->rt_time; |
255 | if (diff > 0) { | 255 | if (diff > 0) { |
256 | do_div(diff, weight); | 256 | diff = div_u64((u64)diff, weight); |
257 | if (rt_rq->rt_runtime + diff > rt_period) | 257 | if (rt_rq->rt_runtime + diff > rt_period) |
258 | diff = rt_period - rt_rq->rt_runtime; | 258 | diff = rt_period - rt_rq->rt_runtime; |
259 | iter->rt_runtime -= diff; | 259 | iter->rt_runtime -= diff; |