From: "tip-bot2 for Dietmar Eggemann" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: sched/core] sched/core: Remove redundant 'preempt' param from sched_class->yield_to_task()
Date: Tue, 16 Jun 2020 12:21:56 -0000 [thread overview]
Message-ID: <159231011637.16989.10871387940341637458.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200603080304.16548-3-dietmar.eggemann@arm.com>
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 0900acf2d8273f79432a4ded122ad5a265e85783
Gitweb: https://git.kernel.org/tip/0900acf2d8273f79432a4ded122ad5a265e85783
Author: Dietmar Eggemann <dietmar.eggemann@arm.com>
AuthorDate: Wed, 03 Jun 2020 10:03:02 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 15 Jun 2020 14:10:01 +02:00
sched/core: Remove redundant 'preempt' param from sched_class->yield_to_task()
Commit 6d1cafd8b56e ("sched: Resched proper CPU on yield_to()") moved
the code to resched the CPU from yield_to_task_fair() to yield_to()
making the preempt parameter in sched_class->yield_to_task()
unnecessary. Remove it. No other sched_class implements yield_to_task().
Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200603080304.16548-3-dietmar.eggemann@arm.com
---
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 8f36032..9c89b0e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5810,7 +5810,7 @@ again:
if (task_running(p_rq, p) || p->state)
goto out_unlock;
- yielded = curr->sched_class->yield_to_task(rq, p, preempt);
+ yielded = curr->sched_class->yield_to_task(rq, p);
if (yielded) {
schedstat_inc(rq->yld_count);
/*
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index cbcb2f7..6a4dab2 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7157,7 +7157,7 @@ static void yield_task_fair(struct rq *rq)
set_skip_buddy(se);
}
-static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preempt)
+static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
{
struct sched_entity *se = &p->se;
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 1d4e94c..8d5d068 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1748,7 +1748,7 @@ struct sched_class {
void (*enqueue_task) (struct rq *rq, struct task_struct *p, int flags);
void (*dequeue_task) (struct rq *rq, struct task_struct *p, int flags);
void (*yield_task) (struct rq *rq);
- bool (*yield_to_task)(struct rq *rq, struct task_struct *p, bool preempt);
+ bool (*yield_to_task)(struct rq *rq, struct task_struct *p);
void (*check_preempt_curr)(struct rq *rq, struct task_struct *p, int flags);
next prev parent reply other threads:[~2020-06-16 12:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 8:03 [PATCH 0/4] sched: Remove some redundancy Dietmar Eggemann
2020-06-03 8:03 ` [PATCH 1/4] sched/pelt: Remove redundant cap_scale() definition Dietmar Eggemann
2020-06-03 12:04 ` Vincent Guittot
2020-06-16 12:21 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
2020-06-03 8:03 ` [PATCH 2/4] sched/core: Remove redundant 'preempt' param from sched_class->yield_to_task() Dietmar Eggemann
2020-06-16 12:21 ` tip-bot2 for Dietmar Eggemann [this message]
2020-06-03 8:03 ` [PATCH 3/4] sched/idle,stop: Remove .get_rr_interval from sched_class Dietmar Eggemann
2020-06-16 12:21 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
2020-06-03 8:03 ` [PATCH 4/4] sched/fair: Remove unused 'sd' parameter from scale_rt_capacity() Dietmar Eggemann
2020-06-03 12:06 ` Vincent Guittot
2020-06-16 12:21 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
2020-06-03 11:53 ` [PATCH 0/4] sched: Remove some redundancy Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159231011637.16989.10871387940341637458.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=dietmar.eggemann@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®