ia64: Fix allnoconfig section mismatch for ioc_init/ioc_iommu_info

aegl · torvalds · commit 2edd73a42e0e · 2018-08-22T14:12:47.000-07:00
This has been broken for an embarassingly long time (since v4.4).

Just needs a couple of __init tags on functions to make the sections
match up.

Signed-off-by: Tony Luck &lt;tony.luck@intel.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
@@ -1805,7 +1805,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {
 	{ SX2000_IOC_ID, "sx2000", NULL },
 };
 
-static void ioc_init(unsigned long hpa, struct ioc *ioc)
+static void __init ioc_init(unsigned long hpa, struct ioc *ioc)
 {
 	struct ioc_iommu *info;
 
@@ -2002,7 +2002,7 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
 #endif
 }
 
-static void acpi_sba_ioc_add(struct ioc *ioc)
+static void __init acpi_sba_ioc_add(struct ioc *ioc)
 {
 	acpi_handle handle = ioc->handle;
 	acpi_status status;

Original file line number	Diff line number	Diff line change
`@@ -1805,7 +1805,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {`
`1805`	`1805`	`{ SX2000_IOC_ID, "sx2000", NULL },`
`1806`	`1806`	`};`
`1807`	`1807`
`1808`		`-static void ioc_init(unsigned long hpa, struct ioc *ioc)`
	`1808`	`+static void __init ioc_init(unsigned long hpa, struct ioc *ioc)`
`1809`	`1809`	`{`
`1810`	`1810`	`struct ioc_iommu *info;`
`1811`	`1811`
`@@ -2002,7 +2002,7 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)`
`2002`	`2002`	`#endif`
`2003`	`2003`	`}`
`2004`	`2004`
`2005`		`-static void acpi_sba_ioc_add(struct ioc *ioc)`
	`2005`	`+static void __init acpi_sba_ioc_add(struct ioc *ioc)`
`2006`	`2006`	`{`
`2007`	`2007`	`acpi_handle handle = ioc->handle;`
`2008`	`2008`	`acpi_status status;`