Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8ffa5b65968262ba6bb046329972791c0d960745

Authored by Linus Torvalds
2 parents 6209ed9d84 58838cf3ca
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

…l/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

Showing 2 changed files Side-by-side Diff

... ... @@ -55,5 +55,5 @@
55 55 default 1000 if HZ_1000
56 56  
57 57 config SCHED_HRTICK
58   - def_bool HIGH_RES_TIMERS
  58 + def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS
... ... @@ -253,7 +253,7 @@
253 253  
254 254 diff = iter->rt_runtime - iter->rt_time;
255 255 if (diff > 0) {
256   - do_div(diff, weight);
  256 + diff = div_u64((u64)diff, weight);
257 257 if (rt_rq->rt_runtime + diff > rt_period)
258 258 diff = rt_period - rt_rq->rt_runtime;
259 259 iter->rt_runtime -= diff;