From def32f463722b27aa6fa3dc369f4557a215c0ee2 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Wed, 21 Mar 2012 16:34:16 -0700
Subject: [PATCH] --- yaml --- r: 292670 b: refs/heads/master c:
 d71b5a73fe9af42752c4329b087f7911b35f8f79 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/mm/numa_emulation.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bcbbb84000db..4fcf32c5ec8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b224ef856b1a5b949daff5937a9e187fe622b8f5
+refs/heads/master: d71b5a73fe9af42752c4329b087f7911b35f8f79
diff --git a/trunk/arch/x86/mm/numa_emulation.c b/trunk/arch/x86/mm/numa_emulation.c
index 46db56845f18..740b0a355431 100644
--- a/trunk/arch/x86/mm/numa_emulation.c
+++ b/trunk/arch/x86/mm/numa_emulation.c
@@ -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) {