projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dmaengine-4.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma
[linux-2.6-block.git]
/
kernel
/
time
/
jiffies.c
diff --git
a/kernel/time/jiffies.c
b/kernel/time/jiffies.c
index 347fecf86a3fb2242e0a88b63975424f0293dde7..555e21f7b966c789f48ee4aa5fece85cc7db6768 100644
(file)
--- a/
kernel/time/jiffies.c
+++ b/
kernel/time/jiffies.c
@@
-68,7
+68,7
@@
static struct clocksource clocksource_jiffies = {
.name = "jiffies",
.rating = 1, /* lowest valid rating*/
.read = jiffies_read,
- .mask =
0xffffffff, /*32bits*/
+ .mask =
CLOCKSOURCE_MASK(32),
.mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */
.shift = JIFFIES_SHIFT,
.max_cycles = 10,