[PATCH] x86-64: fix for mem= on NUMA systems

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c
index 0ec22c11cca422f33b045d093124c2aaa5e25840..0825e37fd9d8488d0c99f070d39fb8df84f9f3cb 100644 (file)
--- a/arch/x86_64/mm/k8topology.c
+++ b/arch/x86_64/mm/k8topology.c
@@ -100,8 +100,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
                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;