Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-21 10:23:21 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-21 10:23:25 +0200
commit356c45fd8603179948cdbce4a9039720228ef667 (patch)
tree41a215fff6f03d91b4d958c5376886551a1c0a4d
parent4ee6c7927d0e5106c4f51f3d3dac18c71175ca57 (diff)
genirq: Fix misleading synchronize_irq() documentation
-rw-r--r--patches.kernel.org/5.2.2-008-genirq-Fix-misleading-synchronize_irq-documenta.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.2-008-genirq-Fix-misleading-synchronize_irq-documenta.patch b/patches.kernel.org/5.2.2-008-genirq-Fix-misleading-synchronize_irq-documenta.patch
new file mode 100644
index 0000000000..9d57d8f217
--- /dev/null
+++ b/patches.kernel.org/5.2.2-008-genirq-Fix-misleading-synchronize_irq-documenta.patch
@@ -0,0 +1,38 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 28 Jun 2019 13:11:50 +0200
+Subject: [PATCH] genirq: Fix misleading synchronize_irq() documentation
+References: bnc#1012628
+Patch-mainline: 5.2.2
+Git-commit: 1d21f2af8571c6a6a44e7c1911780614847b0253
+
+commit 1d21f2af8571c6a6a44e7c1911780614847b0253 upstream.
+
+The function might sleep, so it cannot be called from interrupt
+context. Not even with care.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Marc Zyngier <marc.zyngier@arm.com>
+Link: https://lkml.kernel.org/r/20190628111440.189241552@linutronix.de
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ kernel/irq/manage.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
+index 54a41da65eb3..df8498dcb392 100644
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -96,7 +96,8 @@ EXPORT_SYMBOL(synchronize_hardirq);
+ * to complete before returning. If you use this function while
+ * holding a resource the IRQ handler may need you will deadlock.
+ *
+- * This function may be called - with care - from IRQ context.
++ * Can only be called from preemptible code as it might sleep when
++ * an interrupt thread is associated to @irq.
+ */
+ void synchronize_irq(unsigned int irq)
+ {
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index 93a03ff795..d0ec93ca3f 100644
--- a/series.conf
+++ b/series.conf
@@ -95,6 +95,7 @@
patches.kernel.org/5.2.2-005-drivers-base-cacheinfo-Ensure-cpu-hotplug-work-.patch
patches.kernel.org/5.2.2-006-firmware-improve-LSM-IMA-security-behaviour.patch
patches.kernel.org/5.2.2-007-genirq-Delay-deactivation-in-free_irq.patch
+ patches.kernel.org/5.2.2-008-genirq-Fix-misleading-synchronize_irq-documenta.patch
########################################################
# Build fixes that apply to the vanilla kernel too.