---

yaml --- r: 234944 b: refs/heads/master c: fe8e640 h: refs/heads/master v: v3
git-mirror · Mar 4, 2011 · 0864d5f · 0864d5f
1 parent a94e191
commit 0864d5f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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;
 	}