X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fx86%2Fkernel%2Fsetup.c;h=c9a139c3056be80f25abcae4e45bfc70d16a9a97;hb=a9aec56afac238e4ed3980bd10b22121b83866dd;hp=6b286d879a2506a46e22890bc7048b3c5b62b2dd;hpb=02ac81a812fe0575a8475a93bdc22fb291ebad91;p=cascardo%2Flinux.git

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 6b286d879a25..c9a139c3056b 100644
--- 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.
 	 */
-	acpi = acpi_numa_init();
+	acpi = !x86_acpi_numa_init();
 #endif
 
 #ifdef CONFIG_AMD_NUMA
 	if (!acpi)
-		amd = !amd_numa_init(0, max_pfn);
+		amd = !amd_numa_init();
 #endif
 
-	initmem_init(0, max_pfn, acpi, amd);
+	initmem_init(acpi, amd);
 	memblock_find_dma_reserve();
 	dma32_reserve_bootmem();
 
@@ -1047,9 +1047,7 @@ void __init setup_arch(char **cmdline_p)
 
 	prefill_possible_map();
 
-#ifdef CONFIG_X86_64
 	init_cpu_to_node();
-#endif
 
 	init_apic_mappings();
 	ioapic_and_gsi_init();