Home » Mailing list archives » linux-kernel » 2008 » January » 18

[PATCH] x86_64: only support sparsemem fix

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Yinghai Lu <Yinghai.Lu@...>
To: Ingo Molnar <mingo@...>
Cc: Christoph Lameter <clameter@...>, Andrew Morton <akpm@...>, Thomas Gleixner <tglx@...>, LKML <linux-kernel@...>
Subject: [PATCH] x86_64: only support sparsemem fix
Date: Friday, January 18, 2008 - 6:48 pm

[PATCH] x86_64: only support sparsemem fix

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>

--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -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
@@ -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);
 }
 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] x86_64: cleanup setup_node_zones called by paging_init, Yinghai Lu, (Tue Jan 8, 11:34 pm)
Re: [PATCH] x86_64: cleanup setup_node_zones called by pagin..., Christoph Lameter, (Wed Jan 9, 1:49 pm)
[PATCH] x86_64: cleanup setup_node_zones called by paging_in..., Yinghai Lu, (Wed Jan 9, 2:30 pm)
Re: [PATCH] x86_64: cleanup setup_node_zones called by pagin..., Christoph Lameter, (Wed Jan 9, 3:19 pm)
Re: [PATCH] x86_64: cleanup setup_node_zones called by pagin..., Yinghai Lu, (Sat Jan 12, 7:26 am)
Re: [PATCH] x86_64: cleanup setup_node_zones called by pagin..., Christoph Lameter, (Mon Jan 14, 3:48 pm)
[PATCH] x86_64: only support sparsemem fix, Yinghai Lu, (Fri Jan 18, 6:48 pm)
[PATCH] x86_64: cleanup setup_node_zones called by paging_in..., Yinghai Lu, (Wed Jan 9, 4:34 pm)
[PATCH] x86_64: cleanup setup_node_zones called by paging_in..., Yinghai Lu, (Thu Jan 10, 3:27 pm)
Re: [PATCH] x86_64: cleanup setup_node_zones called by pagin..., Dave Hansen, (Wed Jan 9, 3:11 pm)