diff options
| author |   Fenghua Yu <fenghua.yu@intel.com> | 2009-04-30 17:57:11 -0700 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2009-05-01 16:44:47 +0100 |
| commit | aed5d5f4c5ea5da01a774e42cff08c4b4fa59072 (patch) | |
| tree | 974b4c844a54cbeba858bd34714b01e43ca8e13d /arch/x86/kernel/pci-dma.c | |
| parent | Intel IOMMU Pass Through Support (diff) | |
| download | linux-dev-aed5d5f4c5ea5da01a774e42cff08c4b4fa59072.tar.xz linux-dev-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/x86/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
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; /* 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. |