Commit 373ceff2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c5ecffe6 1a6a4647

include/linux/interrupt.h

+5 −1
Original line number Diff line number Diff line
@@ -569,8 +569,12 @@ enum 
 * 	2) rcu_report_dead() reports the final quiescent states.

 *

 * _ IRQ_POLL: irq_poll_cpu_dead() migrates the queue

 *

 * _ (HR)TIMER_SOFTIRQ: (hr)timers_dead_cpu() migrates the queue

 */

#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ) | BIT(IRQ_POLL_SOFTIRQ))

#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(TIMER_SOFTIRQ) | BIT(IRQ_POLL_SOFTIRQ) |\

				   BIT(HRTIMER_SOFTIRQ) | BIT(RCU_SOFTIRQ))





/* map softirq index to softirq name. update 'softirq_to_name' in

 * kernel/softirq.c when adding a new softirq.