[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sat, 8 Aug 2015 15:08:34 -0700
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Haggai Eran <haggaie@...lanox.com>,
Dan Williams <dan.j.williams@...el.com>,
Joerg Roedel <joro@...tes.org>,
Vinod Koul <vinod.koul@...el.com>,
Russell King <rmk+kernel@....linux.org.uk>,
James Bottomley <JBottomley@...allels.com>,
Florian Fainelli <f.fainelli@...il.com>,
Sebastian Ott <sebott@...ux.vnet.ibm.com>,
Jiri Kosina <jkosina@...e.cz>,
Horia Geanta <horia.geanta@...escale.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: [PATCH 4.1 036/123] dma-debug: skip debug_dma_assert_idle() when disabled
4.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haggai Eran <haggaie@...lanox.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@...lanox.com>
Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()")
Cc: Dan Williams <dan.j.williams@...el.com>
Cc: Joerg Roedel <joro@...tes.org>
Cc: Vinod Koul <vinod.koul@...el.com>
Cc: Russell King <rmk+kernel@....linux.org.uk>
Cc: James Bottomley <JBottomley@...allels.com>
Cc: Florian Fainelli <f.fainelli@...il.com>
Cc: Sebastian Ott <sebott@...ux.vnet.ibm.com>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: Horia Geanta <horia.geanta@...escale.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
lib/dma-debug.c | 3 +++
1 file changed, 3 insertions(+)
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *
unsigned long flags;
phys_addr_t cln;
+ if (dma_debug_disabled())
+ return;
+
if (!page)
return;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists