Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstul…

…tz/linux into timers/urgent Pull small fix for v3.11 from John Stultz. Signed-off-by: Ingo Molnar <mingo@kernel.org>
mariux64 · Aug 12, 2013 · ae920eb · ae920eb
2 parents 365d8c0 + 53c0352
commit ae920eb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
@@ -121,7 +121,7 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)
 	BUG_ON(bits > 32);
 	WARN_ON(!irqs_disabled());
 	read_sched_clock = read;
-	sched_clock_mask = (1 << bits) - 1;
+	sched_clock_mask = (1ULL << bits) - 1;
 	cd.rate = rate;
 
 	/* calculate the mult/shift to convert counter ticks to ns. */