projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86-64, NUMA: Wrap acpi_numa_init() so that failure can be indicated by return value
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
setup.c
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index
6b286d8
..
c9a139c
100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-995,15
+995,15
@@
void __init setup_arch(char **cmdline_p)
/*
* Parse SRAT to discover nodes.
*/
/*
* Parse SRAT to discover nodes.
*/
- acpi = acpi_numa_init();
+ acpi =
!x86_
acpi_numa_init();
#endif
#ifdef CONFIG_AMD_NUMA
if (!acpi)
#endif
#ifdef CONFIG_AMD_NUMA
if (!acpi)
- amd = !amd_numa_init(
0, max_pfn
);
+ amd = !amd_numa_init();
#endif
#endif
- initmem_init(
0, max_pfn,
acpi, amd);
+ initmem_init(acpi, amd);
memblock_find_dma_reserve();
dma32_reserve_bootmem();
memblock_find_dma_reserve();
dma32_reserve_bootmem();
@@
-1047,9
+1047,7
@@
void __init setup_arch(char **cmdline_p)
prefill_possible_map();
prefill_possible_map();
-#ifdef CONFIG_X86_64
init_cpu_to_node();
init_cpu_to_node();
-#endif
init_apic_mappings();
ioapic_and_gsi_init();
init_apic_mappings();
ioapic_and_gsi_init();