5.5-stable patches

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

diff --git a/queue-5.5/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch b/queue-5.5/arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch
new file mode 100644 (file)
index 0000000..c07f0b1
--- /dev/null
+++ b/queue-5.5/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
+@@ -95,6 +95,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-5.5/blk-mq-insert-flush-request-to-the-front-of-dispatch.patch b/queue-5.5/blk-mq-insert-flush-request-to-the-front-of-dispatch.patch
index 756cded173e6d936ae4c3bf1bd6e1202449057a9..95c2c4f96e5577d2dd39216dd1dea80e3f6fa8b2 100644 (file)
--- a/queue-5.5/blk-mq-insert-flush-request-to-the-front-of-dispatch.patch
+++ b/queue-5.5/blk-mq-insert-flush-request-to-the-front-of-dispatch.patch
@@ -32,14 +32,12 @@ Signed-off-by: Ming Lei <ming.lei@redhat.com>
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- block/blk-mq-sched.c | 22 ++++++++++++++++++++++
+ block/blk-mq-sched.c |   22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
-diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
-index 856356b1619e8..74cedea560348 100644
 --- a/block/blk-mq-sched.c
 +++ b/block/blk-mq-sched.c
-@@ -398,6 +398,28 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head,
+@@ -398,6 +398,28 @@ void blk_mq_sched_insert_request(struct
        WARN_ON(e && (rq->tag != -1));
  
        if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) {
@@ -68,6 +66,3 @@ index 856356b1619e8..74cedea560348 100644
                blk_mq_request_bypass_insert(rq, at_head, false);
                goto run;
        }
--- 
-2.20.1
-

diff --git a/queue-5.5/series b/queue-5.5/series
index a196d19dd2cd1488f9d2c2b0b25fb4fcd492ae3f..9648e9aa999d3a4139b48bb0ae501afca347bd94 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -56,3 +56,4 @@ mlxsw-pci-wait-longer-before-accessing-the-device-af.patch
 net-dsa-mv88e6xxx-fix-masking-of-egress-port.patch
 jbd2-fix-data-races-at-struct-journal_head.patch
 blk-mq-insert-flush-request-to-the-front-of-dispatch.patch
+arm-8957-1-vdso-match-armv8-timer-in-cntvct_functional.patch