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: omap-for-v3.7-rc1/fixes-cpufreq-signed~30^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5f95155709cb854e96aa27969d110668cdbda9d;p=pandora-kernel.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
Reading git-diff-tree failed