Commit 43afc99d authored by Linus Torvalds's avatar Linus Torvalds

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
parents f17ef495 e2bf3e6e
...@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name, ...@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name,
{ {
struct clocksource_mmio *cs; struct clocksource_mmio *cs;
if (bits > 32 || bits < 16) if (bits > 64 || bits < 16)
return -EINVAL; return -EINVAL;
cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL); cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment