From: Andi Kleen <ak@muc.de>

Fix bug that caused oops with mem= on certain NUMA configurations

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/x86_64/mm/k8topology.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/x86_64/mm/k8topology.c~x86-64-fix-for-mem=-on-numa-systems arch/x86_64/mm/k8topology.c
--- 25/arch/x86_64/mm/k8topology.c~x86-64-fix-for-mem=-on-numa-systems	Tue Sep 14 17:03:46 2004
+++ 25-akpm/arch/x86_64/mm/k8topology.c	Tue Sep 14 17:03:46 2004
@@ -100,8 +100,8 @@ int __init k8_scan_nodes(unsigned long s
 		limit <<= 24; 
 		limit |= (1<<24)-1;
 
-		if (limit > end_pfn_map << PAGE_SHIFT) 
-			limit = end_pfn_map << PAGE_SHIFT; 
+		if (limit > end_pfn << PAGE_SHIFT)
+			limit = end_pfn << PAGE_SHIFT;
 		if (limit <= base)
 			continue; 
 			
_