aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Kraai <kraai@ftbfs.org>2009-08-24 01:30:22 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-08-24 03:54:34 -0400
commit071e13746f9ebb259987c71ea77f11e7656769a2 (patch)
treed789241c2bdfa896d9c648f300243b2b380fbfb9
parent132032274a594ee9ffb6b9c9e2e9698149a09ea9 (diff)
intel-iommu: Mark functions with __init
Mark si_domain_init and iommu_prepare_static_identity_mapping with __init, to eliminate the following warnings: WARNING: drivers/pci/built-in.o(.text+0xf1f4): Section mismatch in reference from the function si_domain_init() to the function .init.text:si_domain_work_fn() The function si_domain_init() references the function __init si_domain_work_fn(). This is often because si_domain_init lacks a __init annotation or the annotation of si_domain_work_fn is wrong. WARNING: drivers/pci/built-in.o(.text+0xe340): Section mismatch in reference from the function iommu_prepare_static_identity_mapping() to the function .init.text:si_domain_init() The function iommu_prepare_static_identity_mapping() references the function __init si_domain_init(). This is often because iommu_prepare_static_identity_mapping lacks a __init annotation or the annotation of si_domain_init is wrong. Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/pci/intel-iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 09606e9aedec..e67335ba24a3 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -2038,7 +2038,7 @@ static int __init si_domain_work_fn(unsigned long start_pfn,
2038 2038
2039} 2039}
2040 2040
2041static int si_domain_init(int hw) 2041static int __init si_domain_init(int hw)
2042{ 2042{
2043 struct dmar_drhd_unit *drhd; 2043 struct dmar_drhd_unit *drhd;
2044 struct intel_iommu *iommu; 2044 struct intel_iommu *iommu;
@@ -2167,7 +2167,7 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
2167 return 1; 2167 return 1;
2168} 2168}
2169 2169
2170static int iommu_prepare_static_identity_mapping(int hw) 2170static int __init iommu_prepare_static_identity_mapping(int hw)
2171{ 2171{
2172 struct pci_dev *pdev = NULL; 2172 struct pci_dev *pdev = NULL;
2173 int ret; 2173 int ret;