The patch titled
Move valid_dma_direction() from x86_64 to generic code
has been removed from the -mm tree. Its filename is
move-valid_dma_direction-from-x86_64-to-generic-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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.
[akpm@xxxxxxxx: fix]
Signed-off-by: Rolf Eike Beer <eike-kernel@xxxxxxxxx>
Cc: Muli Ben-Yehuda <muli@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/pci-swiotlb.c | 3 ++-
drivers/net/fec_8xx/fec_main.c | 2 +-
drivers/net/fs_enet/fs_enet.h | 3 +--
include/asm-x86_64/dma-mapping.h | 7 -------
include/linux/dma-mapping.h | 7 +++++++
5 files changed, 11 insertions(+), 11 deletions(-)
diff -puN arch/x86_64/kernel/pci-swiotlb.c~move-valid_dma_direction-from-x86_64-to-generic-code arch/x86_64/kernel/pci-swiotlb.c
--- a/arch/x86_64/kernel/pci-swiotlb.c~move-valid_dma_direction-from-x86_64-to-generic-code
+++ a/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 -puN drivers/net/fec_8xx/fec_main.c~move-valid_dma_direction-from-x86_64-to-generic-code drivers/net/fec_8xx/fec_main.c
--- a/drivers/net/fec_8xx/fec_main.c~move-valid_dma_direction-from-x86_64-to-generic-code
+++ a/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 -puN drivers/net/fs_enet/fs_enet.h~move-valid_dma_direction-from-x86_64-to-generic-code drivers/net/fs_enet/fs_enet.h
--- a/drivers/net/fs_enet/fs_enet.h~move-valid_dma_direction-from-x86_64-to-generic-code
+++ a/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 -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
remove-extra-newline-from-info-message.patch
fix-scsi-scsi_transporth-compile-error.patch
remove-superfluous-call-to-call-to-cdev_del.patch
remove-bug_onunlikely-in-include-linux-aioh.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
