aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-12-13 12:36:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-12-13 12:36:23 -0800
commit43afc99db9ead0bb8a69833ffb5e6ee2a7fe76b4 (patch)
tree81222084a81eaa67e1dd9760ff713290935951ef
parentf17ef4959f6281e86aa0a28c7ed615c0b86a79b5 (diff)
parente2bf3e6ecaff79c5479682da2dc7b2035e52c5b8 (diff)
downloadlinux-43afc99db9ead0bb8a69833ffb5e6ee2a7fe76b4.tar.gz
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
-rw-r--r--drivers/clocksource/mmio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c
index 1593ade2a815..c4f7d7a9b689 100644
--- a/drivers/clocksource/mmio.c
+++ b/drivers/clocksource/mmio.c
@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem *base, const char *name,
{
struct clocksource_mmio *cs;
- if (bits > 32 || bits < 16)
+ if (bits > 64 || bits < 16)
return -EINVAL;
cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);