diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 18:08:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 18:08:23 +0200 |
| commit | ae920eb24277e4a174a3ca575ce42b98b18a6748 (patch) | |
| tree | c93ff42bf92a005854b06a932704ae1367aa553c /kernel/time | |
| parent | Merge branch 'timers/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | sched_clock: Fix integer overflow (diff) | |
| download | linux-ae920eb24277e4a174a3ca575ce42b98b18a6748.tar.xz linux-ae920eb24277e4a174a3ca575ce42b98b18a6748.zip | |
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/time')
| -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) 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. */ |