Merge branch 'rmobile-fixes-for-linus' into rmobile-latest

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 66cd0b8096ca..c92424ca1a55 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1186,10 +1186,11 @@ static void gen6_cleanup(void)
 /* Certain Gen5 chipsets require require idling the GPU before
  * unmapping anything from the GTT when VT-d is enabled.
  */
-extern int intel_iommu_gfx_mapped;
 static inline int needs_idle_maps(void)
 {
+#ifdef CONFIG_INTEL_IOMMU
         const unsigned short gpu_devid = intel_private.pcidev->device;
+        extern int intel_iommu_gfx_mapped;
 
         /* Query intel_iommu to see if we need the workaround. Presumably that
          * was loaded first.
@@ -1198,7 +1199,7 @@ static inline int needs_idle_maps(void)
              gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&
              intel_iommu_gfx_mapped)
                 return 1;
-
+#endif
         return 0;
 }
 
@@ -1236,7 +1237,7 @@ static int i9xx_setup(void)
                 intel_private.gtt_bus_addr = reg_addr + gtt_offset;
         }
 
-        if (needs_idle_maps());
+        if (needs_idle_maps())
                 intel_private.base.do_idle_maps = 1;
 
         intel_i9xx_setup_flush();