From 4872ed7bf44c5fb1b9f56babbc1ab6d9148c1d3b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Mar 2020 08:57:09 +0100 Subject: [PATCH] 4.4-stable patches added patches: arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch --- ...tch-armv8-timer-in-cntvct_functional.patch | 35 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 queue-4.4/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch diff --git a/queue-4.4/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch b/queue-4.4/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch new file mode 100644 index 00000000000..b8a105725b1 --- /dev/null +++ b/queue-4.4/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 +Date: Tue, 28 Jan 2020 20:22:13 +0100 +Subject: ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional() + +From: Florian Fainelli + +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 +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/kernel/vdso.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/kernel/vdso.c ++++ b/arch/arm/kernel/vdso.c +@@ -85,6 +85,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.4/series b/queue-4.4/series index b6486e50717..2894134b062 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -87,3 +87,4 @@ perf-amd-uncore-replace-manual-sampling-check-with-c.patch net-ks8851-ml-fix-irq-handling-and-locking.patch signal-avoid-double-atomic-counter-increments-for-us.patch jbd2-fix-data-races-at-struct-journal_head.patch +arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch -- 2.47.3