diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-12-16 18:04:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-06 15:03:18 -0800 |
| commit | 14ae08205860c0a902639ed2c0a601eef9c6d171 (patch) | |
| tree | a76947128e1e0bfafff3e039ea5502c68803de23 /kernel | |
| parent | fdf26751111406e31e5fcb3eb8b06f299ce3a06b (diff) | |
sched: Fix task_hot() test order
commit e6c8fba7771563b2f3dfb96a78f36ec17e15bdf0 upstream.
Make sure not to access sched_fair fields before verifying it is
indeed a sched_fair task.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <20091216170517.577998058@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index d079a9f64a8e..279785961eae 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2036,6 +2036,9 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd) { s64 delta; + if (p->sched_class != &fair_sched_class) + return 0; + /* * Buddy candidates are cache hot: */ @@ -2044,9 +2047,6 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd) &p->se == cfs_rq_of(&p->se)->last)) return 1; - if (p->sched_class != &fair_sched_class) - return 0; - if (sysctl_sched_migration_cost == -1) return 1; if (sysctl_sched_migration_cost == 0) |