Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/clocksource/mmio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);