diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:53:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:53:51 -0700 |
| commit | 8ffa5b65968262ba6bb046329972791c0d960745 (patch) | |
| tree | 3ed3e019e812ab39f7836f0082825b9d11630856 /kernel | |
| parent | 6209ed9d8443b63c36d340908530fa470c4d4fff (diff) | |
| parent | 58838cf3ca3337d76141c33d6c68376490263468 (diff) | |
| download | op-kernel-dev-8ffa5b65968262ba6bb046329972791c0d960745.zip op-kernel-dev-8ffa5b65968262ba6bb046329972791c0d960745.tar.gz | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
Diffstat (limited to 'kernel')
| -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 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 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; |
