[<prev] [next>] [day] [month] [year] [list]
Message-Id: <4a1c70f8189932f73c@agluck-desktop.sc.intel.com>
Date: Tue, 26 May 2009 15:45:12 -0700
From: "Luck, Tony" <tony.luck@...el.com>
To: David Woodhouse <dwmw2@...radead.org>,
Fenghua Yu <fenghua.yu@...el.com>
Cc: <linux-kernel@...r.kernel.org>, <iommu@...ts.linux-foundation.org>
Subject: [PATCH] Fix one last ia64 build problem in Intel IOMMU 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@...el.com>
---
This fix for the iommu tree/branch that feeds to linux-next
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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists