From 2ec90c74c1feac3073242bb5737b3d6698c8712d Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paul.mckenney@linaro.org>
Date: Wed, 6 Jun 2012 07:12:43 -0700
Subject: [PATCH] --- yaml --- r: 312193 b: refs/heads/master c:
 d7118175cce7e76b3292b60832813ef1f28b6523 h: refs/heads/master i:   312191:
 8a5691055baf932140694f2aa91a3de17d908ddc v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/rcutiny.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 35b89dd8f885..a9ef575b7353 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29154c57e35a191c83b19c61b1935c9f21957662
+refs/heads/master: d7118175cce7e76b3292b60832813ef1f28b6523
diff --git a/trunk/kernel/rcutiny.c b/trunk/kernel/rcutiny.c
index 37a5444204d2..547b1fe5b052 100644
--- a/trunk/kernel/rcutiny.c
+++ b/trunk/kernel/rcutiny.c
@@ -172,7 +172,7 @@ void rcu_irq_enter(void)
 	local_irq_restore(flags);
 }
 
-#ifdef CONFIG_PROVE_RCU
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
 
 /*
  * Test whether RCU thinks that the current CPU is idle.
@@ -183,7 +183,7 @@ int rcu_is_cpu_idle(void)
 }
 EXPORT_SYMBOL(rcu_is_cpu_idle);
 
-#endif /* #ifdef CONFIG_PROVE_RCU */
+#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
 
 /*
  * Test whether the current CPU was interrupted from idle.  Nested