From nobody Mon Feb 9 23:29:54 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9F76270557 for ; Tue, 2 Dec 2025 16:05:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764691546; cv=none; b=T7cnnY+qmUtYLHvg26H0re77VImzTDefxN19YcHiz5tDwDWWIwWdCrR6N1jk2ZH+qu224wd84N9BzlbAakswFPeVmYze63alq2bCq8NLOFpJpy0glZZFxLXWzxIPh4UIo9JznbaPI4Nc4COR1+GudwtWN9xJTTrhqV1VtC6aPUc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764691546; c=relaxed/simple; bh=YQoxLaZ/wCgJ36zp1uWNnySmh8PzI4xZwgLyyz4By7E=; h=From:To:Cc:Subject:Message-ID:Content-Type:MIME-Version:Date; b=JY7f3KaIfAPbQn6+56s8El9ycFuoAHCRGyDKJCf3Der0K8p70U7zjYPhDcPSmJWdlp5P96CLvR9u2OlgXnDe8aaQmSLhu6+wggAMlh7Ah5AkDHX9tvx34rFoEfBJN5o++5gW/SscbNteA3MfQJrmadK9CMtafGmXpLJSbplzZvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=s72OB1Nj; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=NkDGXeB4; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="s72OB1Nj"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="NkDGXeB4" From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1764691542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fW2jT8GnFDArFxLbAJSxxKPGtWxc6OpAsXujX0RQxo0=; b=s72OB1NjnC10D5pHB05rahOBfWhO/7NDFUGyxb2HymkTMFfUv0fX1T51yk2QWFX8Kd0Ex4 cv/Wdn7jXeVA1krwtZ0Is22N4AndJac7LMFLdiHSCgfh4VJ1lmejXJDBtX6S9Jf+eQFU9s O7BfgsvXBLezuyNj4h8AMBMWUIUZ+DYvTM6BXsKTyv0qTYQjC8NUvwpZoN9RvI85nf7gqy 3CTDdPl6z2/12nMwYe5R2DLhvnBgzrCJHa0P25c0mlTXISnv+4cYserY7qg6pPanmY7W0T RmDZDGcY6Son7r/C+PfwvHk58VNsNpeRMGWDNHlD5uUp6N+FSbINn1JT4YGdhw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1764691542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fW2jT8GnFDArFxLbAJSxxKPGtWxc6OpAsXujX0RQxo0=; b=NkDGXeB4TLZmhFuKaHv5LYQ1f6d384jC2e+F/wkDbrbYe1IRz7aPiilpytP9Am8KtRxee5 7Wvu3jJ7eLWq7jCw== To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, x86@kernel.org Subject: [GIT pull] core/core for v6.19-rc1 Message-ID: <176469150957.1894641.16649852452566446017.tglx@xen13> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Tue, 2 Dec 2025 17:05:35 +0100 (CET) Linus, please pull the latest core/core branch from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-core-2025= -12-03 up to: 70e0a80a1f35: treewide: Remove in_irq() Tree wide cleanup of the remaining users of in_irq() which got replaced by in_hardirq() and marked deprecated in 2020. Thanks, tglx ------------------> Matthew Wilcox (Oracle) (1): treewide: Remove in_irq() drivers/bus/fsl-mc/mc-sys.c | 2 +- drivers/md/dm-vdo/logger.c | 2 +- include/linux/lockdep.h | 2 +- include/linux/preempt.h | 2 -- kernel/bpf/syscall.c | 4 ++-- kernel/time/timer.c | 2 +- lib/locking-selftest.c | 4 ++-- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/bus/fsl-mc/mc-sys.c b/drivers/bus/fsl-mc/mc-sys.c index b22c59d57c8f..31037f41893e 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 =3D 0; =20 - 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; =20 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 3f7dc2cb6b98..76a987ccf926 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"; =20 - if (in_irq()) + if (in_hardirq()) return "HI"; =20 if (in_softirq()) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 67964dc4db95..dd634103b014 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -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) =20 extern void lockdep_assert_in_softirq_func(void); diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 102202185d7a..d964f965c8ff 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -134,11 +134,9 @@ static __always_inline unsigned char interrupt_context= _level(void) =20 /* * 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()) =20 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 8a129746bd6c..6cde6a46babf 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2330,7 +2330,7 @@ static void bpf_audit_prog(const struct bpf_prog *pro= g, unsigned int op) return; if (audit_enabled =3D=3D AUDIT_OFF) return; - if (!in_irq() && !irqs_disabled()) + if (!in_hardirq() && !irqs_disabled()) ctx =3D audit_context(); ab =3D 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 =3D prog->aux; =20 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 { diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 553fa469d7cc..282a8e5c05f8 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2472,7 +2472,7 @@ void update_process_times(int user_tick) run_local_timers(); rcu_sched_clock_irq(user_tick); #ifdef CONFIG_IRQ_WORK - if (in_irq()) + if (in_hardirq()) irq_work_tick(); #endif sched_tick(); diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index ed99344317f5..d939403331b5 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c @@ -202,7 +202,7 @@ static void init_shared_classes(void) local_irq_disable(); \ __irq_enter(); \ lockdep_hardirq_threaded(); \ - WARN_ON(!in_irq()); + WARN_ON(!in_hardirq()); =20 #define HARDIRQ_EXIT() \ __irq_exit(); \ @@ -2512,7 +2512,7 @@ DEFINE_LOCK_GUARD_0(NOTTHREADED_HARDIRQ, do { local_irq_disable(); __irq_enter(); - WARN_ON(!in_irq()); + WARN_ON(!in_hardirq()); } while(0), HARDIRQ_EXIT()) DEFINE_LOCK_GUARD_0(SOFTIRQ, SOFTIRQ_ENTER(), SOFTIRQ_EXIT()) =20