The patch titled sched-improve-migration-accuracy tidy has been added to the -mm tree. Its filename is sched-improve-migration-accuracy-tidy.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: sched-improve-migration-accuracy tidy From: "Chen, Kenneth W" <kenneth.w.chen@xxxxxxxxx> While we at it, let's clean up this hunk. task_hot is evaluated twice in the more common case of nr_balance_failed <= cache_nice_tries. We should only test/increment relevant stats for forced migration. Signed-off-by: Ken Chen <kenneth.w.chen@xxxxxxxxx> Cc: Mike Galbraith <efault@xxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Ken Chen <kenneth.w.chen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- kernel/sched.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff -puN kernel/sched.c~sched-improve-migration-accuracy-tidy kernel/sched.c --- a/kernel/sched.c~sched-improve-migration-accuracy-tidy +++ a/kernel/sched.c @@ -2106,8 +2106,13 @@ int can_migrate_task(struct task_struct * 2) too many balance attempts have failed. */ - if (sd->nr_balance_failed > sd->cache_nice_tries) + if (sd->nr_balance_failed > sd->cache_nice_tries) { +#ifdef CONFIG_SCHEDSTATS + if (task_hot(p, rq->most_recent_timestamp, sd)) + schedstat_inc(sd, lb_hot_gained[idle]); +#endif return 1; + } if (task_hot(p, rq->most_recent_timestamp, sd)) return 0; @@ -2207,11 +2212,6 @@ skip_queue: goto skip_bitmap; } -#ifdef CONFIG_SCHEDSTATS - if (task_hot(tmp, busiest->most_recent_timestamp, sd)) - schedstat_inc(sd, lb_hot_gained[idle]); -#endif - pull_task(busiest, array, tmp, this_rq, dst_array, this_cpu); pulled++; rem_load_move -= tmp->load_weight; _ Patches currently in -mm which might be from kenneth.w.chen@xxxxxxxxx are __unmap_hugepage_range-add-comment.patch shared-page-table-for-hugetlb-page-v4.patch htlb-forget-rss-with-pt-sharing.patch sched-avoid-taking-rq-lock-in-wake_priority_sleeper.patch sched-remove-staggering-of-load-balancing.patch sched-disable-interrupts-for-locking-in-load_balance.patch sched-extract-load-calculation-from-rebalance_tick.patch sched-move-idle-status-calculation-into-rebalance_tick.patch sched-use-softirq-for-load-balancing.patch sched-call-tasklet-less-frequently.patch sched-add-option-to-serialize-load-balancing.patch sched-improve-migration-accuracy.patch sched-improve-migration-accuracy-tidy.patch mm-only-sched-add-a-few-scheduler-event-counters.patch sched-optimize-activate_task-for-rt-task.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html