Commit f47cb1bb authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

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: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
parent a3b0e1e5

kernel/rcu/rcutorture.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE