Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:41 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:55 +0200
commitadf22bdff117eb411ffe5a1acf7fcb8589578e7e (patch)
tree85d5b6f430a15e9fbc79a84b59e6ef783f203a1a
parent16be144043f03476ee3b438452452ca70f5b4e91 (diff)
staging: vchiq_2835_arm: revert "quit using custom
down_interruptible()" (bnc#1012628).
-rw-r--r--patches.kernel.org/5.2.1-052-staging-vchiq_2835_arm-revert-quit-using-custom.patch40
-rw-r--r--series.conf1
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.1-052-staging-vchiq_2835_arm-revert-quit-using-custom.patch b/patches.kernel.org/5.2.1-052-staging-vchiq_2835_arm-revert-quit-using-custom.patch
new file mode 100644
index 0000000000..667c1a2a4e
--- /dev/null
+++ b/patches.kernel.org/5.2.1-052-staging-vchiq_2835_arm-revert-quit-using-custom.patch
@@ -0,0 +1,40 @@
+From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Date: Thu, 9 May 2019 16:31:33 +0200
+Subject: [PATCH] staging: vchiq_2835_arm: revert "quit using custom
+ down_interruptible()"
+References: bnc#1012628
+Patch-mainline: 5.2.1
+Git-commit: 061ca1401f96c254e7f179bf97a1fc5c7f47e1e1
+
+commit 061ca1401f96c254e7f179bf97a1fc5c7f47e1e1 upstream.
+
+The killable version of down() is meant to be used on situations where
+it should not fail at all costs, but still have the convenience of being
+able to kill it if really necessary. VCHIQ doesn't fit this criteria, as
+it's mainly used as an interface to V4L2 and ALSA devices.
+
+Fixes: ff5979ad8636 ("staging: vchiq_2835_arm: quit using custom down_interruptible()")
+Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+index c557c9953724..aa20fcaefa9d 100644
+--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+@@ -523,7 +523,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type)
+ (g_cache_line_size - 1)))) {
+ char *fragments;
+
+- if (down_killable(&g_free_fragments_sema)) {
++ if (down_interruptible(&g_free_fragments_sema) != 0) {
+ cleanup_pagelistinfo(pagelistinfo);
+ return NULL;
+ }
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index c116c4e4d8..6312e5a058 100644
--- a/series.conf
+++ b/series.conf
@@ -78,6 +78,7 @@
patches.kernel.org/5.2.1-049-carl9170-fix-misuse-of-device-driver-API.patch
patches.kernel.org/5.2.1-050-Revert-x86-build-Move-_etext-to-actual-end-of-..patch
patches.kernel.org/5.2.1-051-VMCI-Fix-integer-overflow-in-VMCI-handle-arrays.patch
+ patches.kernel.org/5.2.1-052-staging-vchiq_2835_arm-revert-quit-using-custom.patch
########################################################
# Build fixes that apply to the vanilla kernel too.