diff options
author | Andrea Arcangeli <aarcange@redhat.com> | 2012-03-21 19:34:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 20:55:00 -0400 |
commit | d71b5a73fe9af42752c4329b087f7911b35f8f79 (patch) | |
tree | 9399922a83a31a87ddfb5abe137be689580a2f9a | |
parent | b224ef856b1a5b949daff5937a9e187fe622b8f5 (diff) |
numa_emulation: fix cpumask_of_node()
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>
-rw-r--r-- | arch/x86/mm/numa_emulation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index 46db56845f18..740b0a355431 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c | |||
@@ -60,7 +60,7 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, | |||
60 | eb->nid = nid; | 60 | eb->nid = nid; |
61 | 61 | ||
62 | if (emu_nid_to_phys[nid] == NUMA_NO_NODE) | 62 | if (emu_nid_to_phys[nid] == NUMA_NO_NODE) |
63 | emu_nid_to_phys[nid] = pb->nid; | 63 | emu_nid_to_phys[nid] = nid; |
64 | 64 | ||
65 | pb->start += size; | 65 | pb->start += size; |
66 | if (pb->start >= pb->end) { | 66 | if (pb->start >= pb->end) { |