aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-12 22:20:49 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-03 06:23:02 -0400
commitb1f77b0581b8fd837acb4a973f7d5496cae6efee (patch)
tree4faa2e4285c31dd70d1d20b4172d1eed55ba7330 /include/linux
parent255d11bc910fd38153156a0c5ebb256657290882 (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')
-rw-r--r--include/linux/rcuclassic.h15
-rw-r--r--include/linux/rcutree.h26
2 files changed, 4 insertions, 37 deletions
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
index 80044a4f3ab9..2d688b4461f7 100644
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
@@ -108,25 +108,14 @@ struct rcu_data {
108 struct rcu_head barrier; 108 struct rcu_head barrier;
109}; 109};
110 110
111DECLARE_PER_CPU(struct rcu_data, rcu_data);
112DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
113
114/* 111/*
115 * Increment the quiescent state counter. 112 * Increment the quiescent state counter.
116 * The counter is a bit degenerated: We do not need to know 113 * The counter is a bit degenerated: We do not need to know
117 * how many quiescent states passed, just if there was at least 114 * how many quiescent states passed, just if there was at least
118 * one since the start of the grace period. Thus just a flag. 115 * one since the start of the grace period. Thus just a flag.
119 */ 116 */
120static inline void rcu_qsctr_inc(int cpu) 117extern void rcu_qsctr_inc(int cpu);
121{ 118extern void rcu_bh_qsctr_inc(int cpu);
122 struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
123 rdp->passed_quiesc = 1;
124}
125static inline void rcu_bh_qsctr_inc(int cpu)
126{
127 struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
128 rdp->passed_quiesc = 1;
129}
130 119
131extern int rcu_pending(int cpu); 120extern int rcu_pending(int cpu);
132extern int rcu_needs_cpu(int cpu); 121extern int rcu_needs_cpu(int cpu);
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
239extern struct rcu_state rcu_state; 239extern void rcu_qsctr_inc(int cpu);
240DECLARE_PER_CPU(struct rcu_data, rcu_data); 240extern void rcu_bh_qsctr_inc(int cpu);
241
242extern struct rcu_state rcu_bh_state;
243DECLARE_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 */
251static 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}
257static 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
264extern int rcu_pending(int cpu); 242extern int rcu_pending(int cpu);
265extern int rcu_needs_cpu(int cpu); 243extern int rcu_needs_cpu(int cpu);