summaryrefslogtreecommitdiff
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2018-07-06 09:08:01 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-03 17:00:46 -0700
commit6ecd10b1aa2298de70dc25ded68feb1b12555538 (patch)
tree89c40af59bcdad7efc4f233603ff9f6153b3959a /arch/x86/mm
parent127cd4e23323f23ca2fe39abb8310e312af2f88f (diff)
downloadlinux-exynos-6ecd10b1aa2298de70dc25ded68feb1b12555538.tar.gz
linux-exynos-6ecd10b1aa2298de70dc25ded68feb1b12555538.tar.bz2
linux-exynos-6ecd10b1aa2298de70dc25ded68feb1b12555538.zip
x86/numa_emulation: Fix emulated-to-physical node mapping
[ Upstream commit 3b6c62f363a19ce82bf378187ab97c9dc01e3927 ] Without this change the distance table calculation for emulated nodes may use the wrong numa node and report an incorrect distance. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/153089328103.27680.14778434392225818887.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/numa_emulation.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index 34a2a3bfde9c..22cbad56acab 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -61,7 +61,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] = nid;
+ emu_nid_to_phys[nid] = pb->nid;
pb->start += size;
if (pb->start >= pb->end) {