4.1-stable review patch. If anyone has any objections, please let me know.
------------------ From: Haggai Eran <[email protected]> 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 <[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]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
