From 4d8b1c5643af20000adac468f9a12f5f9112d207 Mon Sep 17 00:00:00 2001 From: Luis Henriques Date: Mon, 16 Mar 2009 19:59:02 +0000 Subject: [PATCH] --- yaml --- r: 135709 b: refs/heads/master c: 708dc5125309cd33c5daaad3026cc4ae6ef39c8b h: refs/heads/master i: 135707: 4fca315ec9de6b9f22747344c522441c4f27d566 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d6a1473dc172..b54dfffd4e8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80dd99b368cf6501be88ab517bbbb5bf352b75b8 +refs/heads/master: 708dc5125309cd33c5daaad3026cc4ae6ef39c8b diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 489e7d926408..d2dfe4c1a225 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3002,6 +3002,7 @@ int can_migrate_task(struct task_struct *p, struct rq *rq, int this_cpu, struct sched_domain *sd, enum cpu_idle_type idle, int *all_pinned) { + int tsk_cache_hot = 0; /* * We do not migrate tasks that are: * 1) running (obviously), or @@ -3025,10 +3026,11 @@ int can_migrate_task(struct task_struct *p, struct rq *rq, int this_cpu, * 2) too many balance attempts have failed. */ - if (!task_hot(p, rq->clock, sd) || - sd->nr_balance_failed > sd->cache_nice_tries) { + tsk_cache_hot = task_hot(p, rq->clock, sd); + if (!tsk_cache_hot || + sd->nr_balance_failed > sd->cache_nice_tries) { #ifdef CONFIG_SCHEDSTATS - if (task_hot(p, rq->clock, sd)) { + if (tsk_cache_hot) { schedstat_inc(sd, lb_hot_gained[idle]); schedstat_inc(p, se.nr_forced_migrations); } @@ -3036,7 +3038,7 @@ int can_migrate_task(struct task_struct *p, struct rq *rq, int this_cpu, return 1; } - if (task_hot(p, rq->clock, sd)) { + if (tsk_cache_hot) { schedstat_inc(p, se.nr_failed_migrations_hot); return 0; }