File xen3-patch-3.14 of Package drm

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

 This patch contains the differences between 3.13 and 3.14.

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

---
 drivers/gpu/drm/i915/i915_gem_stolen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -291,7 +291,7 @@ int i915_gem_init_stolen(struct drm_devi
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int bios_reserved = 0;
 
-#ifdef CONFIG_INTEL_IOMMU
+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_XEN)
 	if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) {
 		DRM_INFO("DMAR active, disabling use of stolen memory\n");
 		return 0;