summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-11 16:46:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-11 16:46:31 -0700
commit1ea2950884aa320c46315c8ddf62717c6ecf78d0 (patch)
tree3e03cfd79dd3d629ee46bb04771d79250fe52ad3 /kernel/sched.c
parent67a077dca4e648a662e32cbeaaba8094d2e30229 (diff)
parente26b33e9552c29c1d3fe67dc602c6264c29f5dc7 (diff)
downloadop-kernel-dev-1ea2950884aa320c46315c8ddf62717c6ecf78d0.zip
op-kernel-dev-1ea2950884aa320c46315c8ddf62717c6ecf78d0.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, cpu hotplug: fix set_cpus_allowed() use in hotplug callbacks sched: fix mysql+oltp regression sched_clock: delay using sched_clock() sched clock: couple local and remote clocks sched clock: simplify __update_sched_clock() sched: eliminate scd->prev_raw sched clock: clean up sched_clock_cpu() sched clock: revert various sched_clock() changes sched: move sched_clock before first use sched: test runtime rather than period in global_rt_runtime() sched: fix SCHED_HRTICK dependency sched: fix warning in hrtick_start_fair()
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index ace566b..d601fb0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -833,7 +833,7 @@ static inline u64 global_rt_period(void)
static inline u64 global_rt_runtime(void)
{
- if (sysctl_sched_rt_period < 0)
+ if (sysctl_sched_rt_runtime < 0)
return RUNTIME_INF;
return (u64)sysctl_sched_rt_runtime * NSEC_PER_USEC;
OpenPOWER on IntegriCloud