From: Florian Fainelli Date: Tue, 28 Jan 2020 19:22:13 +0000 (+0100) Subject: ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional() X-Git-Tag: v5.6-rc7~22^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45939ce292b4b11159719faaf60aba7d58d5fe33;p=thirdparty%2Fkernel%2Flinux.git ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional() It is possible for a system with an ARMv8 timer to run a 32-bit kernel. When this happens we will unconditionally have the vDSO code remove the __vdso_gettimeofday and __vdso_clock_gettime symbols because cntvct_functional() returns false since it does not match that compatibility string. Fixes: ecf99a439105 ("ARM: 8331/1: VDSO initialization, mapping, and synchronization") Signed-off-by: Florian Fainelli Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index c89ac1b9d28b2..e0330a25e1c6d 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -94,6 +94,8 @@ static bool __init cntvct_functional(void) * this. */ np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer"); + if (!np) + np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer"); if (!np) goto out_put;