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 committed 10 years ago

Commit 43afc992 parents f17ef49 e2bf3e61 file · +1 −1Browse files

Unified · Split

drivers/clocksource/mmio.c+1−1

@@ -55,7 +55,7 @@ int __init clocksource_mmio_init(void __iomem base, const char name, · 54 unmodified lines
55	{	55	{
56	struct clocksource_mmio *cs;	56	struct clocksource_mmio *cs;
57		57
58	if (bits > 32 \|\| bits < 16)	58	if (bits > 64 \|\| bits < 16)
59	return -EINVAL;	59	return -EINVAL;
60		60
61	cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);	61	cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);