aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/vdso.c
diff options
context:
space:
mode:
authorScott Wood <oss@buserror.net>2016-09-22 04:35:18 -0400
committerWill Deacon <will.deacon@arm.com>2016-09-23 12:19:25 -0400
commit1d8f51d41fc7116f3753fe9f9a5dd93e0b550a2c (patch)
treeabbb60533f4f4de2f8b543241a8c7bb1913a2dab /arch/arm/kernel/vdso.c
parentf6dc1576cd517440313c9551b6ffa3d7e389c7c7 (diff)
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/vdso.c')
-rw-r--r--arch/arm/kernel/vdso.c2
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)
270 if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) 270 if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
271 return false; 271 return false;
272 272
273 if (strcmp(tk->tkr_mono.clock->name, "arch_sys_counter") != 0) 273 if (!tk->tkr_mono.clock->archdata.vdso_direct)
274 return false; 274 return false;
275 275
276 return true; 276 return true;