Commit 3b671bf4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'core-entry-2021-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core entry updates from Thomas Gleixner:
 "A trivial cleanup of typo fixes"

* tag 'core-entry-2021-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  entry: Fix typos in comments
parents 64a925c9 97258ce9

include/linux/entry-common.h

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ void syscall_exit_to_user_mode_work(struct pt_regs *regs); 
 *

 * This is a combination of syscall_exit_to_user_mode_work() (1,2) and

 * exit_to_user_mode(). This function is preferred unless there is a

 * compelling architectural reason to use the seperate functions.

 * compelling architectural reason to use the separate functions.

 */

void syscall_exit_to_user_mode(struct pt_regs *regs);
@@ -381,7 +381,7 @@ void irqentry_enter_from_user_mode(struct pt_regs *regs); 
 * irqentry_exit_to_user_mode - Interrupt exit work

 * @regs:	Pointer to current's pt_regs

 *

 * Invoked with interrupts disbled and fully valid regs. Returns with all

 * Invoked with interrupts disabled and fully valid regs. Returns with all

 * work handled, interrupts disabled such that the caller can immediately

 * switch to user mode. Called from architecture specific interrupt

 * handling code.

kernel/entry/common.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) 
	 * Checking for rcu_is_watching() here would prevent the nesting

	 * interrupt to invoke rcu_irq_enter(). If that nested interrupt is

	 * the tick then rcu_flavor_sched_clock_irq() would wrongfully

	 * assume that it is the first interupt and eventually claim

	 * assume that it is the first interrupt and eventually claim

	 * quiescent state and end grace periods prematurely.

	 *

	 * Unconditionally invoke rcu_irq_enter() so RCU state stays