diff options
| author | Scott Wood <oss@buserror.net> | 2016-09-22 10:35:18 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-09-23 18:19:25 +0200 |
| commit | 1d8f51d41fc7116f3753fe9f9a5dd93e0b550a2c (patch) | |
| tree | abbb60533f4f4de2f8b543241a8c7bb1913a2dab /arch/arm/kernel | |
| parent | arm64: arch_timer: Work around QorIQ Erratum A-008585 (diff) | |
| download | linux-1d8f51d41fc7116f3753fe9f9a5dd93e0b550a2c.tar.xz linux-1d8f51d41fc7116f3753fe9f9a5dd93e0b550a2c.zip | |
arm/arm64: arch_timer: Use archdata to indicate vdso suitability
Instead of comparing the name to a magic string, use archdata to
explicitly communicate whether the arch timer is suitable for
direct vdso access.
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Scott Wood <oss@buserror.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/vdso.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 994e971a8538..a0affd14086a 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -270,7 +270,7 @@ static bool tk_is_cntvct(const struct timekeeper *tk) if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) return false; - if (strcmp(tk->tkr_mono.clock->name, "arch_sys_counter") != 0) + if (!tk->tkr_mono.clock->archdata.vdso_direct) return false; return true; |