From: Luck, Tony Date: Thu, 24 May 2007 20:57:40 +0000 (-0700) Subject: ACPI: Section mismatch ... acpi_map_pxm_to_node X-Git-Tag: v2.6.22-rc4~14^2~1 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8ff6f48d99a0351bcc9ceab422042ef9d3bad9aa;p=karo-tx-linux.git ACPI: Section mismatch ... acpi_map_pxm_to_node Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node() is defined with attribute __cpuinit, but is called by "normal" kernel functions acpi_getnode() and acpi_map_cpu2node(). Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on which this routine operates from __cpuinitdata to regular memory, so this routine can also move out of init space. Signed-off-by: Tony Luck Signed-off-by: Len Brown --- diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index a2efae8a4c4e..0c9f15c54e8c 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -59,7 +59,7 @@ int node_to_pxm(int node) return node_to_pxm_map[node]; } -int __cpuinit acpi_map_pxm_to_node(int pxm) +int acpi_map_pxm_to_node(int pxm) { int node = pxm_to_node_map[pxm]; diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index b62cd36ff324..e2fcee2b340d 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h @@ -13,7 +13,7 @@ extern int pxm_to_node(int); extern int node_to_pxm(int); -extern int __cpuinit acpi_map_pxm_to_node(int); +extern int acpi_map_pxm_to_node(int); extern void __cpuinit acpi_unmap_pxm_to_node(int); #endif /* CONFIG_ACPI_NUMA */