diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2006-01-08 14:19:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:35:44 -0500 |
| commit | 677517771b7b6efaf8617e70f655b16f3cafcc9b (patch) | |
| tree | 811f5df7b430cf865ac337f73c7aa2f67cb0bbac /include/linux | |
| parent | e2688f00dc0ceb9d9867434dffbd080411fc23b0 (diff) | |
[PATCH] rcu: uninline __rcu_pending()
__rcu_pending() is rather fat and called twice from rcu_pending().
rcu_pending() has multiple callers, and not that small too.
This patch uninlines both of them.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rcupdate.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 51747cd88d1a..a1d26cb28925 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
| @@ -125,36 +125,7 @@ static inline void rcu_bh_qsctr_inc(int cpu) | |||
| 125 | rdp->passed_quiesc = 1; | 125 | rdp->passed_quiesc = 1; |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | static inline int __rcu_pending(struct rcu_ctrlblk *rcp, | 128 | extern int rcu_pending(int cpu); |
| 129 | struct rcu_data *rdp) | ||
| 130 | { | ||
| 131 | /* This cpu has pending rcu entries and the grace period | ||
| 132 | * for them has completed. | ||
| 133 | */ | ||
| 134 | if (rdp->curlist && !rcu_batch_before(rcp->completed, rdp->batch)) | ||
| 135 | return 1; | ||
| 136 | |||
| 137 | /* This cpu has no pending entries, but there are new entries */ | ||
| 138 | if (!rdp->curlist && rdp->nxtlist) | ||
| 139 | return 1; | ||
| 140 | |||
| 141 | /* This cpu has finished callbacks to invoke */ | ||
| 142 | if (rdp->donelist) | ||
| 143 | return 1; | ||
| 144 | |||
| 145 | /* The rcu core waits for a quiescent state from the cpu */ | ||
| 146 | if (rdp->quiescbatch != rcp->cur || rdp->qs_pending) | ||
| 147 | return 1; | ||
| 148 | |||
| 149 | /* nothing to do */ | ||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | |||
| 153 | static inline int rcu_pending(int cpu) | ||
| 154 | { | ||
| 155 | return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) || | ||
| 156 | __rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu)); | ||
| 157 | } | ||
| 158 | 129 | ||
| 159 | /** | 130 | /** |
| 160 | * rcu_read_lock - mark the beginning of an RCU read-side critical section. | 131 | * rcu_read_lock - mark the beginning of an RCU read-side critical section. |
