diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2013-07-17 12:46:53 +0300 |
|---|---|---|
| committer | Ajay Nandakumar <anandakumarm@nvidia.com> | 2014-01-13 12:03:37 +0530 |
| commit | 2acd351913e560b6e0db987cf536126b02ff415e (patch) | |
| tree | f840202a5c8eaad2311ba3fef90a8ed50e22b1a7 /kernel/time | |
| parent | fdbaed23b16dd817ceb54fe4458193bf920d1c06 (diff) | |
sched_clock: Fix integer overflow
The expression '(1 << 32)' happens to evaluate as 0 on ARM, but
it evaluates as 1 on xtensa and x86_64. This zeros sched_clock_mask,
and breaks sched_clock().
Set the type of 1 to 'unsigned long long' to get the value we need.
Bug 1399318
Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: John Stultz <john.stultz@linaro.org>
(cherry picked from commit 53c035204253efe373d9ff166fae6147e8c693b6)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Change-Id: I9bbe733430f9f7850e4073feef4265f626e6dc8f
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. */ |