diff options
author | Steven Rostedt <srostedt@redhat.com> | 2008-05-12 15:21:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-19 04:01:35 -0400 |
commit | 8b09dee67f484e9b42114b1a1f068e080fd7aa56 (patch) | |
tree | 899bbfffdc715d1986afbcd61ced8af67054cc25 | |
parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) |
rcupreempt: remove duplicate prototypes
rcu_batches_completed and rcu_patches_completed_bh are both declared
in rcuclassic.h and rcupreempt.h. This patch removes the extra
prototypes for them from rcupdate.h.
rcu_batches_completed_bh is defined as a static inline in the rcupreempt.h
header file. Trying to export this as EXPORT_SYMBOL_GPL causes linking problems
with the powerpc linker. There's no need to export a static inlined function.
Modules must be compiled with the same type of RCU implementation as the
kernel they are for.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | include/linux/rcupdate.h | 2 | ||||
-rw-r--r-- | kernel/rcupreempt.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index d42dbec06083..ec2fc5b32646 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
@@ -224,8 +224,6 @@ extern void call_rcu_bh(struct rcu_head *head, | |||
224 | /* Exported common interfaces */ | 224 | /* Exported common interfaces */ |
225 | extern void synchronize_rcu(void); | 225 | extern void synchronize_rcu(void); |
226 | extern void rcu_barrier(void); | 226 | extern void rcu_barrier(void); |
227 | extern long rcu_batches_completed(void); | ||
228 | extern long rcu_batches_completed_bh(void); | ||
229 | 227 | ||
230 | /* Internal to kernel */ | 228 | /* Internal to kernel */ |
231 | extern void rcu_init(void); | 229 | extern void rcu_init(void); |
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c index e1cdf196a515..5e02b7740702 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c | |||
@@ -217,8 +217,6 @@ long rcu_batches_completed(void) | |||
217 | } | 217 | } |
218 | EXPORT_SYMBOL_GPL(rcu_batches_completed); | 218 | EXPORT_SYMBOL_GPL(rcu_batches_completed); |
219 | 219 | ||
220 | EXPORT_SYMBOL_GPL(rcu_batches_completed_bh); | ||
221 | |||
222 | void __rcu_read_lock(void) | 220 | void __rcu_read_lock(void) |
223 | { | 221 | { |
224 | int idx; | 222 | int idx; |