Skip to content

Commit 45939ce

Browse files
ffainelliRussell King
authored andcommitted
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: ecf99a4 ("ARM: 8331/1: VDSO initialization, mapping, and synchronization") Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent bb6d3fb commit 45939ce

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/arm/kernel/vdso.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ static bool __init cntvct_functional(void)
9494
* this.
9595
*/
9696
np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
97+
if (!np)
98+
np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");
9799
if (!np)
98100
goto out_put;
99101

0 commit comments

Comments
 (0)