From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sat, 7 Jun 2008 01:54:26 +0000 (-0700)
Subject: x86: fix boot failure with 64GB+ system with numa 32-bit
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c3ff01672a23fabb40d4b80ff25a845582fd07c2;p=deliverable%2Flinux.git

x86: fix boot failure with 64GB+ system with numa 32-bit

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/srat_32.c b/arch/x86/kernel/srat_32.c
index 32d8b1142938..e9d91720a40f 100644
--- a/arch/x86/kernel/srat_32.c
+++ b/arch/x86/kernel/srat_32.c
@@ -251,7 +251,7 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)
  
 	for_each_online_node(nid) {
 		unsigned long start = node_start_pfn[nid];
-		unsigned long end = node_end_pfn[nid];
+		unsigned long end = min(node_end_pfn[nid], max_pfn);
 
 		memory_present(nid, start, end);
 		node_remap_size[nid] = node_memmap_size_bytes(nid, start, end);