Skip to content

Commit 373ceff

Browse files
committed
Merge tag 'timers-urgent-2023-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar: "Fix a spurious kernel warning during CPU hotplug events that may trigger when timer/hrtimer softirqs are pending, which are otherwise hotplug-safe and don't merit a warning" * tag 'timers-urgent-2023-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timers: Tag (hr)timer softirq as hotplug safe
2 parents c5ecffe + 1a6a464 commit 373ceff

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

include/linux/interrupt.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,12 @@ enum
569569
* 2) rcu_report_dead() reports the final quiescent states.
570570
*
571571
* _ IRQ_POLL: irq_poll_cpu_dead() migrates the queue
572+
*
573+
* _ (HR)TIMER_SOFTIRQ: (hr)timers_dead_cpu() migrates the queue
572574
*/
573-
#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ) | BIT(IRQ_POLL_SOFTIRQ))
575+
#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(TIMER_SOFTIRQ) | BIT(IRQ_POLL_SOFTIRQ) |\
576+
BIT(HRTIMER_SOFTIRQ) | BIT(RCU_SOFTIRQ))
577+
574578

575579
/* map softirq index to softirq name. update 'softirq_to_name' in
576580
* kernel/softirq.c when adding a new softirq.

0 commit comments

Comments
 (0)