projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
365d8c0
)
Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into...
author
Ingo Molnar
<mingo@kernel.org>
Mon, 12 Aug 2013 16:08:23 +0000
(18:08 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 12 Aug 2013 16:08:23 +0000
(18:08 +0200)
Pull small fix for v3.11 from John Stultz.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/time/sched_clock.c
patch
|
blob
|
history
diff --git
a/kernel/time/sched_clock.c
b/kernel/time/sched_clock.c
index a326f27d7f09e0942ae2df9eb010d8caaabdb725..0b479a6a22bb8fe30e2b9d6c76c2ddb1d5646ae1 100644
(file)
--- 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 = (1
ULL
<< bits) - 1;
cd.rate = rate;
/* calculate the mult/shift to convert counter ticks to ns. */