From ee6bb71210d09da821349500c4d9105aaf341907 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 16 Dec 2009 18:04:33 +0100 Subject: [PATCH] --- yaml --- r: 178027 b: refs/heads/master c: e6c8fba7771563b2f3dfb96a78f36ec17e15bdf0 h: refs/heads/master i: 178025: e1f76c2e5622860ce8cabd08b7ceebad5d2baf8f 178023: 48093d767efbf055148c28b9e09d99b83829c47e v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7625006acf6a..c2e65052ffbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee349ad6d326df3633d43f54202427295999c47 +refs/heads/master: e6c8fba7771563b2f3dfb96a78f36ec17e15bdf0 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 9c30858b6463..1d8ca25dd6fb 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2046,6 +2046,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: */ @@ -2054,9 +2057,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)