aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2009-05-26 18:45:12 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-06-05 15:49:53 -0400
commit008fe148cb0fb51d266baabe2c09997b21cf90c6 (patch)
treee1d7f7b919dd9e8c86739bf4c20a2186de2bd69a
parent93a23a7271dfb811b3adb72779054c3a24433112 (diff)
intel-iommu: Fix one last ia64 build problem in Pass Through Support
On ia64 with CONFIG_DMAR=n and CONFIG_SWIOTLB=y (as used in arch/ia64/configs/tiger_defconfig) there is still a link error with iommu_pass_through listed as an undefined symbol: arch/ia64/kernel/built-in.o: In function `pci_swiotlb_init': (.init.text+0x7f70): undefined reference to `iommu_pass_through' Fix it by #defining iommu_pass_through away in asm/iommu.h Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--arch/ia64/include/asm/iommu.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h
index 37d41ca5645a..745e095fe82e 100644
--- a/arch/ia64/include/asm/iommu.h
+++ b/arch/ia64/include/asm/iommu.h
@@ -9,7 +9,11 @@ extern void pci_iommu_shutdown(void);
9extern void no_iommu_init(void); 9extern void no_iommu_init(void);
10extern int force_iommu, no_iommu; 10extern int force_iommu, no_iommu;
11extern int iommu_detected; 11extern int iommu_detected;
12#ifdef CONFIG_DMAR
12extern int iommu_pass_through; 13extern int iommu_pass_through;
14#else
15#define iommu_pass_through (0)
16#endif
13extern void iommu_dma_init(void); 17extern void iommu_dma_init(void);
14extern void machvec_init(const char *name); 18extern void machvec_init(const char *name);
15 19