From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Sun, 23 Sep 2012 00:01:16 +0000 (-0400)
Subject: Merge branch 'stable/late-swiotlb.v3.3' into stable/for-linus-3.7
X-Git-Tag: v3.7-rc1~33^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5f95155709cb854e96aa27969d110668cdbda9d;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'stable/late-swiotlb.v3.3' into stable/for-linus-3.7

* stable/late-swiotlb.v3.3:
  xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
  xen/swiotlb: Remove functions not needed anymore.
  xen/pcifront: Use Xen-SWIOTLB when initting if required.
  xen/swiotlb: For early initialization, return zero on success.
  xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used.
  xen/swiotlb: Move the error strings to its own function.
  xen/swiotlb: Move the nr_tbl determination in its own function.
  swiotlb: add the late swiotlb initialization function with iotlb memory
  xen/swiotlb: With more than 4GB on 64-bit, disable the native SWIOTLB.
  xen/swiotlb: Simplify the logic.

Conflicts:
	arch/x86/xen/pci-swiotlb-xen.c

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

a5f95155709cb854e96aa27969d110668cdbda9d
diff --cc arch/x86/xen/pci-swiotlb-xen.c
index 1ab4594,1608244..9695704
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@@ -8,7 -8,11 +8,14 @@@
  #include <xen/xen.h>
  #include <asm/iommu_table.h>
  
++
 +#include <asm/xen/swiotlb-xen.h>
+ #ifdef CONFIG_X86_64
+ #include <asm/iommu.h>
+ #include <asm/dma.h>
+ #endif
+ #include <linux/export.h>
++
  int xen_swiotlb __read_mostly;
  
  static struct dma_map_ops xen_swiotlb_dma_ops = {