aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorxiaofeng.yan <yanxiaofeng@inspur.com>2015-09-23 02:55:59 -0400
committerIngo Molnar <mingo@kernel.org>2015-10-06 11:08:23 -0400
commit5a4fd0368517bc5b5399ef958f6d30cbff492918 (patch)
tree43d8d65ab75ddc9d3a361d7ff946f65d783bea06 /kernel/sched
parentce03e4137bb22fc560ad7a07cf4138ae2cd59f65 (diff)
sched/core: Remove a parameter in the migrate_task_rq() function
The parameter "int next_cpu" in the following function is unused: migrate_task_rq(struct task_struct *p, int next_cpu) Remove it. Signed-off-by: xiaofeng.yan <yanxiaofeng@inspur.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1442991360-31945-1-git-send-email-yanxiaofeng@inspur.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/core.c2
-rw-r--r--kernel/sched/fair.c2
-rw-r--r--kernel/sched/sched.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index a395db17ff4c..1764a0f2a75b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1294,7 +1294,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
1294 1294
1295 if (task_cpu(p) != new_cpu) { 1295 if (task_cpu(p) != new_cpu) {
1296 if (p->sched_class->migrate_task_rq) 1296 if (p->sched_class->migrate_task_rq)
1297 p->sched_class->migrate_task_rq(p, new_cpu); 1297 p->sched_class->migrate_task_rq(p);
1298 p->se.nr_migrations++; 1298 p->se.nr_migrations++;
1299 perf_event_task_migrate(p); 1299 perf_event_task_migrate(p);
1300 } 1300 }
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 3bdc3da7bc6a..700eb548315f 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5009,7 +5009,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
5009 * previous cpu. However, the caller only guarantees p->pi_lock is held; no 5009 * previous cpu. However, the caller only guarantees p->pi_lock is held; no
5010 * other assumptions, including the state of rq->lock, should be made. 5010 * other assumptions, including the state of rq->lock, should be made.
5011 */ 5011 */
5012static void migrate_task_rq_fair(struct task_struct *p, int next_cpu) 5012static void migrate_task_rq_fair(struct task_struct *p)
5013{ 5013{
5014 /* 5014 /*
5015 * We are supposed to update the task to "current" time, then its up to date 5015 * We are supposed to update the task to "current" time, then its up to date
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index e08cc4cf68e2..efd3bfc7e347 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1190,7 +1190,7 @@ struct sched_class {
1190 1190
1191#ifdef CONFIG_SMP 1191#ifdef CONFIG_SMP
1192 int (*select_task_rq)(struct task_struct *p, int task_cpu, int sd_flag, int flags); 1192 int (*select_task_rq)(struct task_struct *p, int task_cpu, int sd_flag, int flags);
1193 void (*migrate_task_rq)(struct task_struct *p, int next_cpu); 1193 void (*migrate_task_rq)(struct task_struct *p);
1194 1194
1195 void (*task_waking) (struct task_struct *task); 1195 void (*task_waking) (struct task_struct *task);
1196 void (*task_woken) (struct rq *this_rq, struct task_struct *task); 1196 void (*task_woken) (struct rq *this_rq, struct task_struct *task);