The patch titled
x86_64: sparsemem does not need node_mem_map
has been removed from the -mm tree. Its filename is
x86_64-sparsemem-does-not-need-node_mem_map.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Andy Whitcroft <apw@xxxxxxxxxxxx>
Seems we are trying to init the node_mem_map when we don't need to, for
example when SPARSEMEM is enabled. This causes the error below during
compilation. Use CONFIG_FLAT_NODE_MEM_MAP to gate allocation and init.
arch/x86_64/mm/numa.c: In function `setup_node_zones':
arch/x86_64/mm/numa.c:191: error: structure has no member
named `node_mem_map'
Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxx>
Acked-by: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/mm/numa.c | 2 ++
1 files changed, 2 insertions(+)
diff -puN arch/x86_64/mm/numa.c~x86_64-sparsemem-does-not-need-node_mem_map arch/x86_64/mm/numa.c
--- devel/arch/x86_64/mm/numa.c~x86_64-sparsemem-does-not-need-node_mem_map 2006-04-22 02:34:57.000000000 -0700
+++ devel-akpm/arch/x86_64/mm/numa.c 2006-04-22 02:34:57.000000000 -0700
@@ -188,11 +188,13 @@ void __init setup_node_zones(int nodeid)
memory. */
memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
limit = end_pfn << PAGE_SHIFT;
+#ifdef CONFIG_FLAT_NODE_MEM_MAP
NODE_DATA(nodeid)->node_mem_map =
__alloc_bootmem_core(NODE_DATA(nodeid)->bdata,
memmapsize, SMP_CACHE_BYTES,
round_down(limit - memmapsize, PAGE_SIZE),
limit);
+#endif
size_zones(zones, holes, start_pfn, end_pfn);
free_area_init_node(nodeid, NODE_DATA(nodeid), zones,
_
Patches currently in -mm which might be from apw@xxxxxxxxxxxx are
origin.patch
pg_uncached-is-ia64-only.patch
squash-duplicate-page_to_pfn-and-pfn_to_page.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
