[tip:x86/mm] x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit
From: tip-bot for Pekka Enberg
Date: Fri Nov 18 2011 - 18:26:13 EST
Commit-ID: ece838b6257412647197c072fe59dfc6615df144
Gitweb: http://git.kernel.org/tip/ece838b6257412647197c072fe59dfc6615df144
Author: Pekka Enberg <penberg@xxxxxxxxxx>
AuthorDate: Tue, 1 Nov 2011 15:58:20 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 11 Nov 2011 10:22:50 +0100
x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit
64-bit has no highmem so max_low_pfn is always the same as
'max_pfn'.
Acked-by: Tejun Heo <tj@xxxxxxxxxx>
Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1320155902-10424-5-git-send-email-penberg@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/mm/init_64.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a9214e6..f6b1f08 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -623,7 +623,7 @@ static void __init zone_sizes_init(void)
#ifdef CONFIG_ZONE_DMA32
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
#endif
- max_zone_pfns[ZONE_NORMAL] = max_pfn;
+ max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
free_area_init_nodes(max_zone_pfns);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/