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 12/26] x86-64, NUMA: Kill {acpi|amd}_get_nodes()
    Date
    With common numa_nodes[], common code in numa_64.c can access it
    directly. Copy directly and kill {acpi|amd}_get_nodes().

    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/acpi.h | 2 --
    arch/x86/include/asm/amd_nb.h | 1 -
    arch/x86/mm/amdtopology_64.c | 10 ----------
    arch/x86/mm/numa_64.c | 23 ++++++++++-------------
    arch/x86/mm/srat_64.c | 13 -------------
    5 files changed, 10 insertions(+), 39 deletions(-)

    diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
    index 06fb786..446a5b9 100644
    --- a/arch/x86/include/asm/acpi.h
    +++ b/arch/x86/include/asm/acpi.h
    @@ -185,8 +185,6 @@ struct bootnode;

    #ifdef CONFIG_ACPI_NUMA
    extern int acpi_numa;
    -extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start,
    - unsigned long end);
    extern int x86_acpi_numa_init(void);
    extern int acpi_scan_nodes(void);
    #define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
    diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
    index 72abf65..765966f 100644
    --- a/arch/x86/include/asm/amd_nb.h
    +++ b/arch/x86/include/asm/amd_nb.h
    @@ -21,7 +21,6 @@ extern int amd_scan_nodes(void);

    #ifdef CONFIG_NUMA_EMU
    extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes);
    -extern void amd_get_nodes(struct bootnode *nodes);
    #endif

    struct amd_northbridge {
    diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
    index 06698b1..fe93e23 100644
    --- a/arch/x86/mm/amdtopology_64.c
    +++ b/arch/x86/mm/amdtopology_64.c
    @@ -204,16 +204,6 @@ static s16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = {
    [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
    };

    -void __init amd_get_nodes(struct bootnode *physnodes)
    -{
    - int i;
    -
    - for_each_node_mask(i, mem_nodes_parsed) {
    - physnodes[i].start = numa_nodes[i].start;
    - physnodes[i].end = numa_nodes[i].end;
    - }
    -}
    -
    static int __init find_node_by_addr(unsigned long addr)
    {
    int ret = NUMA_NO_NODE;
    diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
    index a0bceaa..2d3ee2f 100644
    --- a/arch/x86/mm/numa_64.c
    +++ b/arch/x86/mm/numa_64.c
    @@ -257,21 +257,18 @@ void __init numa_emu_cmdline(char *str)
    cmdline = str;
    }

    -static int __init setup_physnodes(unsigned long start, unsigned long end,
    - int acpi, int amd)
    +static int __init setup_physnodes(unsigned long start, unsigned long end)
    {
    int ret = 0;
    int i;

    memset(physnodes, 0, sizeof(physnodes));
    -#ifdef CONFIG_ACPI_NUMA
    - if (acpi)
    - acpi_get_nodes(physnodes, start, end);
    -#endif
    -#ifdef CONFIG_AMD_NUMA
    - if (amd)
    - amd_get_nodes(physnodes);
    -#endif
    +
    + for_each_node_mask(i, mem_nodes_parsed) {
    + physnodes[i].start = numa_nodes[i].start;
    + physnodes[i].end = numa_nodes[i].end;
    + }
    +
    /*
    * Basic sanity checking on the physical node map: there may be errors
    * if the SRAT or AMD code incorrectly reported the topology or the mem=
    @@ -593,7 +590,7 @@ static int __init numa_emulation(unsigned long start_pfn,
    nodes[i].end >> PAGE_SHIFT);
    setup_node_bootmem(i, nodes[i].start, nodes[i].end);
    }
    - setup_physnodes(addr, max_addr, acpi, amd);
    + setup_physnodes(addr, max_addr);
    fake_physnodes(acpi, amd, num_nodes);
    numa_init_array();
    return 0;
    @@ -664,10 +661,10 @@ void __init initmem_init(void)
    cutoff_node(j, 0, max_pfn << PAGE_SHIFT);

    #ifdef CONFIG_NUMA_EMU
    - setup_physnodes(0, max_pfn << PAGE_SHIFT, i == 0, i == 1);
    + setup_physnodes(0, max_pfn << PAGE_SHIFT);
    if (cmdline && !numa_emulation(0, max_pfn, i == 0, i == 1))
    return;
    - setup_physnodes(0, max_pfn << PAGE_SHIFT, i == 0, i == 1);
    + setup_physnodes(0, max_pfn << PAGE_SHIFT);
    nodes_clear(node_possible_map);
    nodes_clear(node_online_map);
    #endif
    diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
    index abb17d6..d84c983 100644
    --- a/arch/x86/mm/srat_64.c
    +++ b/arch/x86/mm/srat_64.c
    @@ -323,19 +323,6 @@ static int __init nodes_cover_memory(const struct bootnode *nodes)

    void __init acpi_numa_arch_fixup(void) {}

    -#ifdef CONFIG_NUMA_EMU
    -void __init acpi_get_nodes(struct bootnode *physnodes, unsigned long start,
    - unsigned long end)
    -{
    - int i;
    -
    - for_each_node_mask(i, mem_nodes_parsed) {
    - physnodes[i].start = numa_nodes[i].start;
    - physnodes[i].end = numa_nodes[i].end;
    - }
    -}
    -#endif /* CONFIG_NUMA_EMU */
    -
    int __init x86_acpi_numa_init(void)
    {
    int ret;
    --
    1.7.1


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