aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-02-16 06:13:06 -0500
committerTejun Heo <tj@kernel.org>2011-02-16 06:13:06 -0500
commit940fed2e79a15cf0d006c860d7811adbe5c19882 (patch)
tree3a98a59f28445430ff03061c6b2566038c4c63e0 /arch/x86/kernel/setup.c
parent86ef4dbf1f736bb1a4d567e043e3dd81b8b7860c (diff)
x86-64, NUMA: Unify {acpi|amd}_{numa_init|scan_nodes}() arguments and return values
The functions used during NUMA initialization - *_numa_init() and *_scan_nodes() - have different arguments and return values. Unify them such that they all take no argument and return 0 on success and -errno on failure. This is in preparation for further NUMA init cleanups. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Brian Gerst <brgerst@gmail.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Shaohui Zheng <shaohui.zheng@intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 756d640723f9..96810a3c6003 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -995,12 +995,12 @@ void __init setup_arch(char **cmdline_p)
995 /* 995 /*
996 * Parse SRAT to discover nodes. 996 * Parse SRAT to discover nodes.
997 */ 997 */
998 acpi = acpi_numa_init(); 998 acpi = !acpi_numa_init();
999#endif 999#endif
1000 1000
1001#ifdef CONFIG_AMD_NUMA 1001#ifdef CONFIG_AMD_NUMA
1002 if (!acpi) 1002 if (!acpi)
1003 amd = !amd_numa_init(0, max_pfn); 1003 amd = !amd_numa_init();
1004#endif 1004#endif
1005 1005
1006 initmem_init(acpi, amd); 1006 initmem_init(acpi, amd);