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

Commit ae920eb2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/urgent 



Pull small fix for v3.11 from John Stultz.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 365d8c00 53c03520

kernel/time/sched_clock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) 
	BUG_ON(bits > 32);

	BUG_ON(bits > 32);

	WARN_ON(!irqs_disabled());

	WARN_ON(!irqs_disabled());

	read_sched_clock = read;

	read_sched_clock = read;

	sched_clock_mask = (1 << bits) - 1;

	sched_clock_mask = (1ULL << bits) - 1;

	cd.rate = rate;

	cd.rate = rate;





	/* calculate the mult/shift to convert counter ticks to ns. */

	/* calculate the mult/shift to convert counter ticks to ns. */