diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:31:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:31:07 +0100 |
| commit | e783377e93d4043a11013ce6e9173db34998e653 (patch) | |
| tree | 47a56d363512337d78aa1cef0b620cbc7b53092f /kernel/sched/fair.c | |
| parent | Merge branch 'linus' into sched/core (diff) | |
| parent | cputime: Comment cputime's adjusting code (diff) | |
| download | linux-dev-e783377e93d4043a11013ce6e9173db34998e653.tar.xz linux-dev-e783377e93d4043a11013ce6e9173db34998e653.zip | |
Merge tag 'cputime-adjustment-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull cputime cleanups from Frederic Weisbecker:
* Improve naming and code location
* Consolidate adjustment code
* Comment the adjustement code
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
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); |