History

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

Linus Torvalds committed 5 years ago

Commit 3b671bf2 parents 64a925c 97258ce2 files · +3 −3Browse files

Unified · Split

2 files
  1. include/linux/entry-common.h +2 −2
  2. kernel/entry/common.c +1 −1
include/linux/entry-common.h+2−2
@@ -360,7 +360,7 @@ void syscall_exit_to_user_mode_work(struct pt_regs *regs); · 359 unmodified lines
360 *360 *
361 * This is a combination of syscall_exit_to_user_mode_work() (1,2) and361 * This is a combination of syscall_exit_to_user_mode_work() (1,2) and
362 * exit_to_user_mode(). This function is preferred unless there is a362 * exit_to_user_mode(). This function is preferred unless there is a
363 * compelling architectural reason to use the seperate functions.363 * compelling architectural reason to use the separate functions.
364 */364 */
365void syscall_exit_to_user_mode(struct pt_regs *regs);365void syscall_exit_to_user_mode(struct pt_regs *regs);
366 366
@@ -381,7 +381,7 @@ void irqentry_enter_from_user_mode(struct pt_regs *regs); · 14 unmodified lines
381 * irqentry_exit_to_user_mode - Interrupt exit work381 * irqentry_exit_to_user_mode - Interrupt exit work
382 * @regs: Pointer to current's pt_regs382 * @regs: Pointer to current's pt_regs
383 *383 *
384 * Invoked with interrupts disbled and fully valid regs. Returns with all384 * Invoked with interrupts disabled and fully valid regs. Returns with all
385 * work handled, interrupts disabled such that the caller can immediately385 * work handled, interrupts disabled such that the caller can immediately
386 * switch to user mode. Called from architecture specific interrupt386 * switch to user mode. Called from architecture specific interrupt
387 * handling code.387 * handling code.
kernel/entry/common.c+1−1
@@ -341,7 +341,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) · 340 unmodified lines
341 * Checking for rcu_is_watching() here would prevent the nesting341 * Checking for rcu_is_watching() here would prevent the nesting
342 * interrupt to invoke rcu_irq_enter(). If that nested interrupt is342 * interrupt to invoke rcu_irq_enter(). If that nested interrupt is
343 * the tick then rcu_flavor_sched_clock_irq() would wrongfully343 * the tick then rcu_flavor_sched_clock_irq() would wrongfully
344 * assume that it is the first interupt and eventually claim344 * assume that it is the first interrupt and eventually claim
345 * quiescent state and end grace periods prematurely.345 * quiescent state and end grace periods prematurely.
346 *346 *
347 * Unconditionally invoke rcu_irq_enter() so RCU state stays347 * Unconditionally invoke rcu_irq_enter() so RCU state stays