diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-11-18 09:34:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-11-18 09:34:44 +0100 |
| commit | ec05a2311c35243cea08bca00bcf53a576ee41a2 (patch) | |
| tree | b6feae6520bdeeb40f5c08e509b108d84199db7b /kernel/sched/fair.c | |
| parent | a7a0aaa17ace589897021d668e09d474e7fc4c4d (diff) | |
| parent | 5258f386ea4e8454bc801fb443e8a4217da1947c (diff) | |
| download | linux-ec05a2311c35243cea08bca00bcf53a576ee41a2.tar.gz linux-ec05a2311c35243cea08bca00bcf53a576ee41a2.tar.bz2 linux-ec05a2311c35243cea08bca00bcf53a576ee41a2.zip | |
Merge branch 'sched/urgent' into sched/core
Merge in fixes before we queue up dependent bits, to avoid conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a319d56c7605..59e072b2db97 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3330,7 +3330,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ * Batch and idle tasks do not preempt non-idle tasks (their preemption * is driven by the tick): */ - if (unlikely(p->policy != SCHED_NORMAL)) + if (unlikely(p->policy != SCHED_NORMAL) || !sched_feat(WAKEUP_PREEMPTION)) return; find_matching_se(&se, &pse); |