[Xen-changelog] [xen-unstable] [IA64] dma-mapping.h user our own swiotlb.h header

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Xen-changelog] [xen-unstable] [IA64] dma-mapping.h user our own swiotlb.h header

Xen patchbot-unstable
# HG changeset patch
# User [hidden email]
# Date 1171299730 25200
# Node ID 46a8d51134d0603f3db6b6c55ac048afc04839d8
# Parent  dea561992abe678932e2f5dde9346241bf9bc399
[IA64] dma-mapping.h user our own swiotlb.h header

Signed-off-by: Takanori Kasai <[hidden email]>
---
 linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h |    2 +-
 linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h     |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff -r dea561992abe -r 46a8d51134d0 linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h Mon Feb 12 09:54:20 2007 -0700
+++ b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h Mon Feb 12 10:02:10 2007 -0700
@@ -10,7 +10,7 @@
 /* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
 #include <asm/hypervisor.h>
 /* Needed for arch/i386/kernel/swiotlb.c */
-#include <asm-i386/mach-xen/asm/swiotlb.h>
+#include <asm/swiotlb.h>
 #endif
 
 #ifndef CONFIG_XEN
diff -r dea561992abe -r 46a8d51134d0 linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h Mon Feb 12 09:54:20 2007 -0700
+++ b/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h Mon Feb 12 10:02:10 2007 -0700
@@ -34,8 +34,6 @@ extern int swiotlb_dma_supported(struct
 extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
 extern void swiotlb_init(void);
 
-extern unsigned int dma_bits;
-
 #ifdef CONFIG_SWIOTLB
 extern int swiotlb;
 #else

_______________________________________________
Xen-changelog mailing list
[hidden email]
http://lists.xensource.com/xen-changelog