diff options
| author | Luck, Tony <tony.luck@intel.com> | 2009-05-26 15:45:12 -0700 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-05 20:49:53 +0100 |
| commit | 008fe148cb0fb51d266baabe2c09997b21cf90c6 (patch) | |
| tree | e1d7f7b919dd9e8c86739bf4c20a2186de2bd69a /arch | |
| parent | 93a23a7271dfb811b3adb72779054c3a24433112 (diff) | |
| download | op-kernel-dev-008fe148cb0fb51d266baabe2c09997b21cf90c6.zip op-kernel-dev-008fe148cb0fb51d266baabe2c09997b21cf90c6.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/iommu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h index 37d41ca..745e095 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); extern void no_iommu_init(void); extern int force_iommu, no_iommu; extern int iommu_detected; +#ifdef CONFIG_DMAR extern int iommu_pass_through; +#else +#define iommu_pass_through (0) +#endif extern void iommu_dma_init(void); extern void machvec_init(const char *name); |
