Commit 45939ce2 authored by Florian Fainelli's avatar Florian Fainelli Committed by Russell King

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: ecf99a43 ("ARM: 8331/1: VDSO initialization, mapping, and synchronization")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent bb6d3fb3
...@@ -94,6 +94,8 @@ static bool __init cntvct_functional(void) ...@@ -94,6 +94,8 @@ static bool __init cntvct_functional(void)
* this. * this.
*/ */
np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer"); np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
if (!np)
np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");
if (!np) if (!np)
goto out_put; goto out_put;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment