From: Yasunori Goto This is to fix unnecessary __meminit definition. These are exported for kernel modules. I compiled on ia64/x86-64 with memory hotplug on/off. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton --- drivers/acpi/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/acpi/numa.c~fix-unnecesary-meminit drivers/acpi/numa.c --- a/drivers/acpi/numa.c~fix-unnecesary-meminit +++ a/drivers/acpi/numa.c @@ -228,7 +228,7 @@ int __init acpi_numa_init(void) return 0; } -int __meminit acpi_get_pxm(acpi_handle h) +int acpi_get_pxm(acpi_handle h) { unsigned long pxm; acpi_status status; @@ -246,7 +246,7 @@ int __meminit acpi_get_pxm(acpi_handle h } EXPORT_SYMBOL(acpi_get_pxm); -int __meminit acpi_get_node(acpi_handle *handle) +int acpi_get_node(acpi_handle *handle) { int pxm, node = -1; _