]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
numa_emulation: fix cpumask_of_node()
authorAndrea Arcangeli <aarcange@redhat.com>
Wed, 21 Mar 2012 23:34:16 +0000 (16:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Mar 2012 00:55:00 +0000 (17:55 -0700)
Without this fix the cpumask_of_node() for a fake=numa=2 is:

    cpumask 0 ff
    cpumask 1 ff

with the fix it's correct and it's set to:

    cpumask 0 55
    cpumask 1 aa

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/mm/numa_emulation.c

index 46db56845f180bcc890195e52052daa686680518..740b0a3554316679e4fd69e11fb20a308dab471f 100644 (file)
@@ -60,7 +60,7 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei,
        eb->nid = nid;
 
        if (emu_nid_to_phys[nid] == NUMA_NO_NODE)
-               emu_nid_to_phys[nid] = pb->nid;
+               emu_nid_to_phys[nid] = nid;
 
        pb->start += size;
        if (pb->start >= pb->end) {