rcutorture: Remove ->ext_irq_conflict field

Back when there was a separate RCU-bh flavor, the ->ext_irq_conflict
field was used to prevent executing local_bh_enable() while interrupts
were disabled.  However, there is no longer an RCU-bh flavor, so this
commit removes the no-longer-needed ->ext_irq_conflict field.

Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 2453229ba15a79a5c2a522aa203bdd55166a0f88..21ab3c7eb221d9bf571d1094df87134795ab44ff 100644 (file)
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -299,7 +299,6 @@ struct rcu_torture_ops {
        int irq_capable;
        int can_boost;
        int extendables;
-       int ext_irq_conflict;
        const char *name;
 };
 
@@ -1170,10 +1169,6 @@ rcutorture_extend_mask(int oldmask, struct torture_random_state *trsp)
            ((!(mask & RCUTORTURE_RDR_BH) && (oldmask & RCUTORTURE_RDR_BH)) ||
             (!(mask & RCUTORTURE_RDR_RBH) && (oldmask & RCUTORTURE_RDR_RBH))))
                mask |= RCUTORTURE_RDR_BH | RCUTORTURE_RDR_RBH;
-       if ((mask & RCUTORTURE_RDR_IRQ) &&
-           !(mask & cur_ops->ext_irq_conflict) &&
-           (oldmask & cur_ops->ext_irq_conflict))
-               mask |= cur_ops->ext_irq_conflict; /* Or if readers object. */
        return mask ?: RCUTORTURE_RDR_RCU;
 }