---

yaml --- r: 99745 b: refs/heads/master c: c3ff016 h: refs/heads/master i: 99743: d42542a v: v3
git-mirror · Jun 10, 2008 · 069ffa6 · 069ffa6
1 parent 6e5a67f
commit 069ffa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9043f007963f4039befa3c31f47173f74a0b1c70
+refs/heads/master: c3ff01672a23fabb40d4b80ff25a845582fd07c2
diff --git a/trunk/arch/x86/kernel/srat_32.c b/trunk/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);