diff --git a/[refs] b/[refs] index 87ae932993f4..4e7bf1d71500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 422037bafde8083acc3c539ceba3dfc60a04110c +refs/heads/master: 58838cf3ca3337d76141c33d6c68376490263468 diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index 147004c651c0..93ac8ee08271 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/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;