From: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Date: Wed, 30 Nov 2011 04:07:20 +0000 (+1100)
Subject: intel-iommu: Fix __init section missmatch of dmar_parse_rmrr_atsr_dev
X-Git-Tag: next-20111130~3^2~168
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b25d0fcf543fe3338fc75393780b31e244e7b42e;p=karo-tx-linux.git

intel-iommu: Fix __init section missmatch of dmar_parse_rmrr_atsr_dev

dmar_parse_rmrr_atsr_dev() (drivers/iommu/dmar.c) is called from
dmar_dev_scope_init() (drivers/iommu/intel-iommu.c), but
dmar_dev_scope_init() is annotated with __init, when
dmar_parse_rmrr_atsr_dev() is not, causing full section missmatch
analsysis to abort compilation.

Fix problem by adding __init annotation to dmar_parse_rmrr_atsr_dev.

Signed-off-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Allen Kay <allen.m.kay@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index e918f72da6a8..7a02a8e1cd82 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3542,7 +3542,7 @@ found:
 	return 0;
 }
 
-int dmar_parse_rmrr_atsr_dev(void)
+int __init dmar_parse_rmrr_atsr_dev(void)
 {
 	struct dmar_rmrr_unit *rmrr, *rmrr_n;
 	struct dmar_atsr_unit *atsr, *atsr_n;