Commit 8cf58ea4 authored Jan 28, 2020 by Florian Fainelli Committed by Greg Kroah-Hartman Mar 20, 2020

ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()



commit 45939ce292b4b11159719faaf60aba7d58d5fe33 upstream.

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: ecf99a43 ("ARM: 8331/1: VDSO initialization, mapping, and synchronization")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent bc97a345

arch/arm/kernel/vdso.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,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;