diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 6 | ||||
-rw-r--r-- | kernel/sched_debug.c | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 36cc05a76947..bc68037f3199 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2067,7 +2067,6 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd) | |||
2067 | void set_task_cpu(struct task_struct *p, unsigned int new_cpu) | 2067 | void set_task_cpu(struct task_struct *p, unsigned int new_cpu) |
2068 | { | 2068 | { |
2069 | int old_cpu = task_cpu(p); | 2069 | int old_cpu = task_cpu(p); |
2070 | struct rq *old_rq = cpu_rq(old_cpu); | ||
2071 | struct cfs_rq *old_cfsrq = task_cfs_rq(p), | 2070 | struct cfs_rq *old_cfsrq = task_cfs_rq(p), |
2072 | *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu); | 2071 | *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu); |
2073 | 2072 | ||
@@ -2075,10 +2074,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) | |||
2075 | 2074 | ||
2076 | if (old_cpu != new_cpu) { | 2075 | if (old_cpu != new_cpu) { |
2077 | p->se.nr_migrations++; | 2076 | p->se.nr_migrations++; |
2078 | #ifdef CONFIG_SCHEDSTATS | ||
2079 | if (task_hot(p, old_rq->clock, NULL)) | ||
2080 | schedstat_inc(p, se.nr_forced2_migrations); | ||
2081 | #endif | ||
2082 | perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, | 2077 | perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, |
2083 | 1, 1, NULL, 0); | 2078 | 1, 1, NULL, 0); |
2084 | } | 2079 | } |
@@ -2521,7 +2516,6 @@ static void __sched_fork(struct task_struct *p) | |||
2521 | p->se.nr_failed_migrations_running = 0; | 2516 | p->se.nr_failed_migrations_running = 0; |
2522 | p->se.nr_failed_migrations_hot = 0; | 2517 | p->se.nr_failed_migrations_hot = 0; |
2523 | p->se.nr_forced_migrations = 0; | 2518 | p->se.nr_forced_migrations = 0; |
2524 | p->se.nr_forced2_migrations = 0; | ||
2525 | 2519 | ||
2526 | p->se.nr_wakeups = 0; | 2520 | p->se.nr_wakeups = 0; |
2527 | p->se.nr_wakeups_sync = 0; | 2521 | p->se.nr_wakeups_sync = 0; |
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 0fc5287fe80f..5ae24fc65d75 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c | |||
@@ -432,7 +432,6 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) | |||
432 | P(se.nr_failed_migrations_running); | 432 | P(se.nr_failed_migrations_running); |
433 | P(se.nr_failed_migrations_hot); | 433 | P(se.nr_failed_migrations_hot); |
434 | P(se.nr_forced_migrations); | 434 | P(se.nr_forced_migrations); |
435 | P(se.nr_forced2_migrations); | ||
436 | P(se.nr_wakeups); | 435 | P(se.nr_wakeups); |
437 | P(se.nr_wakeups_sync); | 436 | P(se.nr_wakeups_sync); |
438 | P(se.nr_wakeups_migrate); | 437 | P(se.nr_wakeups_migrate); |
@@ -508,7 +507,6 @@ void proc_sched_set_task(struct task_struct *p) | |||
508 | p->se.nr_failed_migrations_running = 0; | 507 | p->se.nr_failed_migrations_running = 0; |
509 | p->se.nr_failed_migrations_hot = 0; | 508 | p->se.nr_failed_migrations_hot = 0; |
510 | p->se.nr_forced_migrations = 0; | 509 | p->se.nr_forced_migrations = 0; |
511 | p->se.nr_forced2_migrations = 0; | ||
512 | p->se.nr_wakeups = 0; | 510 | p->se.nr_wakeups = 0; |
513 | p->se.nr_wakeups_sync = 0; | 511 | p->se.nr_wakeups_sync = 0; |
514 | p->se.nr_wakeups_migrate = 0; | 512 | p->se.nr_wakeups_migrate = 0; |