Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2994124AbbHHWbz (ORCPT ); Sat, 8 Aug 2015 18:31:55 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36489 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2993514AbbHHWSE (ORCPT ); Sat, 8 Aug 2015 18:18:04 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Haggai Eran , Dan Williams , Joerg Roedel , Vinod Koul , Russell King , James Bottomley , Florian Fainelli , Sebastian Ott , Jiri Kosina , Horia Geanta , Andrew Morton , Linus Torvalds Subject: [PATCH 4.1 036/123] dma-debug: skip debug_dma_assert_idle() when disabled Date: Sat, 8 Aug 2015 15:08:34 -0700 Message-Id: <20150808220719.209883747@linuxfoundation.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <20150808220717.771230091@linuxfoundation.org> References: <20150808220717.771230091@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1651 Lines: 52 4.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haggai Eran 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 Fixes: 0abdd7a81b7e ("dma-debug: introduce debug_dma_assert_idle()") Cc: Dan Williams Cc: Joerg Roedel Cc: Vinod Koul Cc: Russell King Cc: James Bottomley Cc: Florian Fainelli Cc: Sebastian Ott Cc: Jiri Kosina Cc: Horia Geanta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/