diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-11 10:33:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-11 10:33:25 -0700 |
| commit | ac814cbbab21ad0a1ba1554312687e4abbfcfc96 (patch) | |
| tree | 6e374b49ba87e07d5cbe2ce83199e535e0d4dc61 /drivers | |
| parent | fea9123979fe892f41ca39d9d0226c1e193b0880 (diff) | |
| parent | 94cff94634e506a4a44684bee1875d2dbf782722 (diff) | |
| download | linux-next-ac814cbbab21ad0a1ba1554312687e4abbfcfc96.tar.gz linux-next-ac814cbbab21ad0a1ba1554312687e4abbfcfc96.zip | |
Merge tag 'timers-urgent-2025-05-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc timers fixes from Ingo Molnar:
- Fix time keeping bugs in CLOCK_MONOTONIC_COARSE clocks
- Work around absolute relocations into vDSO code that GCC erroneously
emits in certain arm64 build environments
- Fix a false positive lockdep warning in the i8253 clocksource driver
* tag 'timers-urgent-2025-05-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable()
arm64: vdso: Work around invalid absolute relocations from GCC
timekeeping: Prevent coarse clocks going backwards
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/i8253.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c index 39f7c2d736d1..b603c25f3dfa 100644 --- a/drivers/clocksource/i8253.c +++ b/drivers/clocksource/i8253.c @@ -103,7 +103,7 @@ int __init clocksource_i8253_init(void) #ifdef CONFIG_CLKEVT_I8253 void clockevent_i8253_disable(void) { - raw_spin_lock(&i8253_lock); + guard(raw_spinlock_irqsave)(&i8253_lock); /* * Writing the MODE register should stop the counter, according to @@ -132,8 +132,6 @@ void clockevent_i8253_disable(void) outb_p(0, PIT_CH0); outb_p(0x30, PIT_MODE); - - raw_spin_unlock(&i8253_lock); } static int pit_shutdown(struct clock_event_device *evt) |