[PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu

[Joerg Roedel <joerg.roedel@amd.com>]

Not sure if this is fixed already. I stumbled over it while
compile-testing merges in the IOMMU tree.

>From 7d8438f41b3cfbb1094030d7cf5d06da0fd16308 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Fri, 11 Nov 2011 14:42:53 +0100
Subject: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu

With v3.2-rc1 the following build error occurs when Intel
IOMMU is off and Intel-GTT is on:

ERROR: "intel_iommu_gfx_mapped" [drivers/char/agp/intel-gtt.ko] undefined!

This patch fixes that.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 drivers/char/agp/intel-gtt.c |    2 +-
 include/linux/intel-iommu.h  |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 66cd0b8..bfe5133 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -22,6 +22,7 @@
 #include <linux/pagemap.h>
 #include <linux/agp_backend.h>
 #include <linux/delay.h>
+#include <linux/intel-iommu.h>
 #include <asm/smp.h>
 #include "agp.h"
 #include "intel-agp.h"
@@ -1186,7 +1187,6 @@ 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)
 {
 	const unsigned short gpu_devid = intel_private.pcidev->device;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index e6ca56d..651cc08 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -363,4 +363,10 @@ extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
 extern int dmar_ir_support(void);
 
+#ifdef CONFIG_INTEL_IOMMU
+extern int intel_iommu_gfx_mapped;
+#else
+#define intel_iommu_gfx_mapped	1
+#endif /* CONFIG_INTEL_IOMMU */
+
 #endif
-- 
1.7.5.4


-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632