From bcff563f7ede0dae1dc9421adc3571621ce027cd Mon Sep 17 00:00:00 2001 From: Hiroshi Shimamoto Date: Wed, 4 Nov 2009 16:16:54 +0900 Subject: [PATCH] --- yaml --- r: 169888 b: refs/heads/master c: 9824a2b728b63e7ff586b9fd9293c819be79f0f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 1 - trunk/kernel/sched.c | 11 ----------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index dd1c1ae6f664..c3a8f3abd138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a2bb3142d326bb28b03875cabfc49baaac9a14a +refs/heads/master: 9824a2b728b63e7ff586b9fd9293c819be79f0f3 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 754b3deed02b..dfc21fb76bf1 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -145,7 +145,6 @@ extern unsigned long this_cpu_load(void); extern void calc_global_load(void); -extern u64 cpu_nr_migrations(int cpu); extern unsigned long get_parent_ip(unsigned long addr); diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 67be4d0dddaa..30fd0ba5f603 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -541,7 +541,6 @@ struct rq { struct load_weight load; unsigned long nr_load_updates; u64 nr_switches; - u64 nr_migrations_in; struct cfs_rq cfs; struct rt_rq rt; @@ -2049,7 +2048,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) #endif if (old_cpu != new_cpu) { p->se.nr_migrations++; - new_rq->nr_migrations_in++; #ifdef CONFIG_SCHEDSTATS if (task_hot(p, old_rq->clock, NULL)) schedstat_inc(p, se.nr_forced2_migrations); @@ -2988,15 +2986,6 @@ static void calc_load_account_active(struct rq *this_rq) } } -/* - * Externally visible per-cpu scheduler statistics: - * cpu_nr_migrations(cpu) - number of migrations into that cpu - */ -u64 cpu_nr_migrations(int cpu) -{ - return cpu_rq(cpu)->nr_migrations_in; -} - /* * Update rq->cpu_load[] statistics. This function is usually called every * scheduler tick (TICK_NSEC).