From: Greg Kroah-Hartman Date: Thu, 19 Mar 2020 07:58:41 +0000 (+0100) Subject: 5.5-stable patches X-Git-Tag: v4.4.217~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=818eb73d8ba7c7b61b3f4e5bf096a282ac03c864;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..c07f0b17558 --- /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 +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 +@@ -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 756cded173e..95c2c4f96e5 100644 --- 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 Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- - 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 a196d19dd2c..9648e9aa999 100644 --- 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