[Xen-changelog] Clean up swiotlb_init() decls.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c53a9a3be3f7da446d9df81d0845f373c54ce501
# Parent  b32cad91439048581c42a8a3824eff2151f8a75c
Clean up swiotlb_init() decls.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r b32cad914390 -r c53a9a3be3f7 
linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c   Thu Feb 16 15:31:22 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c   Thu Feb 16 15:31:52 2006
@@ -27,11 +27,8 @@
 #include <asm/uaccess.h>
 #include <xen/interface/memory.h>
 
-#if defined(CONFIG_SWIOTLB)
-extern void swiotlb_init(void);
 int swiotlb;
 EXPORT_SYMBOL(swiotlb);
-#endif
 
 #define OFFSET(val,align) ((unsigned long)((val) & ( (align) - 1)))
 
diff -r b32cad914390 -r c53a9a3be3f7 
linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c    Thu Feb 16 15:31:22 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c    Thu Feb 16 15:31:52 2006
@@ -57,10 +57,6 @@
 EXPORT_SYMBOL(dma_ops);
 
 extern unsigned long *contiguous_bitmap;
-
-#if defined(CONFIG_SWIOTLB)
-extern void swiotlb_init(void);
-#endif
 
 static unsigned long dma_reserve __initdata;
 
diff -r b32cad914390 -r c53a9a3be3f7 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h      Thu Feb 
16 15:31:22 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h      Thu Feb 
16 15:31:52 2006
@@ -32,6 +32,7 @@
 extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address,
                                size_t size, enum dma_data_direction direction);
 extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
+extern void swiotlb_init(void);
 
 #ifdef CONFIG_SWIOTLB
 extern int swiotlb;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog