aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma.c
diff options
context:
space:
mode:
authorFenghua Yu <fenghua.yu@intel.com>2009-04-30 20:57:11 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-05-01 11:44:47 -0400
commitaed5d5f4c5ea5da01a774e42cff08c4b4fa59072 (patch)
tree974b4c844a54cbeba858bd34714b01e43ca8e13d /arch/x86/kernel/pci-dma.c
parent4ed0d3e6c64cfd9ba4ceb2099b10d1cf8ece4320 (diff)
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/x86/kernel/pci-dma.c')
-rw-r--r--arch/x86/kernel/pci-dma.c4
1 files changed, 2 insertions, 2 deletions
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;
32/* Set this to 1 if there is a HW IOMMU in the system */ 32/* Set this to 1 if there is a HW IOMMU in the system */
33int iommu_detected __read_mostly = 0; 33int iommu_detected __read_mostly = 0;
34 34
35int iommu_pass_through;
36
35dma_addr_t bad_dma_address __read_mostly = 0; 37dma_addr_t bad_dma_address __read_mostly = 0;
36EXPORT_SYMBOL(bad_dma_address); 38EXPORT_SYMBOL(bad_dma_address);
37 39
@@ -160,8 +162,6 @@ again:
160 return page_address(page); 162 return page_address(page);
161} 163}
162 164
163extern int iommu_pass_through;
164
165/* 165/*
166 * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter 166 * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter
167 * documentation. 167 * documentation.