Re: Should we move IPVS out of net/ipv4 now?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Julius Volz" <juliusv@xxxxxxxxxx>
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@xxxxxxxxxxxxx>
---
 include/asm-um/dma-mapping.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

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
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Filesystem Devel]     [Linux NFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]     [X.Org]

  Powered by Linux