lkml.org 
[lkml]   [2011]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/26] x86-64, NUMA: Move *_numa_init() invocations into initmem_init()
    Date
    There's no reason for these to live in setup_arch().  Move them inside
    initmem_init().

    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>
    ---
    arch/x86/include/asm/page_types.h | 2 +-
    arch/x86/kernel/setup.c | 16 +---------------
    arch/x86/mm/init_64.c | 2 +-
    arch/x86/mm/numa_64.c | 16 +++++++++++++++-
    4 files changed, 18 insertions(+), 18 deletions(-)

    diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
    index 95892a1..c157986 100644
    --- a/arch/x86/include/asm/page_types.h
    +++ b/arch/x86/include/asm/page_types.h
    @@ -48,7 +48,7 @@ extern unsigned long max_pfn_mapped;
    extern unsigned long init_memory_mapping(unsigned long start,
    unsigned long end);

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

    #endif /* !__ASSEMBLY__ */
    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index f69d838..9907b45 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -704,8 +704,6 @@ static u64 __init get_max_mapped(void)

    void __init setup_arch(char **cmdline_p)
    {
    - int acpi = 0;
    - int amd = 0;
    unsigned long flags;

    #ifdef CONFIG_X86_32
    @@ -984,19 +982,7 @@ void __init setup_arch(char **cmdline_p)

    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();

    diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
    index 26e4e73..2f333d4 100644
    --- a/arch/x86/mm/init_64.c
    +++ b/arch/x86/mm/init_64.c
    @@ -612,7 +612,7 @@ kernel_physical_mapping_init(unsigned long start,
    }

    #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);
    }
    diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
    index 85561d1..4105728 100644
    --- 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/acpi.h>

    #include <asm/e820.h>
    #include <asm/proto.h>
    @@ -578,10 +579,23 @@ static int __init numa_emulation(unsigned long start_pfn,
    }
    #endif /* CONFIG_NUMA_EMU */

    -void __init initmem_init(int acpi, int amd)
    +void __init initmem_init(void)
    {
    + int acpi = 0, amd = 0;
    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);

    --
    1.7.1


    \
     
     \ /
      Last update: 2011-02-12 18:15    [W:0.023 / U:31.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site