admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Remove in_irq()

Browse Source 
This old alias for in_hardirq() has been marked as deprecated since
2020; remove the stragglers.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/20251024180654.1691095-1-willy@infradead.org
This commit is contained in:
Matthew Wilcox (Oracle)
2025-10-24 19:06:51 +01:00
committed by Thomas Gleixner
parent 211ddde082
commit 70e0a80a1f
7 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bus/fsl-mc/mc-sys.c
View File

@@ -248,7 +248,7 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd)
enum mc_cmd_status status; enum mc_cmd_status status;
unsigned long irq_flags = 0; 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; return -EINVAL;
if (mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL) if (mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL)

2
drivers/md/dm-vdo/logger.c
View File

@@ -34,7 +34,7 @@ static const char *get_current_interrupt_type(void)
if (in_nmi()) if (in_nmi())
return "NMI"; return "NMI";
if (in_irq()) if (in_hardirq())
return "HI"; return "HI";
if (in_softirq()) if (in_softirq())

2
include/linux/lockdep.h
View File

@@ -616,7 +616,7 @@ do { \
#define lockdep_assert_in_softirq() \ #define lockdep_assert_in_softirq() \
do { \ do { \
WARN_ON_ONCE(__lockdep_enabled && \ WARN_ON_ONCE(__lockdep_enabled && \
(!in_softirq() || in_irq() || in_nmi())); \ (!in_softirq() || in_hardirq() || in_nmi())); \
} while (0) } while (0)
extern void lockdep_assert_in_softirq_func(void); extern void lockdep_assert_in_softirq_func(void);

2
include/linux/preempt.h
View File

@@ -134,11 +134,9 @@ static __always_inline unsigned char interrupt_context_level(void)
/* /*
* The following macros are deprecated and should not be used in new code: * The following macros are deprecated and should not be used in new code:
* in_irq() - Obsolete version of in_hardirq()
* in_softirq() - We have BH disabled, or are processing softirqs * in_softirq() - We have BH disabled, or are processing softirqs
* in_interrupt() - We're in NMI,IRQ,SoftIRQ context or have BH disabled * in_interrupt() - We're in NMI,IRQ,SoftIRQ context or have BH disabled
*/ */
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count()) #define in_softirq() (softirq_count())
#define in_interrupt() (irq_count()) #define in_interrupt() (irq_count())

4
kernel/bpf/syscall.c
View File

@@ -2330,7 +2330,7 @@ static void bpf_audit_prog(const struct bpf_prog *prog, unsigned int op)
return; return;
if (audit_enabled == AUDIT_OFF) if (audit_enabled == AUDIT_OFF)
return; return;
if (!in_irq() && !irqs_disabled()) if (!in_hardirq() && !irqs_disabled())
ctx = audit_context(); ctx = audit_context();
ab = audit_log_start(ctx, GFP_ATOMIC, AUDIT_BPF); ab = audit_log_start(ctx, GFP_ATOMIC, AUDIT_BPF);
if (unlikely(!ab)) if (unlikely(!ab))
@@ -2428,7 +2428,7 @@ static void __bpf_prog_put(struct bpf_prog *prog)
struct bpf_prog_aux *aux = prog->aux; struct bpf_prog_aux *aux = prog->aux;
if (atomic64_dec_and_test(&aux->refcnt)) { if (atomic64_dec_and_test(&aux->refcnt)) {
if (in_irq() || irqs_disabled()) { if (in_hardirq() || irqs_disabled()) {
INIT_WORK(&aux->work, bpf_prog_put_deferred); INIT_WORK(&aux->work, bpf_prog_put_deferred);
schedule_work(&aux->work); schedule_work(&aux->work);
} else { } else {

2
kernel/time/timer.c
View File

@@ -2472,7 +2472,7 @@ void update_process_times(int user_tick)
run_local_timers(); run_local_timers();
rcu_sched_clock_irq(user_tick); rcu_sched_clock_irq(user_tick);
#ifdef CONFIG_IRQ_WORK #ifdef CONFIG_IRQ_WORK
if (in_irq()) if (in_hardirq())
irq_work_tick(); irq_work_tick();
#endif #endif
sched_tick(); sched_tick();

4
lib/locking-selftest.c
View File

@@ -202,7 +202,7 @@ static void init_shared_classes(void)
local_irq_disable(); \ local_irq_disable(); \
__irq_enter(); \ __irq_enter(); \
lockdep_hardirq_threaded(); \ lockdep_hardirq_threaded(); \
WARN_ON(!in_irq()); WARN_ON(!in_hardirq());
#define HARDIRQ_EXIT() \ #define HARDIRQ_EXIT() \
__irq_exit(); \ __irq_exit(); \
@@ -2512,7 +2512,7 @@ DEFINE_LOCK_GUARD_0(NOTTHREADED_HARDIRQ,
do { do {
local_irq_disable(); local_irq_disable();
__irq_enter(); __irq_enter();
WARN_ON(!in_irq()); WARN_ON(!in_hardirq());
} while(0), HARDIRQ_EXIT()) } while(0), HARDIRQ_EXIT())
DEFINE_LOCK_GUARD_0(SOFTIRQ, SOFTIRQ_ENTER(), SOFTIRQ_EXIT()) DEFINE_LOCK_GUARD_0(SOFTIRQ, SOFTIRQ_ENTER(), SOFTIRQ_EXIT())