diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 22:20:49 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-03 06:23:02 -0400 |
commit | b1f77b0581b8fd837acb4a973f7d5496cae6efee (patch) | |
tree | 4faa2e4285c31dd70d1d20b4172d1eed55ba7330 /include/linux/rcutree.h | |
parent | 255d11bc910fd38153156a0c5ebb256657290882 (diff) |
kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies
Impact: build fix for all non-x86 architectures
We want to remove percpu.h from rcuclassic.h/rcutree.h (for upcoming
kmemtrace changes) but that would break the DECLARE_PER_CPU based
declarations in these files.
Move the quiescent counter management functions to their respective
RCU implementation .c files - they were slightly above the inlining
limit anyway.
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: paulmck@linux.vnet.ibm.com
LKML-Reference: <1237898630.25315.83.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/rcutree.h')
-rw-r--r-- | include/linux/rcutree.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h index a722fb67bb2d..5d6f425260bc 100644 --- a/include/linux/rcutree.h +++ b/include/linux/rcutree.h | |||
@@ -236,30 +236,8 @@ struct rcu_state { | |||
236 | #endif /* #ifdef CONFIG_NO_HZ */ | 236 | #endif /* #ifdef CONFIG_NO_HZ */ |
237 | }; | 237 | }; |
238 | 238 | ||
239 | extern struct rcu_state rcu_state; | 239 | extern void rcu_qsctr_inc(int cpu); |
240 | DECLARE_PER_CPU(struct rcu_data, rcu_data); | 240 | extern void rcu_bh_qsctr_inc(int cpu); |
241 | |||
242 | extern struct rcu_state rcu_bh_state; | ||
243 | DECLARE_PER_CPU(struct rcu_data, rcu_bh_data); | ||
244 | |||
245 | /* | ||
246 | * Increment the quiescent state counter. | ||
247 | * The counter is a bit degenerated: We do not need to know | ||
248 | * how many quiescent states passed, just if there was at least | ||
249 | * one since the start of the grace period. Thus just a flag. | ||
250 | */ | ||
251 | static inline void rcu_qsctr_inc(int cpu) | ||
252 | { | ||
253 | struct rcu_data *rdp = &per_cpu(rcu_data, cpu); | ||
254 | rdp->passed_quiesc = 1; | ||
255 | rdp->passed_quiesc_completed = rdp->completed; | ||
256 | } | ||
257 | static inline void rcu_bh_qsctr_inc(int cpu) | ||
258 | { | ||
259 | struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu); | ||
260 | rdp->passed_quiesc = 1; | ||
261 | rdp->passed_quiesc_completed = rdp->completed; | ||
262 | } | ||
263 | 241 | ||
264 | extern int rcu_pending(int cpu); | 242 | extern int rcu_pending(int cpu); |
265 | extern int rcu_needs_cpu(int cpu); | 243 | extern int rcu_needs_cpu(int cpu); |