diff options
| author |   Changbin Du <changbin.du@gmail.com> | 2021-08-14 09:03:34 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-08-16 11:15:47 +0100 |
| commit | e871ee6941842d4e52a7d81a9986cb6daf441dae (patch) | |
| tree | 6a8d844e175f0c3b9a6c2b52f2d13ef31872a1ac /drivers/s390/net | |
| parent | net: dsa: tag_8021q: fix notifiers broadcast when they shouldn't, and vice versa (diff) | |
| download | linux-dev-e871ee6941842d4e52a7d81a9986cb6daf441dae.tar.xz linux-dev-e871ee6941842d4e52a7d81a9986cb6daf441dae.zip | |
s390/net: replace in_irq() with in_hardirq()
Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().
Signed-off-by: Changbin Du <changbin.du@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/ctcm_fsms.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/ctcm_mpc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c index 377e3689d1d4..06281a0a0552 100644 --- a/drivers/s390/net/ctcm_fsms.c +++ b/drivers/s390/net/ctcm_fsms.c @@ -1444,7 +1444,7 @@ again: 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); diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index 19ee91acb89d..f0436f555c62 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c @@ -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. */ |