From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 8 Aug 2015 20:49:06 +0000 (-0700)
Subject: fix 3.14 stable queue
X-Git-Tag: v4.1.5~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f26f5042ab1da2b3aac1fa105ce25ccfb5d97e94;p=thirdparty%2Fkernel%2Fstable-queue.git

fix 3.14 stable queue
---

diff --git a/queue-3.14/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch b/queue-3.14/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch
deleted file mode 100644
index 4557107528f..00000000000
--- a/queue-3.14/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c9d120b0b2b5069cb2ae62f8eac0cef31c8544be Mon Sep 17 00:00:00 2001
-From: Haggai Eran <haggaie@mellanox.com>
-Date: Fri, 17 Jul 2015 16:24:06 -0700
-Subject: dma-debug: skip debug_dma_assert_idle() when disabled
-
-From: Haggai Eran <haggaie@mellanox.com>
-
-commit c9d120b0b2b5069cb2ae62f8eac0cef31c8544be upstream.
-
-If dma-debug is disabled due to a memory error, DMA unmaps do not affect
-the dma_active_cacheline radix tree anymore, and debug_dma_assert_idle()
-can print false warnings.
-
-Disable debug_dma_assert_idle() when dma_debug_disabled() is true.
-
-Signed-off-by: Haggai Eran <haggaie@mellanox.com>
-Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()")
-Cc: Dan Williams <dan.j.williams@intel.com>
-Cc: Joerg Roedel <joro@8bytes.org>
-Cc: Vinod Koul <vinod.koul@intel.com>
-Cc: Russell King <rmk+kernel@arm.linux.org.uk>
-Cc: James Bottomley <JBottomley@Parallels.com>
-Cc: Florian Fainelli <f.fainelli@gmail.com>
-Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
-Cc: Jiri Kosina <jkosina@suse.cz>
-Cc: Horia Geanta <horia.geanta@freescale.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- lib/dma-debug.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/lib/dma-debug.c
-+++ b/lib/dma-debug.c
-@@ -566,6 +566,9 @@ void debug_dma_assert_idle(struct page *
- 	unsigned long flags;
- 	phys_addr_t cln;
- 
-+	if (dma_debug_disabled())
-+		return;
-+
- 	if (!page)
- 		return;
- 
diff --git a/queue-3.14/series b/queue-3.14/series
index 47933c11cae..8df7fa2c300 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -2,7 +2,6 @@ mm-avoid-setting-up-anonymous-pages-into-file-mapping.patch
 freeing-unlinked-file-indefinitely-delayed.patch
 s390-sclp-clear-upper-register-halves-in-_sclp_print_early.patch
 arc-make-sure-instruction_pointer-returns-unsigned-value.patch
-dma-debug-skip-debug_dma_assert_idle-when-disabled.patch
 genirq-prevent-resend-to-interrupts-marked-irq_nested_thread.patch
 alsa-usb-audio-add-midi-support-for-steinberg-mi2-mi4.patch
 alsa-usb-audio-add-db-range-mapping-for-some-devices.patch