x86: move quad_local_to_mp_bus_id to numa.c

[sfrench/cifs-2.6.git] / include / asm-arm / dma.h

diff --git a/include/asm-arm/dma.h b/include/asm-arm/dma.h
index ef41df43a584765b5c7d10ce6e38a6cc75d567f8..9f2c5305c26014a9aea95faaf73a9c82c1260201 100644 (file)
--- a/include/asm-arm/dma.h
+++ b/include/asm-arm/dma.h
@@ -3,12 +3,18 @@
 
 typedef unsigned int dmach_t;
 
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <asm/system.h>
 #include <asm/scatterlist.h>
 #include <asm/arch/dma.h>
 
+/*
+ * This is the maximum virtual address which can be DMA'd from.
+ */
+#ifndef MAX_DMA_ADDRESS
+#define MAX_DMA_ADDRESS        0xffffffff
+#endif
+
 /*
  * DMA modes
  */
@@ -91,7 +97,9 @@ extern void set_dma_sg(dmach_t channel, struct scatterlist *sg, int nr_sg);
  * especially since some DMA architectures don't update the
  * DMA address immediately, but defer it to the enable_dma().
  */
-extern void set_dma_addr(dmach_t channel, unsigned long physaddr);
+extern void __set_dma_addr(dmach_t channel, void *addr);
+#define set_dma_addr(channel, addr)                            \
+       __set_dma_addr(channel, bus_to_virt(addr))
 
 /* Set the DMA byte count for this channel
  *