aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-07-09 06:01:14 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 06:30:13 -0400
commitc22d4c1885130db9c07f6441ab461208a1ba16b2 (patch)
tree90064ad9e38ec6d66314f48e0ef536b36f6da38c /arch/x86/kernel/e820.c
parent183fe065652dbd64953afa9f389327e23e97967f (diff)
x86: make e820_end return max ram type only for 32 bit
to avoid warning from find_low_pfn_range for high pages size etc Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r--arch/x86/kernel/e820.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 2e08619a9c5c..292ebc7fe4d0 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1066,6 +1066,11 @@ unsigned long __init e820_end(void)
1066 struct e820entry *ei = &e820.map[i]; 1066 struct e820entry *ei = &e820.map[i];
1067 unsigned long end_pfn; 1067 unsigned long end_pfn;
1068 1068
1069#ifdef CONFIG_X86_32
1070 if (ei->type != E820_RAM)
1071 continue;
1072#endif
1073
1069 end_pfn = (ei->addr + ei->size) >> PAGE_SHIFT; 1074 end_pfn = (ei->addr + ei->size) >> PAGE_SHIFT;
1070 if (end_pfn > last_pfn) 1075 if (end_pfn > last_pfn)
1071 last_pfn = end_pfn; 1076 last_pfn = end_pfn;