From 0864d5f927c3ac2e622362641edd2a2074a9f455 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Sun, 30 Jan 2011 18:23:08 +0800
Subject: [PATCH] --- yaml --- r: 234944 b: refs/heads/master c:
 fe8e64071a4ff5925ced4f33cb32ba090a04649c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/rcupdate.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4fdc2b4b6ec1..7aaaad9c1ba4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fea651267e52a88e7b81e01b6717d968254b6ddb
+refs/heads/master: fe8e64071a4ff5925ced4f33cb32ba090a04649c
diff --git a/trunk/kernel/rcupdate.c b/trunk/kernel/rcupdate.c
index a23a57a976d1..afd21d17c081 100644
--- a/trunk/kernel/rcupdate.c
+++ b/trunk/kernel/rcupdate.c
@@ -215,10 +215,6 @@ static int rcuhead_fixup_free(void *addr, enum debug_obj_state state)
 		 * If we detect that we are nested in a RCU read-side critical
 		 * section, we should simply fail, otherwise we would deadlock.
 		 */
-#ifndef CONFIG_PREEMPT
-		WARN_ON(1);
-		return 0;
-#else
 		if (rcu_preempt_depth() != 0 || preempt_count() != 0 ||
 		    irqs_disabled()) {
 			WARN_ON(1);
@@ -229,7 +225,6 @@ static int rcuhead_fixup_free(void *addr, enum debug_obj_state state)
 		rcu_barrier_bh();
 		debug_object_free(head, &rcuhead_debug_descr);
 		return 1;
-#endif
 	default:
 		return 0;
 	}