projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-cpufreq'
[cascardo/linux.git]
/
kernel
/
time
/
sched_clock.c
diff --git
a/kernel/time/sched_clock.c
b/kernel/time/sched_clock.c
index
a326f27
..
0b479a6
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. */