The following commit has been merged into the timers/core branch of tip: Commit-ID: 8be3f96ceddb911539a53d87a66da84a04502366 Gitweb: https://git.kernel.org/tip/8be3f96ceddb911539a53d87a66da84a04502366 Author: ye xingchen <ye.xingchen@xxxxxxxxxx> AuthorDate: Wed, 12 Oct 2022 01:26:29 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Mon, 17 Oct 2022 16:00:04 +02:00 timers: Replace in_irq() with in_hardirq() 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 --- kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 717fcb9..f40c88c 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1422,7 +1422,7 @@ int del_timer_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
|