diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-18 14:02:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-18 14:02:45 -0700 |
commit | ac85740edf05751bf8730df5b898c92ed9b538b7 (patch) | |
tree | b2f1cb034c7e64bb988ed2ba814934413449e514 | |
parent | b372359fbc4af755965a1792c1f513583aa20c43 (diff) | |
parent | 3940f5349b476197fb079c5aa19c9a988de64efb (diff) |
Merge tag 'timers-urgent-2025-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
-rw-r--r-- | arch/x86/kernel/i8253.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index 80e262bb627f..cb9852ad6098 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); |