diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-05 22:06:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-05 22:06:51 +0300 |
| commit | d5ca32738f8fbd3632928929cccb5789d44be390 (patch) | |
| tree | c6eb2661370812a11cdf46bf318d835f99a1663e /drivers | |
| parent | e5adbd6ec480164fe30ee65c94426cb12d64bc99 (diff) | |
| parent | 760a53768610d427990192b5cfdb71310e1373db (diff) | |
| download | linux-d5ca32738f8fbd3632928929cccb5789d44be390.tar.xz | |
Merge tag 'timers-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two timer subsystem fixes:
- Prevent a use after free in the new lockdep state tracking for
hrtimers
- Add missing parenthesis in the VF pit timer driver"
* tag 'timers-urgent-2020-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/timer-vf-pit: Add missing parenthesis
hrtimer: Don't dereference the hrtimer pointer after the callback
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/timer-vf-pit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-vf-pit.c b/drivers/clocksource/timer-vf-pit.c index 7ad4a8b008c2..1a86a4e7e344 100644 --- a/drivers/clocksource/timer-vf-pit.c +++ b/drivers/clocksource/timer-vf-pit.c @@ -129,7 +129,7 @@ static int __init pit_clockevent_init(unsigned long rate, int irq) __raw_writel(PITTFLG_TIF, clkevt_base + PITTFLG); BUG_ON(request_irq(irq, pit_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL, - "VF pit timer", &clockevent_pit); + "VF pit timer", &clockevent_pit)); clockevent_pit.cpumask = cpumask_of(0); clockevent_pit.irq = irq; |