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>

diff --cc arch/x86/xen/pci-swiotlb-xen.c
index 1ab45941502d6ca71238ca2f33897dd3e75b496e,1608244756de2bbf9645287a0c9c41adbf688e21..969570491c3964d0023dc82a231ff683ee88f735
--- 1/arch/x86/xen/pci-swiotlb-xen.c
--- 2/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 = {

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/xen/swiotlb-xen.c
Simple merge