From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Thu, 28 Mar 2013 23:56:53 +0000 (-0700)
Subject: rcu: Merge adjacent identical ifdefs
X-Git-Tag: next-20130607~35^2~11^3~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e22fc2fccf9ac40fb311c508c8ba7061b0c80e5;p=karo-tx-linux.git

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>
---

diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index 48ab70384a4c..faeea984dbaa 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)
 {