From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 Apr 2018 12:53:05 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v3.18.103~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19e24d3d9bacc5989b3c562f3a71346fb2eb3c04;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	acpi-pci-irq-remove-redundant-check-for-null-string-pointer.patch
	writeback-fix-the-wrong-congested-state-variable-definition.patch
---

diff --git a/queue-4.4/acpi-pci-irq-remove-redundant-check-for-null-string-pointer.patch b/queue-4.4/acpi-pci-irq-remove-redundant-check-for-null-string-pointer.patch
new file mode 100644
index 00000000000..be6fd283e17
--- /dev/null
+++ b/queue-4.4/acpi-pci-irq-remove-redundant-check-for-null-string-pointer.patch
@@ -0,0 +1,37 @@
+From 45288978859119c019eff93f0cb838a0de100bcc Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 5 Jan 2016 10:57:11 +0000
+Subject: ACPI, PCI, irq: remove redundant check for null string pointer
+
+From: Colin Ian King <colin.king@canonical.com>
+
+commit 45288978859119c019eff93f0cb838a0de100bcc upstream.
+
+source is decleared as a 4 byte char array in struct acpi_pci_routing_table
+so !prt->source is a redundant null string pointer check. Detected with
+smatch:
+
+drivers/acpi/pci_irq.c:134 do_prt_fixups() warn: this array is probably
+  non-NULL. 'prt->source'
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/pci_irq.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/acpi/pci_irq.c
++++ b/drivers/acpi/pci_irq.c
+@@ -131,9 +131,6 @@ static void do_prt_fixups(struct acpi_pr
+ 		quirk = &prt_quirks[i];
+ 
+ 		/* All current quirks involve link devices, not GSIs */
+-		if (!prt->source)
+-			continue;
+-
+ 		if (dmi_check_system(quirk->system) &&
+ 		    entry->id.segment == quirk->segment &&
+ 		    entry->id.bus == quirk->bus &&
diff --git a/queue-4.4/series b/queue-4.4/series
index b17dc33d270..04764d72824 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -9,3 +9,5 @@ usb-gadget-fix-usb_ep_align_maybe-endianness-and-new-usb_ep_align.patch
 usb-gadget-align-buffer-size-when-allocating-for-out-endpoint.patch
 usb-gadget-f_hid-fix-prevent-accessing-released-memory.patch
 kprobes-x86-fix-to-set-rwx-bits-correctly-before-releasing-trampoline.patch
+acpi-pci-irq-remove-redundant-check-for-null-string-pointer.patch
+writeback-fix-the-wrong-congested-state-variable-definition.patch
diff --git a/queue-4.4/writeback-fix-the-wrong-congested-state-variable-definition.patch b/queue-4.4/writeback-fix-the-wrong-congested-state-variable-definition.patch
new file mode 100644
index 00000000000..eb680c1fa08
--- /dev/null
+++ b/queue-4.4/writeback-fix-the-wrong-congested-state-variable-definition.patch
@@ -0,0 +1,42 @@
+From c877ef8ae7b8edaedccad0fc8c23d4d1de7e2480 Mon Sep 17 00:00:00 2001
+From: Kaixu Xia <xiakaixu@huawei.com>
+Date: Thu, 31 Mar 2016 13:19:41 +0000
+Subject: writeback: fix the wrong congested state variable definition
+
+From: Kaixu Xia <xiakaixu@huawei.com>
+
+commit c877ef8ae7b8edaedccad0fc8c23d4d1de7e2480 upstream.
+
+The right variable definition should be wb_congested_state that
+include WB_async_congested and WB_sync_congested. So fix it.
+
+Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
+Acked-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+Cc: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/backing-dev.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/mm/backing-dev.c
++++ b/mm/backing-dev.c
+@@ -922,7 +922,7 @@ static atomic_t nr_wb_congested[2];
+ void clear_wb_congested(struct bdi_writeback_congested *congested, int sync)
+ {
+ 	wait_queue_head_t *wqh = &congestion_wqh[sync];
+-	enum wb_state bit;
++	enum wb_congested_state bit;
+ 
+ 	bit = sync ? WB_sync_congested : WB_async_congested;
+ 	if (test_and_clear_bit(bit, &congested->state))
+@@ -935,7 +935,7 @@ EXPORT_SYMBOL(clear_wb_congested);
+ 
+ void set_wb_congested(struct bdi_writeback_congested *congested, int sync)
+ {
+-	enum wb_state bit;
++	enum wb_congested_state bit;
+ 
+ 	bit = sync ? WB_sync_congested : WB_async_congested;
+ 	if (!test_and_set_bit(bit, &congested->state))