diff options
| author | Paul Burton | 2017-08-13 06:36:37 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2017-09-04 13:53:14 +0200 |
| commit | 16ae123e89d603a69d980bd76c4bb686f219ba0e (patch) | |
| tree | dfd97092e64306ef0fedd6b1b04a3c01963fd523 /arch/mips/vdso | |
| parent | irqchip: mips-gic: Move gic_get_c0_*_int() to asm/mips-gic.h (diff) | |
| download | kernel-qcow2-linux-16ae123e89d603a69d980bd76c4bb686f219ba0e.tar.gz kernel-qcow2-linux-16ae123e89d603a69d980bd76c4bb686f219ba0e.tar.xz kernel-qcow2-linux-16ae123e89d603a69d980bd76c4bb686f219ba0e.zip | |
MIPS: VDSO: Avoid use of linux/irqchip/mips-gic.h
Our VDSO code makes use of macros from linux/irqchip/mips-gic.h to
provide offsets to register values, but these are trivial offsets to the
two 32 bit halves of a 64 bit value. Replace use of the macros with zero
(ie. omit adding an offset) and the size of the low 32 bit of the value.
This removes our need for linux/irqchip/mips-gic.h & prepares us for it
to be removed.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17047/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/vdso')
| -rw-r--r-- | arch/mips/vdso/gettimeofday.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/vdso/gettimeofday.c b/arch/mips/vdso/gettimeofday.c index fec7835b9de7..e22b422f282c 100644 --- a/arch/mips/vdso/gettimeofday.c +++ b/arch/mips/vdso/gettimeofday.c @@ -11,7 +11,6 @@ #include "vdso.h" #include <linux/compiler.h> -#include <linux/irqchip/mips-gic.h> #include <linux/time.h> #include <asm/clocksource.h> @@ -125,9 +124,9 @@ static __always_inline u64 read_gic_count(const union mips_vdso_data *data) u32 hi, hi2, lo; do { - hi = __raw_readl(gic + GIC_UMV_SH_COUNTER_63_32_OFS); - lo = __raw_readl(gic + GIC_UMV_SH_COUNTER_31_00_OFS); - hi2 = __raw_readl(gic + GIC_UMV_SH_COUNTER_63_32_OFS); + hi = __raw_readl(gic + sizeof(lo)); + lo = __raw_readl(gic); + hi2 = __raw_readl(gic + sizeof(lo)); } while (hi2 != hi); return (((u64)hi) << 32) + lo; |