The patch titled
Move valid_dma_direction() from x86_64 to generic code
has been added to the -mm tree. Its filename is
move-valid_dma_direction-from-x86_64-to-generic-code.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Move valid_dma_direction() from x86_64 to generic code
From: Rolf Eike Beer <eike-kernel@xxxxxxxxx>
As suggested by Muli Ben-Yehuda this function is moved to generic code as
may be useful for all archs.
Signed-off-by: Rolf Eike Beer <eike-kernel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
diff -puN include/asm-x86_64/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code include/asm-x86_64/dma-mapping.h
--- a/include/asm-x86_64/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code
+++ a/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 -puN include/linux/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code include/linux/dma-mapping.h
--- a/include/linux/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code
+++ a/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 */
_
Patches currently in -mm which might be from eike-kernel@xxxxxxxxx are
origin.patch
git-mtd.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
use-bug_onfoo-instead-of-if-foo-bug-in-include-asm-i386-dma-mappingh.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc.patch
move-valid_dma_direction-from-x86_64-to-generic-code.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
