diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-01-30 18:23:08 +0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-03-04 08:05:33 -0800 |
| commit | fe8e64071a4ff5925ced4f33cb32ba090a04649c (patch) | |
| tree | 0dd376d34c757300b8dcd6ce277e846d966dc6bb /kernel | |
| parent | fea651267e52a88e7b81e01b6717d968254b6ddb (diff) | |
| download | linux-stable-fe8e64071a4ff5925ced4f33cb32ba090a04649c.tar.gz linux-stable-fe8e64071a4ff5925ced4f33cb32ba090a04649c.tar.bz2 linux-stable-fe8e64071a4ff5925ced4f33cb32ba090a04649c.zip | |
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) * 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; } |