The patch titled
x86_64: Make the NUMA hash function nodemap allocation dynamic and remove NODEMAPSIZE
has been added to the -mm tree. Its filename is
x86_64-make-the-numa-hash-function-nodemap-allocation-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: Make the NUMA hash function nodemap allocation dynamic and remove NODEMAPSIZE
From: Amul Shah <amul.shah@xxxxxxxxxx>
Updated patch to fix a bug that Andi Kleen found for platforms that
don't support NUMA (or "numa=off").
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Rohit Seth <rohitseth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/e820.c | 3 ++-
arch/x86_64/kernel/setup.c | 3 ++-
arch/x86_64/mm/numa.c | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff -puN arch/x86_64/kernel/e820.c~x86_64-make-the-numa-hash-function-nodemap-allocation-fix arch/x86_64/kernel/e820.c
--- a/arch/x86_64/kernel/e820.c~x86_64-make-the-numa-hash-function-nodemap-allocation-fix
+++ a/arch/x86_64/kernel/e820.c
@@ -83,12 +83,13 @@ static inline int bad_addr(unsigned long
return 1;
}
+#ifdef CONFIG_NUMA
/* NUMA memory to node map */
if (last >= nodemap_addr && addr < nodemap_addr + nodemap_size) {
*addrp = nodemap_addr + nodemap_size;
return 1;
}
-
+#endif
/* XXX ramdisk image here? */
return 0;
}
diff -puN arch/x86_64/kernel/setup.c~x86_64-make-the-numa-hash-function-nodemap-allocation-fix arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup.c~x86_64-make-the-numa-hash-function-nodemap-allocation-fix
+++ a/arch/x86_64/kernel/setup.c
@@ -444,10 +444,11 @@ void __init setup_arch(char **cmdline_p)
/* reserve ebda region */
if (ebda_addr)
reserve_bootmem_generic(ebda_addr, ebda_size);
-
+#ifdef CONFIG_NUMA
/* reserve nodemap region */
if (nodemap_addr)
reserve_bootmem_generic(nodemap_addr, nodemap_size);
+#endif
#ifdef CONFIG_SMP
/*
diff -puN arch/x86_64/mm/numa.c~x86_64-make-the-numa-hash-function-nodemap-allocation-fix arch/x86_64/mm/numa.c
--- a/arch/x86_64/mm/numa.c~x86_64-make-the-numa-hash-function-nodemap-allocation-fix
+++ a/arch/x86_64/mm/numa.c
@@ -345,6 +345,7 @@ void __init numa_initmem_init(unsigned l
end_pfn << PAGE_SHIFT);
/* setup dummy node covering all memory */
memnode_shift = 63;
+ memnodemap = memnode.embedded_map;
memnodemap[0] = 0;
nodes_clear(node_online_map);
node_set_online(0);
_
Patches currently in -mm which might be from amul.shah@xxxxxxxxxx are
x86_64-make-the-numa-hash-function-nodemap-allocation.patch
x86_64-make-the-numa-hash-function-nodemap-allocation-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
