From 46e1a55957347843f37c2a1ea5019940781f9677 Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah.khan@hp.com>
Date: Fri, 23 Nov 2012 14:32:06 -0700
Subject: [PATCH] --- yaml --- r: 347487 b: refs/heads/master c:
 ad154880c03daf1f776e502e2c18775eda4280d2 h: refs/heads/master i:   347485:
 be1c0bfc7c19f1ff5b86197c785be29bfa1f93de   347483:
 b6ebffcdc51eba8002fb68ba372e7722131c8403   347479:
 96336f76bab92326e22b3b69e4757cacff625a02   347471:
 83cc1d5c44c433db045ac35f8e2848c98ed9ff05   347455:
 b5c74865914764f2cc56b06d60f5ff3a0966ad37 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/c6x/include/asm/dma-mapping.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 486abc4338a8..59af65497a58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb7c4deb82c2f0b278cdf45a392a3ed9479cdbbe
+refs/heads/master: ad154880c03daf1f776e502e2c18775eda4280d2
diff --git a/trunk/arch/c6x/include/asm/dma-mapping.h b/trunk/arch/c6x/include/asm/dma-mapping.h
index 03579fd99dba..3c694065030f 100644
--- a/trunk/arch/c6x/include/asm/dma-mapping.h
+++ b/trunk/arch/c6x/include/asm/dma-mapping.h
@@ -32,6 +32,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  */
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
+	debug_dma_mapping_error(dev, dma_addr);
 	return dma_addr == ~0;
 }