Commit e871ee69 authored by Changbin Du's avatar Changbin Du Committed by David S. Miller
Browse files

s390/net: replace in_irq() with in_hardirq()



Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().

Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2b89133
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
			if (do_debug_ccw)
			ctcmpc_dumpit((char *)&ch->ccw[0],
					sizeof(struct ccw1) * 3);
		dolock = !in_irq();
		dolock = !in_hardirq();
		if (dolock)
			spin_lock_irqsave(
				get_ccwdev_lock(ch->cdev), saveflags);
+1 −1
Original line number Diff line number Diff line
@@ -1773,7 +1773,7 @@ static void mpc_action_side_xid(fsm_instance *fsm, void *arg, int side)
	CTCM_D3_DUMP((char *)ch->xid, XID2_LENGTH);
	CTCM_D3_DUMP((char *)ch->xid_id, 4);

	if (!in_irq()) {
	if (!in_hardirq()) {
			 /* Such conditional locking is a known problem for
			  * sparse because its static undeterministic.
			  * Warnings should be ignored here. */