From: "tip-bot2 for Valentin Schneider" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Valentin Schneider <valentin.schneider@arm.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-m68k@lists.linux-m68k.org, linux-riscv@lists.infradead.org,
uclinux-h8-devel@lists.sourceforge.jp,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: sched/urgent] sched/core: Fix preempt_schedule() interrupt return comment
Date: Fri, 27 Sep 2019 08:10:41 -0000 [thread overview]
Message-ID: <156957184150.9866.17072165851925129764.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190923143620.29334-2-valentin.schneider@arm.com>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: a49b4f4012ef233143c5f7ce44f97851e54d5ef9
Gitweb: https://git.kernel.org/tip/a49b4f4012ef233143c5f7ce44f97851e54d5ef9
Author: Valentin Schneider <valentin.schneider@arm.com>
AuthorDate: Mon, 23 Sep 2019 15:36:12 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 25 Sep 2019 17:42:32 +02:00
sched/core: Fix preempt_schedule() interrupt return comment
preempt_schedule_irq() is the one that should be called on return from
interrupt, clean up the comment to avoid any ambiguity.
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-riscv@lists.infradead.org
Cc: uclinux-h8-devel@lists.sourceforge.jp
Link: https://lkml.kernel.org/r/20190923143620.29334-2-valentin.schneider@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 83ea23e..00ef44c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4218,9 +4218,8 @@ static void __sched notrace preempt_schedule_common(void)
#ifdef CONFIG_PREEMPTION
/*
- * this is the entry point to schedule() from in-kernel preemption
- * off of preempt_enable. Kernel preemptions off return from interrupt
- * occur there and call schedule directly.
+ * This is the entry point to schedule() from in-kernel preemption
+ * off of preempt_enable.
*/
asmlinkage __visible void __sched notrace preempt_schedule(void)
{
@@ -4291,7 +4290,7 @@ EXPORT_SYMBOL_GPL(preempt_schedule_notrace);
#endif /* CONFIG_PREEMPTION */
/*
- * this is the entry point to schedule() from kernel preemption
+ * This is the entry point to schedule() from kernel preemption
* off of irq context.
* Note, that this is called and return with irqs disabled. This will
* protect us against recursive calling from irq.
next prev parent reply other threads:[~2019-09-27 8:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 14:36 [PATCH v2 0/9] entry: preempt_schedule_irq() callers scrub Valentin Schneider
2019-09-23 14:36 ` [PATCH v2 1/9] sched/core: Fix preempt_schedule() interrupt return comment Valentin Schneider
2019-09-27 8:10 ` tip-bot2 for Valentin Schneider [this message]
2019-09-23 14:36 ` [PATCH v2 2/9] c6x: entry: Remove unneeded need_resched() loop Valentin Schneider
2019-09-23 14:36 ` [PATCH v2 3/9] csky: " Valentin Schneider
2019-09-23 16:55 ` Guo Ren
2019-09-23 14:36 ` [PATCH v2 4/9] h8300: " Valentin Schneider
2019-09-23 14:36 ` [PATCH v2 5/9] microblaze: " Valentin Schneider
2019-09-24 10:30 ` Michal Simek
2019-09-24 10:48 ` Valentin Schneider
2019-09-23 14:36 ` [PATCH v2 6/9] RISC-V: " Valentin Schneider
2019-10-09 0:51 ` Paul Walmsley
2019-09-23 14:36 ` [PATCH v2 7/9] sh: " Valentin Schneider
2019-09-23 14:36 ` [PATCH v2 8/9] sh64: " Valentin Schneider
2019-09-23 14:36 ` [PATCH v2 9/9] xtensa: " Valentin Schneider
2019-11-14 18:17 ` Max Filippov
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=156957184150.9866.17072165851925129764.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=valentin.schneider@arm.com \
/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;
as well as URLs for NNTP newsgroup(s).