summaryrefslogtreecommitdiffstats
path: root/kernel/rcupdate.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-03-28 16:56:53 -0700
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-06-10 13:44:56 -0700
commit4982969d965ec87b1887c86d2e0b3d81065e1d38 (patch)
tree3a26eb3c9ef7f3e2fec23a474a937ea50c5b573a /kernel/rcupdate.c
parent026ad2835ce6202069e7aa0b11f5f1be4de34550 (diff)
downloadop-kernel-dev-4982969d965ec87b1887c86d2e0b3d81065e1d38.zip
op-kernel-dev-4982969d965ec87b1887c86d2e0b3d81065e1d38.tar.gz
rcu: Merge adjacent identical ifdefs
Two ifdefs in kernel/rcupdate.c now have identical conditions with nothing between them, so the commit merges them into a single ifdef. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'kernel/rcupdate.c')
-rw-r--r--kernel/rcupdate.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index 48ab703..faeea98 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -145,9 +145,6 @@ static struct lock_class_key rcu_sched_lock_key;
struct lockdep_map rcu_sched_lock_map =
STATIC_LOCKDEP_MAP_INIT("rcu_read_lock_sched", &rcu_sched_lock_key);
EXPORT_SYMBOL_GPL(rcu_sched_lock_map);
-#endif
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
int debug_lockdep_rcu_enabled(void)
{
OpenPOWER on IntegriCloud