diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-21 03:45:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-21 03:45:19 -0400 |
commit | 94edf6f3c20c9c8ee301bde04150a91bab4bf32c (patch) | |
tree | 4a2af658258cf42fde24c1224e44c3e6a18c2792 /include/linux/srcutree.h | |
parent | d5da6457bfadf64ff78f1816ae8329dbbba19513 (diff) | |
parent | 656e7c0c0a2e8d899f87fd7f081ea7a711146604 (diff) |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Removal of spin_unlock_wait()
- SRCU updates
- Torture-test updates
- Documentation updates
- Miscellaneous fixes
- CPU-hotplug fixes
- Miscellaneous non-RCU fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/srcutree.h')
-rw-r--r-- | include/linux/srcutree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h index 42973f787e7e..a949f4f9e4d7 100644 --- a/include/linux/srcutree.h +++ b/include/linux/srcutree.h | |||
@@ -104,8 +104,6 @@ struct srcu_struct { | |||
104 | #define SRCU_STATE_SCAN1 1 | 104 | #define SRCU_STATE_SCAN1 1 |
105 | #define SRCU_STATE_SCAN2 2 | 105 | #define SRCU_STATE_SCAN2 2 |
106 | 106 | ||
107 | void process_srcu(struct work_struct *work); | ||
108 | |||
109 | #define __SRCU_STRUCT_INIT(name) \ | 107 | #define __SRCU_STRUCT_INIT(name) \ |
110 | { \ | 108 | { \ |
111 | .sda = &name##_srcu_data, \ | 109 | .sda = &name##_srcu_data, \ |
@@ -141,5 +139,6 @@ void process_srcu(struct work_struct *work); | |||
141 | 139 | ||
142 | void synchronize_srcu_expedited(struct srcu_struct *sp); | 140 | void synchronize_srcu_expedited(struct srcu_struct *sp); |
143 | void srcu_barrier(struct srcu_struct *sp); | 141 | void srcu_barrier(struct srcu_struct *sp); |
142 | void srcu_torture_stats_print(struct srcu_struct *sp, char *tt, char *tf); | ||
144 | 143 | ||
145 | #endif | 144 | #endif |