Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
  dma-debug: make memory range checks more consistent
  dma-debug: warn of unmapping an invalid dma address
  dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG
  dma-debug/x86: register pci bus for dma-debug leak detection
  dma-debug: add a check dma memory leaks
  dma-debug: add checks for kernel text and rodata
  dma-debug: print stacktrace of mapping path on unmap error
  dma-debug: Documentation update
  dma-debug: x86 architecture bindings
  dma-debug: add function to dump dma mappings
  dma-debug: add checks for sync_single_sg_*
  dma-debug: add checks for sync_single_range_*
  dma-debug: add checks for sync_single_*
  dma-debug: add checking for [alloc|free]_coherent
  dma-debug: add add checking for map/unmap_sg
  dma-debug: add checking for map/unmap_page/single
  dma-debug: add core checking functions
  dma-debug: add debugfs interface
  dma-debug: add kernel command line parameters
  dma-debug: add initialization code
  ...

Fix trivial conflicts due to whitespace changes in arch/x86/kernel/pci-nommu.c

1 files changed, 2 insertions, 25 deletions

diff --git a/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h b/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
index a842cdda827b..1091ac39740c 100644
--- a/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
+++ b/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
@@ -2,18 +2,7 @@
 #define _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h
 
 extern ia64_mv_setup_t                          dig_setup;
-extern ia64_mv_dma_alloc_coherent               hwsw_alloc_coherent;
-extern ia64_mv_dma_free_coherent                hwsw_free_coherent;
-extern ia64_mv_dma_map_single_attrs             hwsw_map_single_attrs;
-extern ia64_mv_dma_unmap_single_attrs           hwsw_unmap_single_attrs;
-extern ia64_mv_dma_map_sg_attrs                 hwsw_map_sg_attrs;
-extern ia64_mv_dma_unmap_sg_attrs               hwsw_unmap_sg_attrs;
-extern ia64_mv_dma_supported                    hwsw_dma_supported;
-extern ia64_mv_dma_mapping_error                hwsw_dma_mapping_error;
-extern ia64_mv_dma_sync_single_for_cpu          hwsw_sync_single_for_cpu;
-extern ia64_mv_dma_sync_sg_for_cpu              hwsw_sync_sg_for_cpu;
-extern ia64_mv_dma_sync_single_for_device       hwsw_sync_single_for_device;
-extern ia64_mv_dma_sync_sg_for_device           hwsw_sync_sg_for_device;
+extern ia64_mv_dma_get_ops                      hwsw_dma_get_ops;
 
 /*
  * This stuff has dual use!
@@ -23,20 +12,8 @@ extern ia64_mv_dma_sync_sg_for_device		hwsw_sync_sg_for_device;
  * the macros are used directly.
  */
 #define platform_name                           "hpzx1_swiotlb"
-
 #define platform_setup                          dig_setup
 #define platform_dma_init                       machvec_noop
-#define platform_dma_alloc_coherent             hwsw_alloc_coherent
-#define platform_dma_free_coherent              hwsw_free_coherent
-#define platform_dma_map_single_attrs           hwsw_map_single_attrs
-#define platform_dma_unmap_single_attrs         hwsw_unmap_single_attrs
-#define platform_dma_map_sg_attrs               hwsw_map_sg_attrs
-#define platform_dma_unmap_sg_attrs             hwsw_unmap_sg_attrs
-#define platform_dma_supported                  hwsw_dma_supported
-#define platform_dma_mapping_error              hwsw_dma_mapping_error
-#define platform_dma_sync_single_for_cpu        hwsw_sync_single_for_cpu
-#define platform_dma_sync_sg_for_cpu            hwsw_sync_sg_for_cpu
-#define platform_dma_sync_single_for_device     hwsw_sync_single_for_device
-#define platform_dma_sync_sg_for_device         hwsw_sync_sg_for_device
+#define platform_dma_get_ops                    hwsw_dma_get_ops
 
 #endif /* _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h */