Skip to content

Commit

Permalink
x86: only support sparsemem
Browse files Browse the repository at this point in the history
sparsemem is only one supported, so could remove FLAT_NODE_MEM related,
that is only needed !SPARSEMEM

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Reviewed-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jan 30, 2008
1 parent 70edcd7 commit fc7250a
Showing 1 changed file with 0 additions and 32 deletions.
32 changes: 0 additions & 32 deletions arch/x86/mm/numa_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,35 +240,6 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
node_set_online(nodeid);
}

#ifdef CONFIG_FLAT_NODE_MEM_MAP
/* Initialize final allocator for a zone */
static void __init flat_setup_node_zones(int nodeid)
{
unsigned long start_pfn, end_pfn, memmapsize, limit;

start_pfn = node_start_pfn(nodeid);
end_pfn = node_end_pfn(nodeid);

Dprintk(KERN_INFO "Setting up memmap for node %d %lx-%lx\n",
nodeid, start_pfn, end_pfn);

/*
* Try to allocate mem_map at end to not fill up precious <4GB
* memory.
*/
memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
limit = end_pfn << PAGE_SHIFT;

NODE_DATA(nodeid)->node_mem_map =
__alloc_bootmem_core(NODE_DATA(nodeid)->bdata,
memmapsize, SMP_CACHE_BYTES,
round_down(limit - memmapsize, PAGE_SIZE),
limit);
}
#else
#define flat_setup_node_zones(i) do {} while (0)
#endif

/*
* There are unfortunately some poorly designed mainboards around that
* only connect memory to a single CPU. This breaks the 1:1 cpu->node
Expand Down Expand Up @@ -600,9 +571,6 @@ void __init paging_init(void)
sparse_memory_present_with_active_regions(MAX_NUMNODES);
sparse_init();

for_each_online_node(i)
flat_setup_node_zones(i);

free_area_init_nodes(max_zone_pfns);
}

Expand Down

0 comments on commit fc7250a

Please sign in to comment.