summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFenghua Yu <fenghua.yu@intel.com>2009-04-30 17:57:11 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-05-01 16:44:47 +0100
commitaed5d5f4c5ea5da01a774e42cff08c4b4fa59072 (patch)
tree974b4c844a54cbeba858bd34714b01e43ca8e13d /arch
parent4ed0d3e6c64cfd9ba4ceb2099b10d1cf8ece4320 (diff)
downloadlinux-stable-aed5d5f4c5ea5da01a774e42cff08c4b4fa59072.tar.gz
linux-stable-aed5d5f4c5ea5da01a774e42cff08c4b4fa59072.tar.bz2
linux-stable-aed5d5f4c5ea5da01a774e42cff08c4b4fa59072.zip
Fix !CONFIG_DMAR build failure introduced by Intel IOMMU Pass Through Support
This updated patch should fix the compiling errors and remove the extern iommu_pass_through from drivers/pci/intel-iommu.c file. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/pci-dma.c2
-rw-r--r--arch/x86/kernel/pci-dma.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index eb987386f691..ecdde25d0d18 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -32,6 +32,8 @@ int force_iommu __read_mostly = 1;
int force_iommu __read_mostly;
#endif
+int iommu_pass_through;
+
/* Dummy device used for NULL arguments (normally ISA). Better would
be probably a smaller DMA mask, but this is bug-to-bug compatible
to i386. */
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 8cad0d854242..049005e82178 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -32,6 +32,8 @@ int no_iommu __read_mostly;
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly = 0;
+int iommu_pass_through;
+
dma_addr_t bad_dma_address __read_mostly = 0;
EXPORT_SYMBOL(bad_dma_address);
@@ -160,8 +162,6 @@ again:
return page_address(page);
}
-extern int iommu_pass_through;
-
/*
* See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter
* documentation.