x86, NUMA: Move *_numa_init() invocations into initmem_init()

There's no reason for these to live in setup_arch().  Move them inside
initmem_init().

- v2: x86-32 initmem_init() weren't updated breaking 32bit builds.
  Fixed.  Found by Ankita.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ankita Garg <ankita@in.ibm.com>
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>

diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index eb9ed00355a871c545cf7e61ff562ba39f105d54..97e6007e4eddf487fabe7b65815308477e4f6063 100644 (file)
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -56,7 +56,7 @@ extern unsigned long init_memory_mapping(unsigned long start,
 
 void init_memory_mapping_high(void);
 
 
 void init_memory_mapping_high(void);
 

-extern void initmem_init(int acpi, int k8);
+extern void initmem_init(void);

 extern void free_initmem(void);
 
 #endif /* !__ASSEMBLY__ */
 extern void free_initmem(void);
 
 #endif /* !__ASSEMBLY__ */

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index c9a139c3056be80f25abcae4e45bfc70d16a9a97..46e684f85b36bd98568b1296aeeb6a79d4a55768 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -719,8 +719,6 @@ early_param("reservelow", parse_reservelow);
 
 void __init setup_arch(char **cmdline_p)
 {
 
 void __init setup_arch(char **cmdline_p)
 {

-       int acpi = 0;
-       int amd = 0;

        unsigned long flags;
 
 #ifdef CONFIG_X86_32
        unsigned long flags;
 
 #ifdef CONFIG_X86_32


@@ -991,19 +989,7 @@ void __init setup_arch(char **cmdline_p)
 
        early_acpi_boot_init();
 
 
        early_acpi_boot_init();
 

-#ifdef CONFIG_ACPI_NUMA
-       /*
-        * Parse SRAT to discover nodes.
-        */
-       acpi = !x86_acpi_numa_init();
-#endif
-
-#ifdef CONFIG_AMD_NUMA
-       if (!acpi)
-               amd = !amd_numa_init();
-#endif
-
-       initmem_init(acpi, amd);
+       initmem_init();

        memblock_find_dma_reserve();
        dma32_reserve_bootmem();
 
        memblock_find_dma_reserve();
        dma32_reserve_bootmem();
 

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 16adb6665603cf9e90dc6cb1f5aac4dc9d29ecab..5d43fa5141c651524da1537c1423af02546a3dd6 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -644,7 +644,7 @@ void __init find_low_pfn_range(void)
 }
 
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 }
 
 #ifndef CONFIG_NEED_MULTIPLE_NODES

-void __init initmem_init(int acpi, int k8)
+void __init initmem_init(void)

 {
 #ifdef CONFIG_HIGHMEM
        highstart_pfn = highend_pfn = max_pfn;
 {
 #ifdef CONFIG_HIGHMEM
        highstart_pfn = highend_pfn = max_pfn;

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 04cc027e543763285221d26b3b59e9fb5fba9a37..4f1f461fc1e92dec34600f154e589dc01bc0df81 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -603,7 +603,7 @@ kernel_physical_mapping_init(unsigned long start,
 }
 
 #ifndef CONFIG_NUMA
 }
 
 #ifndef CONFIG_NUMA

-void __init initmem_init(int acpi, int k8)
+void __init initmem_init(void)

 {
        memblock_x86_register_active_regions(0, 0, max_pfn);
        init_memory_mapping_high();
 {
        memblock_x86_register_active_regions(0, 0, max_pfn);
        init_memory_mapping_high();

diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index 3249b374732f253d14ce329cc5b0cf50aa729418..bde3906420df74559bd49a52aad171216be52108 100644 (file)
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -352,7 +352,7 @@ static void init_remap_allocator(int nid)
                (ulong) node_remap_end_vaddr[nid]);
 }
 
                (ulong) node_remap_end_vaddr[nid]);
 }
 

-void __init initmem_init(int acpi, int k8)
+void __init initmem_init(void)

 {
        int nid;
        long kva_target_pfn;
 {
        int nid;
        long kva_target_pfn;

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index a083f515f0042677dfeb35486f6983cad4f48c8c..656b0cffda6305e14ce57251ce8217ed1a9e2265 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/nodemask.h>
 #include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/nodemask.h>
 #include <linux/sched.h>

+#include <linux/acpi.h>

 
 #include <asm/e820.h>
 #include <asm/proto.h>
 
 #include <asm/e820.h>
 #include <asm/proto.h>


@@ -579,10 +580,23 @@ static int __init numa_emulation(unsigned long start_pfn,
 }
 #endif /* CONFIG_NUMA_EMU */
 
 }
 #endif /* CONFIG_NUMA_EMU */
 

-void __init initmem_init(int acpi, int amd)
+void __init initmem_init(void)

 {
 {

+       int acpi = 0, amd = 0;

        int i;
 
        int i;
 

+#ifdef CONFIG_ACPI_NUMA
+       /*
+        * Parse SRAT to discover nodes.
+        */
+       acpi = !x86_acpi_numa_init();
+#endif
+
+#ifdef CONFIG_AMD_NUMA
+       if (!acpi)
+               amd = !amd_numa_init();
+#endif
+

        nodes_clear(node_possible_map);
        nodes_clear(node_online_map);
 
        nodes_clear(node_possible_map);
        nodes_clear(node_online_map);