diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 10:07:52 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 10:07:52 +0300 |
| commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
| tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /drivers/clocksource | |
| parent | 098b0e01a91c42aaaf0425605cd126b03fcb0bcf (diff) | |
| parent | 8e6cec1c7c5afa489687c90be15d6ed82c742975 (diff) | |
| download | linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.xz | |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 4 | ||||
| -rw-r--r-- | drivers/clocksource/cadence_ttc_timer.c | 1 | ||||
| -rw-r--r-- | drivers/clocksource/timer-sun5i.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a89d41cff915..aae87c4c546e 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1209,9 +1209,9 @@ arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame) return 0; } - rate = readl_relaxed(frame + CNTFRQ); + rate = readl_relaxed(base + CNTFRQ); - iounmap(frame); + iounmap(base); return rate; } diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c index a144dfca6499..29d51755e18b 100644 --- a/drivers/clocksource/cadence_ttc_timer.c +++ b/drivers/clocksource/cadence_ttc_timer.c @@ -18,6 +18,7 @@ #include <linux/clk.h> #include <linux/interrupt.h> #include <linux/clockchips.h> +#include <linux/clocksource.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/slab.h> diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index a4ebc8ff8f91..2a3fe83ec337 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/clockchips.h> +#include <linux/clocksource.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/irq.h> |