summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-07-09 03:01:14 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-09 12:30:13 +0200
commitc22d4c1885130db9c07f6441ab461208a1ba16b2 (patch)
tree90064ad9e38ec6d66314f48e0ef536b36f6da38c /arch/x86/kernel/e820.c
parent183fe065652dbd64953afa9f389327e23e97967f (diff)
downloadop-kernel-dev-c22d4c1885130db9c07f6441ab461208a1ba16b2.zip
op-kernel-dev-c22d4c1885130db9c07f6441ab461208a1ba16b2.tar.gz
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 2e08619..292ebc7 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1066,6 +1066,11 @@ unsigned long __init e820_end(void)
struct e820entry *ei = &e820.map[i];
unsigned long end_pfn;
+#ifdef CONFIG_X86_32
+ if (ei->type != E820_RAM)
+ continue;
+#endif
+
end_pfn = (ei->addr + ei->size) >> PAGE_SHIFT;
if (end_pfn > last_pfn)
last_pfn = end_pfn;
OpenPOWER on IntegriCloud