4.14-stable patches

added patches:
	arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch

diff --git a/queue-4.14/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch b/queue-4.14/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch
new file mode 100644 (file)
index 0000000..453ae0c
--- /dev/null
+++ b/queue-4.14/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch
@@ -0,0 +1,35 @@
+From 45939ce292b4b11159719faaf60aba7d58d5fe33 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <f.fainelli@gmail.com>
+Date: Tue, 28 Jan 2020 20:22:13 +0100
+Subject: ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()
+
+From: Florian Fainelli <f.fainelli@gmail.com>
+
+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: ecf99a439105 ("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>
+
+---
+ arch/arm/kernel/vdso.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/kernel/vdso.c
++++ b/arch/arm/kernel/vdso.c
+@@ -104,6 +104,8 @@ static bool __init cntvct_functional(voi
+        */
+       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;
+ 
+       if (of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))

diff --git a/queue-4.14/series b/queue-4.14/series
index 928a5ccd909c959d67bac63e5dedf63f769c12e8..7c880c1d967111161ef76047bb58cb95a77146d2 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -93,3 +93,4 @@ slip-not-call-free_netdev-before-rtnl_unlock-in-slip.patch
 hinic-fix-a-bug-of-setting-hw_ioctxt.patch
 net-rmnet-fix-null-pointer-dereference-in-rmnet_newl.patch
 jbd2-fix-data-races-at-struct-journal_head.patch
+arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch