diff options
| author | Luck, Tony <tony.luck@intel.com> | 2007-05-24 13:57:40 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-06-02 00:20:07 -0400 |
| commit | 8ff6f48d99a0351bcc9ceab422042ef9d3bad9aa (patch) | |
| tree | 88f4640097f3fa004245617c2762df143ec26029 | |
| parent | cc4c24e115ca7bc2e4ec74d70bcb8fda1d1a8df8 (diff) | |
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 <tony.luck@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/numa.c | 2 | ||||
| -rw-r--r-- | include/acpi/acpi_numa.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 */ |