diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 12:08:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 12:08:23 -0400 |
| commit | ae920eb24277e4a174a3ca575ce42b98b18a6748 (patch) | |
| tree | c93ff42bf92a005854b06a932704ae1367aa553c /kernel | |
| parent | 365d8c001f8eaf18fe9b8c53d2ced4489bcf6b0a (diff) | |
| parent | 53c035204253efe373d9ff166fae6147e8c693b6 (diff) | |
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/sched_clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index a326f27d7f09..0b479a6a22bb 100644 --- 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) | |||
| 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. */ |