lkml.org 
[lkml]   [2007]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/6] x86: fix cpu_to_node references (v2)
    Fix four instances where cpu_to_node is referenced
    by array instead of via the cpu_to_node macro. This
    is preparation to moving it to the per_cpu data area.

    Signed-off-by: Mike Travis <travis@sgi.com>
    ---
    arch/x86_64/kernel/vsyscall.c | 2 +-
    arch/x86_64/mm/numa.c | 4 ++--
    arch/x86_64/mm/srat.c | 4 ++--
    3 files changed, 5 insertions(+), 5 deletions(-)

    --- a/arch/x86_64/kernel/vsyscall.c
    +++ b/arch/x86_64/kernel/vsyscall.c
    @@ -283,7 +283,7 @@
    unsigned long *d;
    unsigned long node = 0;
    #ifdef CONFIG_NUMA
    - node = cpu_to_node[cpu];
    + node = cpu_to_node(cpu);
    #endif
    if (cpu_has(&cpu_data[cpu], X86_FEATURE_RDTSCP))
    write_rdtscp_aux((node << 12) | cpu);
    --- a/arch/x86_64/mm/numa.c
    +++ b/arch/x86_64/mm/numa.c
    @@ -264,7 +264,7 @@
    We round robin the existing nodes. */
    rr = first_node(node_online_map);
    for (i = 0; i < NR_CPUS; i++) {
    - if (cpu_to_node[i] != NUMA_NO_NODE)
    + if (cpu_to_node(i) != NUMA_NO_NODE)
    continue;
    numa_set_node(i, rr);
    rr = next_node(rr, node_online_map);
    @@ -546,7 +546,7 @@
    void __cpuinit numa_set_node(int cpu, int node)
    {
    cpu_pda(cpu)->nodenumber = node;
    - cpu_to_node[cpu] = node;
    + cpu_to_node(cpu) = node;
    }

    unsigned long __init numa_free_all_bootmem(void)
    --- a/arch/x86_64/mm/srat.c
    +++ b/arch/x86_64/mm/srat.c
    @@ -431,9 +431,9 @@
    setup_node_bootmem(i, nodes[i].start, nodes[i].end);

    for (i = 0; i < NR_CPUS; i++) {
    - if (cpu_to_node[i] == NUMA_NO_NODE)
    + if (cpu_to_node(i) == NUMA_NO_NODE)
    continue;
    - if (!node_isset(cpu_to_node[i], node_possible_map))
    + if (!node_isset(cpu_to_node(i), node_possible_map))
    numa_set_node(i, NUMA_NO_NODE);
    }
    numa_init_array();
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-25 00:33    [W:0.021 / U:0.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site