projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2503f7a
)
clocksource: rockchip_timer: rk_timer_read_current_value64 return u64
author
黄涛
<huangtao@rock-chips.com>
Thu, 22 May 2014 00:29:50 +0000
(08:29 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Thu, 22 May 2014 00:30:40 +0000
(08:30 +0800)
drivers/clocksource/rockchip_timer.c
patch
|
blob
|
history
diff --git
a/drivers/clocksource/rockchip_timer.c
b/drivers/clocksource/rockchip_timer.c
index 1f74db6a8210c6298410c2bccbc3526f88de8ef3..319ef5049f8bf23cee228569e64fb87e1fcc35a5 100644
(file)
--- a/
drivers/clocksource/rockchip_timer.c
+++ b/
drivers/clocksource/rockchip_timer.c
@@
-81,7
+81,7
@@
static inline u32 rk_timer_read_current_value(void __iomem *base)
return readl_relaxed(base + TIMER_CURRENT_VALUE0);
}
-static inline u
32
rk_timer_read_current_value64(void __iomem *base)
+static inline u
64
rk_timer_read_current_value64(void __iomem *base)
{
u32 upper, lower;