From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Mar 2009 20:41:00 +0000 (-0700)
Subject: Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=712b0006bf3a9ed0b14a56c3291975e582127766;p=linux-2.6-omap-h63xx.git

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
---

712b0006bf3a9ed0b14a56c3291975e582127766
diff --cc arch/x86/kernel/pci-nommu.c
index 8b02a3936d4,fe50214db87..c6d703b3932
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@@ -78,12 -79,12 +79,12 @@@ static void nommu_free_coherent(struct 
  	free_pages((unsigned long)vaddr, get_order(size));
  }
  
- struct dma_mapping_ops nommu_dma_ops = {
+ struct dma_map_ops nommu_dma_ops = {
 -	.alloc_coherent = dma_generic_alloc_coherent,
 -	.free_coherent = nommu_free_coherent,
 -	.map_sg = nommu_map_sg,
 -	.map_page = nommu_map_page,
 -	.is_phys = 1,
 +	.alloc_coherent	= dma_generic_alloc_coherent,
 +	.free_coherent	= nommu_free_coherent,
- 	.map_single	= nommu_map_single,
 +	.map_sg		= nommu_map_sg,
++	.map_page	= nommu_map_page,
 +	.is_phys	= 1,
  };
  
  void __init no_iommu_init(void)