summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorScott Wood <oss@buserror.net>2016-09-22 03:35:18 -0500
committerWill Deacon <will.deacon@arm.com>2016-09-23 17:19:25 +0100
commit1d8f51d41fc7116f3753fe9f9a5dd93e0b550a2c (patch)
treeabbb60533f4f4de2f8b543241a8c7bb1913a2dab /arch/arm64/kernel
parentf6dc1576cd517440313c9551b6ffa3d7e389c7c7 (diff)
downloadblackbird-op-linux-1d8f51d41fc7116f3753fe9f9a5dd93e0b550a2c.tar.gz
blackbird-op-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/arm64/kernel')
-rw-r--r--arch/arm64/kernel/vdso.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 6225612f2464..a2c2478e7d78 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -201,7 +201,7 @@ up_fail:
*/
void update_vsyscall(struct timekeeper *tk)
{
- u32 use_syscall = strcmp(tk->tkr_mono.clock->name, "arch_sys_counter");
+ u32 use_syscall = !tk->tkr_mono.clock->archdata.vdso_direct;
++vdso_data->tb_seq_count;
smp_wmb();
OpenPOWER on IntegriCloud