diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-02 10:18:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-02 10:18:49 -0800 |
| commit | 7f8d5f70fffe2177afcc62f02feead5827dfe8dd (patch) | |
| tree | 8375d14b04532154664dc137a15c50d5f9022a50 /drivers | |
| parent | d42e504a555d0da2a10001e697f0c8a7f633fb05 (diff) | |
| parent | 70e0a80a1f3580ccf5bc1f34dbb433c67d9d8d00 (diff) | |
| download | linux-7f8d5f70fffe2177afcc62f02feead5827dfe8dd.tar.gz | |
Merge tag 'core-core-2025-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core irq cleanup from Thomas Gleixner:
"Tree wide cleanup of the remaining users of in_irq() which got
replaced by in_hardirq() and marked deprecated in 2020"
* tag 'core-core-2025-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
treewide: Remove in_irq()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/fsl-mc/mc-sys.c | 2 | ||||
| -rw-r--r-- | drivers/md/dm-vdo/logger.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bus/fsl-mc/mc-sys.c b/drivers/bus/fsl-mc/mc-sys.c index b22c59d57c8f0a..31037f41893e3a 100644 --- a/drivers/bus/fsl-mc/mc-sys.c +++ b/drivers/bus/fsl-mc/mc-sys.c @@ -248,7 +248,7 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd) enum mc_cmd_status status; unsigned long irq_flags = 0; - if (in_irq() && !(mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL)) + if (in_hardirq() && !(mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL)) return -EINVAL; if (mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL) diff --git a/drivers/md/dm-vdo/logger.c b/drivers/md/dm-vdo/logger.c index 3f7dc2cb6b9854..76a987ccf92602 100644 --- a/drivers/md/dm-vdo/logger.c +++ b/drivers/md/dm-vdo/logger.c @@ -34,7 +34,7 @@ static const char *get_current_interrupt_type(void) if (in_nmi()) return "NMI"; - if (in_irq()) + if (in_hardirq()) return "HI"; if (in_softirq()) |