From 069ffa6afb3ea07fa5b330d5701eecfe8e96d8c3 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 6 Jun 2008 18:54:26 -0700 Subject: [PATCH] --- yaml --- r: 99745 b: refs/heads/master c: c3ff01672a23fabb40d4b80ff25a845582fd07c2 h: refs/heads/master i: 99743: d42542a51639e162c9cf232f078be56841e765d8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/srat_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 40e25633f83f..550c2b9a51aa 100644 --- 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 index 32d8b1142938..e9d91720a40f 100644 --- 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);