From patchwork Fri Sep 19 19:45:53 2008
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Should we move IPVS out of net/ipv4 now?
Date: Fri, 19 Sep 2008 09:45:53 -0000
From: David Miller <davem@davemloft.net>
X-Patchwork-Id: 665
Message-Id: <20080919.124553.193698159.davem@davemloft.net>
To: juliusv@google.com
Cc: horms@verge.net.au, csnook@redhat.com, lvs-devel@vger.kernel.org,
 netdev@vger.kernel.org

From: "Julius Volz" <juliusv@google.com>
Date: Fri, 19 Sep 2008 11:47:13 +0200

> The build with ARCH=um seems to have a problem with the
> architecture-specific headers:
> 
> net/core/skb_dma_map.c: In function 'skb_dma_map':
> net/core/skb_dma_map.c:20: error: implicit declaration of function
> 'dma_mapping_error'
> 
> The bad commit that introduces the skb_dma_map.c file (and this error)
> is a40c24a1336. Previous versions build fine.

I'll commit the following to net-next-2.6, let me know if it doesn't
take care of the problem:

net: Fix build with ARCH=um

If UM is going to claim that it supports DMA by setting
HAS_DMA, it should provide a dma_mapping_error() implementation.

Based upon a report by Julius Volz.

Signed-off-by: David S. Miller <davem@davemloft.net>


diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h
index f0ee4fb..90fc708 100644
--- a/include/asm-um/dma-mapping.h
+++ b/include/asm-um/dma-mapping.h
@@ -118,4 +118,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 	BUG();
 }
 
+static inline int
+dma_mapping_error(struct device *dev, dma_addr_t dma_handle)
+{
+	BUG();
+	return 0;
+}
+
 #endif