diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-10-19 17:26:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-19 22:26:11 -0400 |
| commit | 27fdb35fe99011d86bcc54f62fe84712c53f4d05 (patch) | |
| tree | 65a9293586805f175167deb863b588c183e90388 /kernel | |
| parent | 533966c8ad9ec779d81179ea6a182055066c62a3 (diff) | |
doc: Fix various RCU docbook comment-header problems
Because many of RCU's files have not been included into docbook, a
number of errors have accumulated. This commit fixes them.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rcu/srcutree.c | 2 | ||||
| -rw-r--r-- | kernel/rcu/sync.c | 9 | ||||
| -rw-r--r-- | kernel/rcu/tree.c | 18 |
3 files changed, 17 insertions, 12 deletions
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c index 729a8706751d..6d5880089ff6 100644 --- a/kernel/rcu/srcutree.c +++ b/kernel/rcu/srcutree.c | |||
| @@ -854,7 +854,7 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp, | |||
| 854 | /** | 854 | /** |
| 855 | * call_srcu() - Queue a callback for invocation after an SRCU grace period | 855 | * call_srcu() - Queue a callback for invocation after an SRCU grace period |
| 856 | * @sp: srcu_struct in queue the callback | 856 | * @sp: srcu_struct in queue the callback |
| 857 | * @head: structure to be used for queueing the SRCU callback. | 857 | * @rhp: structure to be used for queueing the SRCU callback. |
| 858 | * @func: function to be invoked after the SRCU grace period | 858 | * @func: function to be invoked after the SRCU grace period |
| 859 | * | 859 | * |
| 860 | * The callback function will be invoked some time after a full SRCU | 860 | * The callback function will be invoked some time after a full SRCU |
diff --git a/kernel/rcu/sync.c b/kernel/rcu/sync.c index 50d1861f7759..3f943efcf61c 100644 --- a/kernel/rcu/sync.c +++ b/kernel/rcu/sync.c | |||
| @@ -85,6 +85,9 @@ void rcu_sync_init(struct rcu_sync *rsp, enum rcu_sync_type type) | |||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | /** | 87 | /** |
| 88 | * rcu_sync_enter_start - Force readers onto slow path for multiple updates | ||
| 89 | * @rsp: Pointer to rcu_sync structure to use for synchronization | ||
| 90 | * | ||
| 88 | * Must be called after rcu_sync_init() and before first use. | 91 | * Must be called after rcu_sync_init() and before first use. |
| 89 | * | 92 | * |
| 90 | * Ensures rcu_sync_is_idle() returns false and rcu_sync_{enter,exit}() | 93 | * Ensures rcu_sync_is_idle() returns false and rcu_sync_{enter,exit}() |
| @@ -142,7 +145,7 @@ void rcu_sync_enter(struct rcu_sync *rsp) | |||
| 142 | 145 | ||
| 143 | /** | 146 | /** |
| 144 | * rcu_sync_func() - Callback function managing reader access to fastpath | 147 | * rcu_sync_func() - Callback function managing reader access to fastpath |
| 145 | * @rsp: Pointer to rcu_sync structure to use for synchronization | 148 | * @rhp: Pointer to rcu_head in rcu_sync structure to use for synchronization |
| 146 | * | 149 | * |
| 147 | * This function is passed to one of the call_rcu() functions by | 150 | * This function is passed to one of the call_rcu() functions by |
| 148 | * rcu_sync_exit(), so that it is invoked after a grace period following the | 151 | * rcu_sync_exit(), so that it is invoked after a grace period following the |
| @@ -158,9 +161,9 @@ void rcu_sync_enter(struct rcu_sync *rsp) | |||
| 158 | * rcu_sync_exit(). Otherwise, set all state back to idle so that readers | 161 | * rcu_sync_exit(). Otherwise, set all state back to idle so that readers |
| 159 | * can again use their fastpaths. | 162 | * can again use their fastpaths. |
| 160 | */ | 163 | */ |
| 161 | static void rcu_sync_func(struct rcu_head *rcu) | 164 | static void rcu_sync_func(struct rcu_head *rhp) |
| 162 | { | 165 | { |
| 163 | struct rcu_sync *rsp = container_of(rcu, struct rcu_sync, cb_head); | 166 | struct rcu_sync *rsp = container_of(rhp, struct rcu_sync, cb_head); |
| 164 | unsigned long flags; | 167 | unsigned long flags; |
| 165 | 168 | ||
| 166 | BUG_ON(rsp->gp_state != GP_PASSED); | 169 | BUG_ON(rsp->gp_state != GP_PASSED); |
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index b0ad62b0e7b8..3e3650e94ae6 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
| @@ -3097,9 +3097,10 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func, | |||
| 3097 | * read-side critical sections have completed. call_rcu_sched() assumes | 3097 | * read-side critical sections have completed. call_rcu_sched() assumes |
| 3098 | * that the read-side critical sections end on enabling of preemption | 3098 | * that the read-side critical sections end on enabling of preemption |
| 3099 | * or on voluntary preemption. | 3099 | * or on voluntary preemption. |
| 3100 | * RCU read-side critical sections are delimited by : | 3100 | * RCU read-side critical sections are delimited by: |
| 3101 | * - rcu_read_lock_sched() and rcu_read_unlock_sched(), OR | 3101 | * |
| 3102 | * - anything that disables preemption. | 3102 | * - rcu_read_lock_sched() and rcu_read_unlock_sched(), OR |
| 3103 | * - anything that disables preemption. | ||
| 3103 | * | 3104 | * |
| 3104 | * These may be nested. | 3105 | * These may be nested. |
| 3105 | * | 3106 | * |
| @@ -3124,11 +3125,12 @@ EXPORT_SYMBOL_GPL(call_rcu_sched); | |||
| 3124 | * handler. This means that read-side critical sections in process | 3125 | * handler. This means that read-side critical sections in process |
| 3125 | * context must not be interrupted by softirqs. This interface is to be | 3126 | * context must not be interrupted by softirqs. This interface is to be |
| 3126 | * used when most of the read-side critical sections are in softirq context. | 3127 | * used when most of the read-side critical sections are in softirq context. |
| 3127 | * RCU read-side critical sections are delimited by : | 3128 | * RCU read-side critical sections are delimited by: |
| 3128 | * - rcu_read_lock() and rcu_read_unlock(), if in interrupt context. | 3129 | * |
| 3129 | * OR | 3130 | * - rcu_read_lock() and rcu_read_unlock(), if in interrupt context, OR |
| 3130 | * - rcu_read_lock_bh() and rcu_read_unlock_bh(), if in process context. | 3131 | * - rcu_read_lock_bh() and rcu_read_unlock_bh(), if in process context. |
| 3131 | * These may be nested. | 3132 | * |
| 3133 | * These may be nested. | ||
| 3132 | * | 3134 | * |
| 3133 | * See the description of call_rcu() for more detailed information on | 3135 | * See the description of call_rcu() for more detailed information on |
| 3134 | * memory ordering guarantees. | 3136 | * memory ordering guarantees. |
