diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-06 21:54:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-10 05:31:59 -0400 |
commit | c3ff01672a23fabb40d4b80ff25a845582fd07c2 (patch) | |
tree | 276a4eb58c272c5a15d262df368b311509b42034 /arch/x86/kernel/srat_32.c | |
parent | 9043f007963f4039befa3c31f47173f74a0b1c70 (diff) |
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>
Diffstat (limited to 'arch/x86/kernel/srat_32.c')
-rw-r--r-- | arch/x86/kernel/srat_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
251 | 251 | ||
252 | for_each_online_node(nid) { | 252 | for_each_online_node(nid) { |
253 | unsigned long start = node_start_pfn[nid]; | 253 | unsigned long start = node_start_pfn[nid]; |
254 | unsigned long end = node_end_pfn[nid]; | 254 | unsigned long end = min(node_end_pfn[nid], max_pfn); |
255 | 255 | ||
256 | memory_present(nid, start, end); | 256 | memory_present(nid, start, end); |
257 | node_remap_size[nid] = node_memmap_size_bytes(nid, start, end); | 257 | node_remap_size[nid] = node_memmap_size_bytes(nid, start, end); |