[ALPHA] DISCONTIGMEM fix

From Ivan Kokshaysky <ink@jurassic.park.msu.ru>.

[ALPHA] DISCONTIGMEM fix
From Ivan Kokshaysky <ink@jurassic.park.msu.ru>.
6a9f6b3f · Richard Henderson · Richard Henderson · 802e66fd · 6a9f6b3f
Commit 6a9f6b3f authored Apr 02, 2004 by Richard Henderson Committed by Richard Henderson Apr 02, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

arch/alpha/mm/numa.c arch/alpha/mm/numa.c +4 -2

No files found.
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -158,8 +158,10 @@ setup_memory_node(int nid, void *kernel_end)
 	if (!nid && (node_max_pfn < end_kernel_pfn || node_min_pfn > start_kernel_pfn))
 		panic("kernel loaded out of ram");

-	/* Zone start phys-addr must be 2^(MAX_ORDER-1) aligned */
-	node_min_pfn = (node_min_pfn + ((1UL << (MAX_ORDER-1))-1)) & ~((1UL << (MAX_ORDER-1))-1);
+	/* Zone start phys-addr must be 2^(MAX_ORDER-1) aligned.
+	   Note that we round this down, not up - node memory
+	   has much larger alignment than 8Mb, so it's safe. */
+	node_min_pfn &= ~((1UL << (MAX_ORDER-1))-1);

 	/* We need to know how many physically contiguous pages
 	   we'll need for the bootmap.  */