diff options
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | kernel/sched.c | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 754b3deed02b..dfc21fb76bf1 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -145,7 +145,6 @@ extern unsigned long this_cpu_load(void); | |||
| 145 | 145 | ||
| 146 | 146 | ||
| 147 | extern void calc_global_load(void); | 147 | extern void calc_global_load(void); |
| 148 | extern u64 cpu_nr_migrations(int cpu); | ||
| 149 | 148 | ||
| 150 | extern unsigned long get_parent_ip(unsigned long addr); | 149 | extern unsigned long get_parent_ip(unsigned long addr); |
| 151 | 150 | ||
diff --git a/kernel/sched.c b/kernel/sched.c index 67be4d0dddaa..30fd0ba5f603 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -541,7 +541,6 @@ struct rq { | |||
| 541 | struct load_weight load; | 541 | struct load_weight load; |
| 542 | unsigned long nr_load_updates; | 542 | unsigned long nr_load_updates; |
| 543 | u64 nr_switches; | 543 | u64 nr_switches; |
| 544 | u64 nr_migrations_in; | ||
| 545 | 544 | ||
| 546 | struct cfs_rq cfs; | 545 | struct cfs_rq cfs; |
| 547 | struct rt_rq rt; | 546 | struct rt_rq rt; |
| @@ -2049,7 +2048,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) | |||
| 2049 | #endif | 2048 | #endif |
| 2050 | if (old_cpu != new_cpu) { | 2049 | if (old_cpu != new_cpu) { |
| 2051 | p->se.nr_migrations++; | 2050 | p->se.nr_migrations++; |
| 2052 | new_rq->nr_migrations_in++; | ||
| 2053 | #ifdef CONFIG_SCHEDSTATS | 2051 | #ifdef CONFIG_SCHEDSTATS |
| 2054 | if (task_hot(p, old_rq->clock, NULL)) | 2052 | if (task_hot(p, old_rq->clock, NULL)) |
| 2055 | schedstat_inc(p, se.nr_forced2_migrations); | 2053 | schedstat_inc(p, se.nr_forced2_migrations); |
| @@ -2989,15 +2987,6 @@ static void calc_load_account_active(struct rq *this_rq) | |||
| 2989 | } | 2987 | } |
| 2990 | 2988 | ||
| 2991 | /* | 2989 | /* |
| 2992 | * Externally visible per-cpu scheduler statistics: | ||
| 2993 | * cpu_nr_migrations(cpu) - number of migrations into that cpu | ||
| 2994 | */ | ||
| 2995 | u64 cpu_nr_migrations(int cpu) | ||
| 2996 | { | ||
| 2997 | return cpu_rq(cpu)->nr_migrations_in; | ||
| 2998 | } | ||
| 2999 | |||
| 3000 | /* | ||
| 3001 | * Update rq->cpu_load[] statistics. This function is usually called every | 2990 | * Update rq->cpu_load[] statistics. This function is usually called every |
| 3002 | * scheduler tick (TICK_NSEC). | 2991 | * scheduler tick (TICK_NSEC). |
| 3003 | */ | 2992 | */ |
