diff options
| author | Rolf Eike Beer <eike-kernel@sf-tec.de> | 2006-09-29 01:59:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:10 -0700 |
| commit | d6bd3a39f7c6ebad49c261c3d458df974c880758 (patch) | |
| tree | a5cf6054a8ff276f8d84ba94bb5df89ed5646332 | |
| parent | d09d7ddf3018b4c6efa76dce72f6dec6054fa22b (diff) | |
| download | op-kernel-dev-d6bd3a39f7c6ebad49c261c3d458df974c880758.zip op-kernel-dev-d6bd3a39f7c6ebad49c261c3d458df974c880758.tar.gz | |
[PATCH] Move valid_dma_direction() from x86_64 to generic code
As suggested by Muli Ben-Yehuda this function is moved to generic code as
may be useful for all archs.
[akpm@osdl.org: fix]
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/kernel/pci-swiotlb.c | 3 | ||||
| -rw-r--r-- | drivers/net/fec_8xx/fec_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/fs_enet/fs_enet.h | 3 | ||||
| -rw-r--r-- | include/asm-x86_64/dma-mapping.h | 7 | ||||
| -rw-r--r-- | include/linux/dma-mapping.h | 7 |
5 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86_64/kernel/pci-swiotlb.c b/arch/x86_64/kernel/pci-swiotlb.c index 6a55f87..697f0aa 100644 --- a/arch/x86_64/kernel/pci-swiotlb.c +++ b/arch/x86_64/kernel/pci-swiotlb.c @@ -3,7 +3,8 @@ #include <linux/pci.h> #include <linux/cache.h> #include <linux/module.h> -#include <asm/dma-mapping.h> +#include <linux/dma-mapping.h> + #include <asm/proto.h> #include <asm/swiotlb.h> #include <asm/dma.h> diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c index 22ac2df..e17a144 100644 --- a/drivers/net/fec_8xx/fec_main.c +++ b/drivers/net/fec_8xx/fec_main.c @@ -30,6 +30,7 @@ #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/bitops.h> +#include <linux/dma-mapping.h> #include <asm/8xx_immap.h> #include <asm/pgtable.h> @@ -37,7 +38,6 @@ #include <asm/irq.h> #include <asm/uaccess.h> #include <asm/commproc.h> -#include <asm/dma-mapping.h> #include "fec_8xx.h" diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h index 95022c005..92590d8 100644 --- a/drivers/net/fs_enet/fs_enet.h +++ b/drivers/net/fs_enet/fs_enet.h @@ -6,11 +6,10 @@ #include <linux/types.h> #include <linux/list.h> #include <linux/phy.h> +#include <linux/dma-mapping.h> #include <linux/fs_enet_pd.h> -#include <asm/dma-mapping.h> - #ifdef CONFIG_CPM1 #include <asm/commproc.h> diff --git a/include/asm-x86_64/dma-mapping.h b/include/asm-x86_64/dma-mapping.h index b6da83d..10174b1 100644 --- a/include/asm-x86_64/dma-mapping.h +++ b/include/asm-x86_64/dma-mapping.h @@ -55,13 +55,6 @@ extern dma_addr_t bad_dma_address; extern struct dma_mapping_ops* dma_ops; extern int iommu_merge; -static inline int valid_dma_direction(int dma_direction) -{ - return ((dma_direction == DMA_BIDIRECTIONAL) || - (dma_direction == DMA_TO_DEVICE) || - (dma_direction == DMA_FROM_DEVICE)); -} - static inline int dma_mapping_error(dma_addr_t dma_addr) { if (dma_ops->mapping_error) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 635690c..ff203c4 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -24,6 +24,13 @@ enum dma_data_direction { #define DMA_28BIT_MASK 0x000000000fffffffULL #define DMA_24BIT_MASK 0x0000000000ffffffULL +static inline int valid_dma_direction(int dma_direction) +{ + return ((dma_direction == DMA_BIDIRECTIONAL) || + (dma_direction == DMA_TO_DEVICE) || + (dma_direction == DMA_FROM_DEVICE)); +} + #include <asm/dma-mapping.h> /* Backwards compat, remove in 2.7.x */ |
