Merge tag 'timers-urgent-2025-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

ac85740e · Linus Torvalds <[email protected]> · 2025-04-18 14:02:45 -07:00

Pull timer fix from Ingo Molnar:
 "Fix a lockdep false positive in the i8253 driver"

* tag 'timers-urgent-2025-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/i8253: Call clockevent_i8253_disable() with interrupts disabled

Commit: ac85740edf05751bf8730df5b898c92ed9b538b7
Parents: b372359f · 3940f534

Merge commit. Changes below are compared with the first parent: b372359f.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
arch/x86/kernel/i8253.c	modified	+2	−1	View file

arch/x86/kernel/i8253.c

View file

diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index 80e262b..cb9852a 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -46,7 +46,8 @@ bool __init pit_timer_init(void)
 		 * VMMs otherwise steal CPU time just to pointlessly waggle
 		 * the (masked) IRQ.
 		 */
-		clockevent_i8253_disable();
+		scoped_guard(irq)
+			clockevent_i8253_disable();
 		return false;
 	}
 	clockevent_i8253_init(true);