diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 15:37:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 15:37:13 -0400 |
| commit | 1f1e2ce8a55bac60ff165d353c6b882e750c9092 (patch) | |
| tree | b11aaa5baa04ea5ea0ecc549fa1c95430919cd82 /kernel/rcupreempt.c | |
| parent | e570dc2a503f8334b700e8483082c675394f53fd (diff) | |
| parent | 9c106c119ebedf624fbd682fd2a4d52e3c8c1a67 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
rcupreempt: remove export of rcu_batches_completed_bh
cpuset: limit the input of cpuset.sched_relax_domain_level
Diffstat (limited to 'kernel/rcupreempt.c')
| -rw-r--r-- | kernel/rcupreempt.c | 2 |
1 files changed, 0 insertions, 2 deletions
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; |