The following commit has been merged into the core/entry branch of tip: Commit-ID: 45ff510517f3b1354a3d9c273ad5e5e8d08312cb Gitweb: https://git.kernel.org/tip/45ff510517f3b1354a3d9c273ad5e5e8d08312cb Author: Ira Weiny <ira.weiny@xxxxxxxxx> AuthorDate: Wed, 28 Oct 2020 09:36:32 -07:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Thu, 29 Oct 2020 11:31:29 +01:00 entry: Fixup irqentry_enter() comment irq_enter_from_user_mode() was changed to irqentry_enter_from_user_mode(). Update the comment within irqentry_enter() to reflect this change. Suggested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20201028163632.965518-1-ira.weiny@xxxxxxxxx --- kernel/entry/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 42eff11..f7ed415 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -302,7 +302,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) /* * If RCU is not watching then the same careful * sequence vs. lockdep and tracing is required - * as in irq_enter_from_user_mode(). + * as in irqentry_enter_from_user_mode(). */ lockdep_hardirqs_off(CALLER_ADDR0); rcu_irq_enter();
|