1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c	Thu Feb 16 16:31:22 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c	Thu Feb 16 16:31:52 2006 +0100
     1.3 @@ -27,11 +27,8 @@
     1.4  #include <asm/uaccess.h>
     1.5  #include <xen/interface/memory.h>
     1.6  
     1.7 -#if defined(CONFIG_SWIOTLB)
     1.8 -extern void swiotlb_init(void);
     1.9  int swiotlb;
    1.10  EXPORT_SYMBOL(swiotlb);
    1.11 -#endif
    1.12  
    1.13  #define OFFSET(val,align) ((unsigned long)((val) & ( (align) - 1)))
    1.14  

     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Thu Feb 16 16:31:22 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Thu Feb 16 16:31:52 2006 +0100
     2.3 @@ -58,10 +58,6 @@ EXPORT_SYMBOL(dma_ops);
     2.4  
     2.5  extern unsigned long *contiguous_bitmap;
     2.6  
     2.7 -#if defined(CONFIG_SWIOTLB)
     2.8 -extern void swiotlb_init(void);
     2.9 -#endif
    2.10 -
    2.11  static unsigned long dma_reserve __initdata;
    2.12  
    2.13  DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);

     3.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h	Thu Feb 16 16:31:22 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h	Thu Feb 16 16:31:52 2006 +0100
     3.3 @@ -32,6 +32,7 @@ extern dma_addr_t swiotlb_map_page(struc
     3.4  extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address,
     3.5                                 size_t size, enum dma_data_direction direction);
     3.6  extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
     3.7 +extern void swiotlb_init(void);
     3.8  
     3.9  #ifdef CONFIG_SWIOTLB
    3.10  extern int swiotlb;