diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-10-20 16:46:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:25:50 +0100 |
| commit | b6b6ba5754eee1907497504e4b31e22c78f7670f (patch) | |
| tree | aed4b2c060c1dad8801950a96041339a0c9f1818 /kernel/sched/core.c | |
| parent | 6db84b27221204c37a53dd7c58b01b5d7e91ce0b (diff) | |
| download | linux-stable-b6b6ba5754eee1907497504e4b31e22c78f7670f.tar.gz linux-stable-b6b6ba5754eee1907497504e4b31e22c78f7670f.tar.bz2 linux-stable-b6b6ba5754eee1907497504e4b31e22c78f7670f.zip | |
sched: Reenable interrupts in do_sched_yield()
[ Upstream commit 345a957fcc95630bf5535d7668a59ed983eb49a7 ]
do_sched_yield() invokes schedule() with interrupts disabled which is
not allowed. This goes back to the pre git era to commit a6efb709806c
("[PATCH] irqlock patch 2.5.27-H6") in the history tree.
Reenable interrupts and remove the misleading comment which "explains" it.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/87r1pt7y5c.fsf@nanos.tec.linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b166320f7633..013b1c6cb4ed 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4984,12 +4984,8 @@ static void do_sched_yield(void) schedstat_inc(rq->yld_count); current->sched_class->yield_task(rq); - /* - * Since we are going to call schedule() anyway, there's - * no need to preempt or enable interrupts: - */ preempt_disable(); - rq_unlock(rq, &rf); + rq_unlock_irq(rq, &rf); sched_preempt_enable_no_resched(); schedule(); |