[3.19.y-ckt stable] Patch "dma-debug: skip debug_dma_assert_idle() when disabled" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    dma-debug: skip debug_dma_assert_idle() when disabled

to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue

This patch is scheduled to be released in version 3.19.8-ckt5.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 3198795dce24fe85a81c5a835dcef8b25d133226 Mon Sep 17 00:00:00 2001
From: Haggai Eran <haggaie at mellanox.com>
Date: Fri, 17 Jul 2015 16:24:06 -0700
Subject: dma-debug: skip debug_dma_assert_idle() when disabled

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 at mellanox.com>
Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()")
Cc: Dan Williams <dan.j.williams at intel.com>
Cc: Joerg Roedel <joro at 8bytes.org>
Cc: Vinod Koul <vinod.koul at intel.com>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Cc: James Bottomley <JBottomley at Parallels.com>
Cc: Florian Fainelli <f.fainelli at gmail.com>
Cc: Sebastian Ott <sebott at linux.vnet.ibm.com>
Cc: Jiri Kosina <jkosina at suse.cz>
Cc: Horia Geanta <horia.geanta at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 lib/dma-debug.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 9722bd2..d75c2f4 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page)
 	unsigned long flags;
 	phys_addr_t cln;

+	if (dma_debug_disabled())
+		return;
+
 	if (!page)
 		return;

--
1.9.1