lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[191/272] powerpc/numa: Fix bug in unmap_cpu_from_node
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Anton Blanchard <anton@samba.org>

    commit 429f4d8d20b91e4a6c239f951c06a56a6ac22957 upstream.

    When converting to the new cpumask code I screwed up:

    - if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) {
    - cpu_clear(cpu, numa_cpumask_lookup_table[node]);
    + if (cpumask_test_cpu(cpu, node_to_cpumask_map[node])) {
    + cpumask_set_cpu(cpu, node_to_cpumask_map[node]);

    This was introduced in commit 25863de07af9 (powerpc/cpumask: Convert NUMA code
    to new cpumask API)

    Fix it.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/powerpc/mm/numa.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/powerpc/mm/numa.c
    +++ b/arch/powerpc/mm/numa.c
    @@ -181,7 +181,7 @@ static void unmap_cpu_from_node(unsigned
    dbg("removing cpu %lu from node %d\n", cpu, node);

    if (cpumask_test_cpu(cpu, node_to_cpumask_map[node])) {
    - cpumask_set_cpu(cpu, node_to_cpumask_map[node]);
    + cpumask_clear_cpu(cpu, node_to_cpumask_map[node]);
    } else {
    printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n",
    cpu, node);



    \
     
     \ /
      Last update: 2011-02-16 01:55    [W:4.293 / U:0.996 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site