aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaggai Eran <[email protected]>2015-07-17 16:24:06 -0700
committerLinus Torvalds <[email protected]>2015-07-17 16:39:53 -0700
commitc9d120b0b2b5069cb2ae62f8eac0cef31c8544be (patch)
tree5007001027c48ccc5c9717326bbc5666785634cb
parent0f70fe605fad0f3215818ba79fc12617c0ec7f90 (diff)
dma-debug: skip debug_dma_assert_idle() when disabled
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 <[email protected]> Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()") Cc: Dan Williams <[email protected]> Cc: Joerg Roedel <[email protected]> Cc: Vinod Koul <[email protected]> Cc: Russell King <[email protected]> Cc: James Bottomley <[email protected]> Cc: Florian Fainelli <[email protected]> Cc: Sebastian Ott <[email protected]> Cc: Jiri Kosina <[email protected]> Cc: Horia Geanta <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--lib/dma-debug.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index ae4b65e17e64..dace71fe41f7 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;