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 32d8b1142938e5999516c7599096468ee7c2136d..e9d91720a40f1600ce6a9b5aa2457a2edef64837 100644 (file)
--- 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);