The patch titled
     Subject: dma-debug: skip debug_dma_assert_idle() when disabled
has been added to the -mm tree.  Its filename is
     dma-debug-skip-debug_dma_assert_idle-when-disabled.patch

This patch should soon appear at
    
http://ozlabs.org/~akpm/mmots/broken-out/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch
and later at
    
http://ozlabs.org/~akpm/mmotm/broken-out/dma-debug-skip-debug_dma_assert_idle-when-disabled.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Haggai Eran <[email protected]>
Subject: 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]>
---

 lib/dma-debug.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN lib/dma-debug.c~dma-debug-skip-debug_dma_assert_idle-when-disabled 
lib/dma-debug.c
--- a/lib/dma-debug.c~dma-debug-skip-debug_dma_assert_idle-when-disabled
+++ a/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;
 
_

Patches currently in -mm which might be from [email protected] are

dma-debug-skip-debug_dma_assert_idle-when-disabled.patch

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to