diff options
author | Amerigo Wang <amwang@redhat.com> | 2011-01-30 05:23:08 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-03-04 11:05:33 -0500 |
commit | fe8e64071a4ff5925ced4f33cb32ba090a04649c (patch) | |
tree | 0dd376d34c757300b8dcd6ce277e846d966dc6bb /kernel | |
parent | fea651267e52a88e7b81e01b6717d968254b6ddb (diff) |
rcupdate: remove dead code
DEBUG_OBJECTS_RCU_HEAD depends on PREEMPT, so #ifndef CONFIG_PREEMPT
is totally useless in kernel/rcupdate.c.
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/rcupdate.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index a23a57a976d1..afd21d17c081 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
@@ -215,10 +215,6 @@ static int rcuhead_fixup_free(void *addr, enum debug_obj_state state) | |||
215 | * If we detect that we are nested in a RCU read-side critical | 215 | * If we detect that we are nested in a RCU read-side critical |
216 | * section, we should simply fail, otherwise we would deadlock. | 216 | * section, we should simply fail, otherwise we would deadlock. |
217 | */ | 217 | */ |
218 | #ifndef CONFIG_PREEMPT | ||
219 | WARN_ON(1); | ||
220 | return 0; | ||
221 | #else | ||
222 | if (rcu_preempt_depth() != 0 || preempt_count() != 0 || | 218 | if (rcu_preempt_depth() != 0 || preempt_count() != 0 || |
223 | irqs_disabled()) { | 219 | irqs_disabled()) { |
224 | WARN_ON(1); | 220 | WARN_ON(1); |
@@ -229,7 +225,6 @@ static int rcuhead_fixup_free(void *addr, enum debug_obj_state state) | |||
229 | rcu_barrier_bh(); | 225 | rcu_barrier_bh(); |
230 | debug_object_free(head, &rcuhead_debug_descr); | 226 | debug_object_free(head, &rcuhead_debug_descr); |
231 | return 1; | 227 | return 1; |
232 | #endif | ||
233 | default: | 228 | default: |
234 | return 0; | 229 | return 0; |
235 | } | 230 | } |