From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753125AbbJFQTF (ORCPT ); Tue, 6 Oct 2015 12:19:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34855 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163AbbJFQTB (ORCPT ); Tue, 6 Oct 2015 12:19:01 -0400 Date: Tue, 6 Oct 2015 09:18:05 -0700 From: "tip-bot for xiaofeng.yan" Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, efault@gmx.de, mingo@kernel.org, linux-kernel@vger.kernel.org, yanxiaofeng@inspur.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, yanxiaofeng@inspur.com, linux-kernel@vger.kernel.org, efault@gmx.de, mingo@kernel.org In-Reply-To: <1442991360-31945-1-git-send-email-yanxiaofeng@inspur.com> References: <1442991360-31945-1-git-send-email-yanxiaofeng@inspur.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/core: Remove a parameter in the migrate_task_rq() function Git-Commit-ID: 5a4fd0368517bc5b5399ef958f6d30cbff492918 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5a4fd0368517bc5b5399ef958f6d30cbff492918 Gitweb: http://git.kernel.org/tip/5a4fd0368517bc5b5399ef958f6d30cbff492918 Author: xiaofeng.yan AuthorDate: Wed, 23 Sep 2015 14:55:59 +0800 Committer: Ingo Molnar CommitDate: Tue, 6 Oct 2015 17:08:23 +0200 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 Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- kernel/sched/core.c | 2 +- kernel/sched/fair.c | 2 +- kernel/sched/sched.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a395db1..1764a0f 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) if (task_cpu(p) != new_cpu) { if (p->sched_class->migrate_task_rq) - p->sched_class->migrate_task_rq(p, new_cpu); + p->sched_class->migrate_task_rq(p); p->se.nr_migrations++; perf_event_task_migrate(p); } diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3bdc3da..700eb54 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 * previous cpu. However, the caller only guarantees p->pi_lock is held; no * other assumptions, including the state of rq->lock, should be made. */ -static void migrate_task_rq_fair(struct task_struct *p, int next_cpu) +static void migrate_task_rq_fair(struct task_struct *p) { /* * 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 e08cc4c..efd3bfc 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1190,7 +1190,7 @@ struct sched_class { #ifdef CONFIG_SMP int (*select_task_rq)(struct task_struct *p, int task_cpu, int sd_flag, int flags); - void (*migrate_task_rq)(struct task_struct *p, int next_cpu); + void (*migrate_task_rq)(struct task_struct *p); void (*task_waking) (struct task_struct *task); void (*task_woken) (struct rq *this_rq, struct task_struct *task);