This is a note to let you know that I've just added the patch titled
timers: Replace in_irq() with in_hardirq()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
timers-replace-in_irq-with-in_hardirq.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit c1c90aae953d392c4a876c82731033982d3c2417
Author: ye xingchen <ye.xingchen@xxxxxxxxxx>
Date: Wed Oct 12 01:26:29 2022 +0000
timers: Replace in_irq() with in_hardirq()
[ Upstream commit 8be3f96ceddb911539a53d87a66da84a04502366 ]
Replace the obsolete and ambiguous macro in_irq() with new
macro in_hardirq().
Signed-off-by: ye xingchen <ye.xingchen@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: John Stultz <jstultz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20221012012629.334966-1-ye.xingchen@xxxxxxxxxx
Stable-dep-of: 573601521277 ("watchdog: cpu5wdt.c: Fix use-after-free bug caused by cpu5wdt_trigger")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index e09852be4e638..b2d4cb2373ad6 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1453,7 +1453,7 @@ int timer_delete_sync(struct timer_list *timer)
* don't use it in hardirq context, because it
* could lead to deadlock.
*/
- WARN_ON(in_irq() && !(timer->flags & TIMER_IRQSAFE));
+ WARN_ON(in_hardirq() && !(timer->flags & TIMER_IRQSAFE));
/*
* Must be able to sleep on PREEMPT_RT because of the slowpath in
