History

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.

Ingo Molnar committed 13 years ago

Commit ae920eb2 parents 365d8c0 53c03521 file · +1 −1Browse files

Unified · Split

kernel/time/sched_clock.c+1−1
@@ -121,7 +121,7 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) · 120 unmodified lines
121 BUG_ON(bits > 32);121 BUG_ON(bits > 32);
122 WARN_ON(!irqs_disabled());122 WARN_ON(!irqs_disabled());
123 read_sched_clock = read;123 read_sched_clock = read;
124 sched_clock_mask = (1 << bits) - 1;124 sched_clock_mask = (1ULL << bits) - 1;
125 cd.rate = rate;125 cd.rate = rate;
126 126
127 /* calculate the mult/shift to convert counter ticks to ns. */127 /* calculate the mult/shift to convert counter ticks to ns. */