summaryrefslogtreecommitdiff
path: root/include/linux/entry-common.h
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2022-07-21 17:46:18 -0700
committerPaul E. McKenney <paulmck@kernel.org>2022-07-21 17:46:18 -0700
commit34bc7b454dc31f75a0be7ee8ab378135523d7c51 (patch)
treea1891ee085290746b6835e5e33e3c31cec2489fa /include/linux/entry-common.h
parentd38c8fe48354af9c7120291938574e1ebb221d52 (diff)
parent1dcaa3b462265f688613163a1562a65ee53a3311 (diff)
downloadlinux-next-34bc7b454dc31f75a0be7ee8ab378135523d7c51.tar.gz
linux-next-34bc7b454dc31f75a0be7ee8ab378135523d7c51.zip
Merge branch 'ctxt.2022.07.05a' into HEAD
ctxt.2022.07.05a: Linux-kernel memory model development branch.
Diffstat (limited to 'include/linux/entry-common.h')
-rw-r--r--include/linux/entry-common.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h
index c92ac75d6556..84a466b176cf 100644
--- a/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@ -357,7 +357,7 @@ void irqentry_exit_to_user_mode(struct pt_regs *regs);
/**
* struct irqentry_state - Opaque object for exception state storage
* @exit_rcu: Used exclusively in the irqentry_*() calls; signals whether the
- * exit path has to invoke rcu_irq_exit().
+ * exit path has to invoke ct_irq_exit().
* @lockdep: Used exclusively in the irqentry_nmi_*() calls; ensures that
* lockdep state is restored correctly on exit from nmi.
*
@@ -395,12 +395,12 @@ typedef struct irqentry_state {
*
* For kernel mode entries RCU handling is done conditional. If RCU is
* watching then the only RCU requirement is to check whether the tick has
- * to be restarted. If RCU is not watching then rcu_irq_enter() has to be
- * invoked on entry and rcu_irq_exit() on exit.
+ * to be restarted. If RCU is not watching then ct_irq_enter() has to be
+ * invoked on entry and ct_irq_exit() on exit.
*
- * Avoiding the rcu_irq_enter/exit() calls is an optimization but also
+ * Avoiding the ct_irq_enter/exit() calls is an optimization but also
* solves the problem of kernel mode pagefaults which can schedule, which
- * is not possible after invoking rcu_irq_enter() without undoing it.
+ * is not possible after invoking ct_irq_enter() without undoing it.
*
* For user mode entries irqentry_enter_from_user_mode() is invoked to
* establish the proper context for NOHZ_FULL. Otherwise scheduling on exit