diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-05 16:50:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-05 16:50:24 -0800 |
| commit | 7125faceabe43067293d0c9e2ef7154ecea51721 (patch) | |
| tree | 9de559e9280843d02d9a70976fbad23428161189 /kernel/sched_rt.c | |
| parent | 35337c834124d2893b7fe4ba683c7639e6c37e0c (diff) | |
| parent | 4cecf6d401a01d054afc1e5f605bcbfe553cb9b9 (diff) | |
| download | linux-7125faceabe43067293d0c9e2ef7154ecea51721.tar.gz | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched, x86: Avoid unnecessary overflow in sched_clock
sched: Fix buglet in return_cfs_rq_runtime()
sched: Avoid SMT siblings in select_idle_sibling() if possible
sched: Set the command name of the idle tasks in SMP kernels
sched, rt: Provide means of disabling cross-cpu bandwidth sharing
sched: Document wait_for_completion_*() return values
sched_fair: Fix a typo in the comment describing update_sd_lb_stats
sched: Add a comment to effective_load() since it's a pain
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 056cbd2e2a27..583a1368afe6 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -560,6 +560,9 @@ static int balance_runtime(struct rt_rq *rt_rq) { int more = 0; + if (!sched_feat(RT_RUNTIME_SHARE)) + return more; + if (rt_rq->rt_time > rt_rq->rt_runtime) { raw_spin_unlock(&rt_rq->rt_runtime_lock); more = do_balance_runtime(rt_rq); |