Commit 7f8d5f70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents d42e504a 70e0a80a

drivers/bus/fsl-mc/mc-sys.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/md/dm-vdo/logger.c

+1 −1
Original line number Diff line number Diff line
@@ -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())

include/linux/lockdep.h

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ do { \ 
#define lockdep_assert_in_softirq()					\

do {									\

	WARN_ON_ONCE(__lockdep_enabled			&&		\

		     (!in_softirq() || in_irq() || in_nmi()));		\

		     (!in_softirq() || in_hardirq() || in_nmi()));	\

} while (0)



extern void lockdep_assert_in_softirq_func(void);

include/linux/preempt.h

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

 * in_irq()       - Obsolete version of in_hardirq()

 * in_softirq()   - We have BH disabled, or are processing softirqs

 * 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_interrupt()		(irq_count())

kernel/bpf/syscall.c

+2 −2
Original line number Diff line number Diff line
@@ -2330,7 +2330,7 @@ static void bpf_audit_prog(const struct bpf_prog *prog, unsigned int op) 
		return;

	if (audit_enabled == AUDIT_OFF)

		return;

	if (!in_irq() && !irqs_disabled())

	if (!in_hardirq() && !irqs_disabled())

		ctx = audit_context();

	ab = audit_log_start(ctx, GFP_ATOMIC, AUDIT_BPF);

	if (unlikely(!ab))
@@ -2428,7 +2428,7 @@ static void __bpf_prog_put(struct bpf_prog *prog) 
	struct bpf_prog_aux *aux = prog->aux;



	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);

			schedule_work(&aux->work);

		} else {