summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-07-10 05:17:50 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 09:01:35 +0200
commit3d43ecd286e442792f2e899e6e06eb23ab3d99f6 (patch)
tree0349f5a02886ce6709fa3a0c4eb16909f78859eb /arch/x86/kernel/e820.c
parentx86, acpi: merge __acpi_map_table (diff)
downloadlinux-3d43ecd286e442792f2e899e6e06eb23ab3d99f6.tar.xz
linux-3d43ecd286e442792f2e899e6e06eb23ab3d99f6.zip
x86: make e820_end return end_of_ram again for 64bit
even on 64bit systems with less than 4G RAM, we can now use fixmap to handle acpi SIT near end of ram. change e820_end to e820_end_of_ram again? or e820_ram_pfn? Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r--arch/x86/kernel/e820.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 66fd5bd78318..9836a079cfd9 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1066,10 +1066,8 @@ 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)