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

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

Pull timer fix from Thomas Gleixner:
"A single fix to unbreak a clocksource driver which has more than 32bit
counter width"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Mmio: remove artificial 32bit limitation

Linus Torvalds 43afc99d f17ef495

options
unified split
Changed files
+1 -1
drivers
clocksource
mmio.c
+1 -1
drivers/clocksource/mmio.c
··· 55 { 56 struct clocksource_mmio *cs; 57 58 - if (bits > 32 || bits < 16) 59 return -EINVAL; 60 61 cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);
··· 55 { 56 struct clocksource_mmio *cs; 57 58 + if (bits > 64 || bits < 16) 59 return -EINVAL; 60 61 cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);