File xen3-patch-3.4 of Package drm

From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Linux: 3.4
Patch-mainline: 3.4

 This patch contains the differences between 3.3 and 3.4.

Automatically created from "patch-3.4" by xen-port-patches.py
Acked-by: jbeulich@suse.com

3.12/arch/x86/kernel/tboot.c
3.12/drivers/acpi/acpica/hwesleep.c
3.12/drivers/acpi/acpica/hwsleep.c
3.12/drivers/acpi/osl.c
3.12/drivers/xen/acpi.c
3.12/include/linux/acpi.h
3.12/include/xen/acpi.h

---
 drivers/gpu/drm/i915/i915_gem_gtt.c  |    3 +--
 drivers/gpu/drm/ttm/ttm_page_alloc.c |    6 ++----
 include/drm/intel-gtt.h              |    2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)

--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -55,7 +55,7 @@ static int sanitize_enable_ppgtt(struct
 	if (enable_ppgtt == 2 && HAS_PPGTT(dev))
 		return 2;
 
-#ifdef CONFIG_INTEL_IOMMU
+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_XEN)
 	/* Disable ppgtt on SNB if VT-d is on. */
 	if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped) {
 		DRM_INFO("Disabling PPGTT because VT-d is on\n");
@@ -1177,7 +1177,6 @@ static void ppgtt_unbind_vma(struct i915
 			     true);
 }
 
-extern int intel_iommu_gfx_mapped;
 /* Certain Gen5 chipsets require require idling the GPU before
  * unmapping anything from the GTT when VT-d is enabled.
  */
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -512,8 +512,7 @@ static int ttm_alloc_new_pages(struct li
 			r = xen_limit_pages_to_max_mfn(p, 0, 32);
 			if (r) {
 				__free_page(p);
-				printk(KERN_ERR TTM_PFX
-				       "Cannot restrict page (%d).", r);
+				pr_err("Cannot restrict page (%d)", r);
 				p = NULL;
 			} else if (gfp_flags & __GFP_ZERO)
 				clear_page(page_address(p));
@@ -765,8 +764,7 @@ static int ttm_get_pages(struct page **p
 
 				if (rc) {
 					__free_page(p);
-					printk(KERN_ERR TTM_PFX
-					       "Unable to restrict page (%d).",
+					pr_err("Unable to restrict page (%d)",
 					       rc);
 					return rc;
 				}
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -27,6 +27,8 @@ void intel_gtt_clear_range(unsigned int
 
 #ifdef CONFIG_INTEL_IOMMU
 extern int intel_iommu_gfx_mapped;
+#elif defined(CONFIG_XEN)
+#define intel_iommu_gfx_mapped 1
 #endif
 
 #endif