aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/acpi.h
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
commita9aec56afac238e4ed3980bd10b22121b83866dd (patch)
tree77ef26c3361ebb54cbb08897c0ac2763e2c5edbe /arch/x86/include/asm/acpi.h
parent940fed2e79a15cf0d006c860d7811adbe5c19882 (diff)
x86-64, NUMA: Wrap acpi_numa_init() so that failure can be indicated by return value
Because of the way ACPI tables are parsed, the generic acpi_numa_init() couldn't return failure when error was detected by arch hooks. Instead, the failure state was recorded and later arch dependent init hook - acpi_scan_nodes() - would fail. Wrap acpi_numa_init() with x86_acpi_numa_init() so that failure can be indicated as return value immediately. 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/include/asm/acpi.h')
-rw-r--r--arch/x86/include/asm/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 4e5dff9e0b39..06fb7865eff2 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -187,6 +187,7 @@ struct bootnode;
187extern int acpi_numa; 187extern int acpi_numa;
188extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start, 188extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start,
189 unsigned long end); 189 unsigned long end);
190extern int x86_acpi_numa_init(void);
190extern int acpi_scan_nodes(void); 191extern int acpi_scan_nodes(void);
191#define NR_NODE_MEMBLKS (MAX_NUMNODES*2) 192#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
192 193