tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
"Two minimalistic fixes for 4.2 regressions:

- Eric fixed a thinko in the timer_list base switching code caused by
the overhaul of the timer wheel. It can cause a cpu to see the
wrong base for a timer while we move the timer around.

- Guenter fixed a regression for IMX if booted w/o device tree, where
the timer interrupt is not initialized and therefor the machine
fails to boot"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/imx: Fix boot with non-DT systems
timer: Write timer->flags atomically

Linus Torvalds f8a89fc0 e525293d

+3 -2
+1
drivers/clocksource/timer-imx-gpt.c
··· 462 462 BUG_ON(!imxtm->base); 463 463 464 464 imxtm->type = type; 465 + imxtm->irq = irq; 465 466 466 467 _mxc_timer_init(imxtm); 467 468 }
+2 -2
kernel/time/timer.c
··· 807 807 spin_unlock(&base->lock); 808 808 base = new_base; 809 809 spin_lock(&base->lock); 810 - timer->flags &= ~TIMER_BASEMASK; 811 - timer->flags |= base->cpu; 810 + WRITE_ONCE(timer->flags, 811 + (timer->flags & ~TIMER_BASEMASK) | base->cpu); 812 812 } 813 813 } 814 814