[PATCH] dmar: section mismatch cleanup

[PATCH] dmar: section mismatch cleanup

[Henrik Kretzschmar]

This patch fixes a section mismatch.

WARNING: drivers/pci/built-in.o(.text+0x182f5): Section mismatch in
reference from the function dmar_ir_support() to the variable
.init.data:acpi_slot_detected
The function dmar_ir_support() references
the variable __initdata acpi_slot_detected.
This is often because dmar_ir_support lacks a __initdata
annotation or the annotation of acpi_slot_detected is wrong.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
 drivers/pci/dmar.c          |    2 +-
 include/linux/intel-iommu.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 83aae47..ffe22bc 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -1456,7 +1456,7 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 /*
  * Check interrupt remapping support in DMAR table description.
  */
-int dmar_ir_support(void)
+int __init dmar_ir_support(void)
 {
 	struct acpi_table_dmar *dmar;
 	dmar = (struct acpi_table_dmar *)dmar_tbl;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 9310c69..f51a553 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -361,6 +361,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
-extern int dmar_ir_support(void);
+extern int dmar_ir_support(void) __init;
 
 #endif
-- 
1.6.3.3

Re: [PATCH] dmar: section mismatch cleanup

[Chris Wright]

* Henrik Kretzschmar (henne@nachtwindheim.de) wrote:
> This patch fixes a section mismatch.
> 
> WARNING: drivers/pci/built-in.o(.text+0x182f5): Section mismatch in
> reference from the function dmar_ir_support() to the variable
> .init.data:acpi_slot_detected
> The function dmar_ir_support() references
> the variable __initdata acpi_slot_detected.
> This is often because dmar_ir_support lacks a __initdata
> annotation or the annotation of acpi_slot_detected is wrong.
> 
> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>

Acked-by: Chris Wright <chrisw@sous-sol.org>

> -int dmar_ir_support(void)
> +int __init dmar_ir_support(void)

> -extern int dmar_ir_support(void);
> +extern int dmar_ir_support(void) __init;

Nit, but prerfer to see:

-extern int dmar_ir_support(void);
+extern int __init dmar_ir_support(void);

thanks,
-chris