Skip to contentSkip to conversation

entry: Fixup irqentry_enter() comment

PATCH RESEND Applied [email protected] 2 participants 2 messages Oct 28, 2020 – Oct 29, 2020 Generic entry code

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 entry: Fixup irqentry_enter() comment

From: Ira Weiny <[email protected]>

irq_enter_from_user_mode() was changed to irqentry_enter_from_user_mode(). Update the comment within irqentry_enter() to reflect this change.

---
Resend due to mail being dropped on it's way to LKML

 kernel/entry/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/entry/common.c +1 -1
index 0a1e20f8d4e8..ba4732b657bd 100644
@@ -320,7 +320,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();
Signature · 1 line
2.28.0.rc0.12.gb6a658bd00c9
merge bot Applied
#1 lore raw
The following commit has been merged into the core/entry branch of tip:

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 <[email protected]>
AuthorDate:    Wed, 28 Oct 2020 09:36:32 -07:00
Committer:     Thomas Gleixner <[email protected]>
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.

---
 kernel/entry/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/entry/common.c +1 -1
index 42eff11..f7ed415 100644
@@ -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();