From e5860383e39b54eb4bfe0783e5b98957e50fa29b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 10 Dec 2009 20:32:39 +0100 Subject: [PATCH] --- yaml --- r: 175595 b: refs/heads/master c: b9889ed1ddeca5a3f3569c8de7354e9e97d803ae h: refs/heads/master i: 175593: 34699045eda8dd02d4d8aed444063b95aeaaa2d1 175591: 27cabfa3a5eace82a063967528ce48ec884913b7 v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 1 - trunk/kernel/sched.c | 6 ------ trunk/kernel/sched_debug.c | 2 -- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0658d3d218a3..ba211f22d8b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfc12eb26a285df316be68a808af86964f3bff86 +refs/heads/master: b9889ed1ddeca5a3f3569c8de7354e9e97d803ae diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index ee9f200d12d3..87b89a827f0c 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1174,7 +1174,6 @@ struct sched_entity { u64 nr_failed_migrations_running; u64 nr_failed_migrations_hot; u64 nr_forced_migrations; - u64 nr_forced2_migrations; u64 nr_wakeups; u64 nr_wakeups_sync; diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 36cc05a76947..bc68037f3199 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2067,7 +2067,6 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd) void set_task_cpu(struct task_struct *p, unsigned int new_cpu) { int old_cpu = task_cpu(p); - struct rq *old_rq = cpu_rq(old_cpu); struct cfs_rq *old_cfsrq = task_cfs_rq(p), *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu); @@ -2075,10 +2074,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) if (old_cpu != new_cpu) { p->se.nr_migrations++; -#ifdef CONFIG_SCHEDSTATS - if (task_hot(p, old_rq->clock, NULL)) - schedstat_inc(p, se.nr_forced2_migrations); -#endif perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0); } @@ -2521,7 +2516,6 @@ static void __sched_fork(struct task_struct *p) p->se.nr_failed_migrations_running = 0; p->se.nr_failed_migrations_hot = 0; p->se.nr_forced_migrations = 0; - p->se.nr_forced2_migrations = 0; p->se.nr_wakeups = 0; p->se.nr_wakeups_sync = 0; diff --git a/trunk/kernel/sched_debug.c b/trunk/kernel/sched_debug.c index 0fc5287fe80f..5ae24fc65d75 100644 --- a/trunk/kernel/sched_debug.c +++ b/trunk/kernel/sched_debug.c @@ -432,7 +432,6 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) P(se.nr_failed_migrations_running); P(se.nr_failed_migrations_hot); P(se.nr_forced_migrations); - P(se.nr_forced2_migrations); P(se.nr_wakeups); P(se.nr_wakeups_sync); P(se.nr_wakeups_migrate); @@ -508,7 +507,6 @@ void proc_sched_set_task(struct task_struct *p) p->se.nr_failed_migrations_running = 0; p->se.nr_failed_migrations_hot = 0; p->se.nr_forced_migrations = 0; - p->se.nr_forced2_migrations = 0; p->se.nr_wakeups = 0; p->se.nr_wakeups_sync = 0; p->se.nr_wakeups_migrate = 0;