diff --git a/[refs] b/[refs] index af9e54649594..45e7e00dc775 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f34fa82b19581affffb14f8ad9bdad9b5ab4daf5 +refs/heads/master: 3d43ecd286e442792f2e899e6e06eb23ab3d99f6 diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c index 66fd5bd78318..9836a079cfd9 100644 --- a/trunk/arch/x86/kernel/e820.c +++ b/trunk/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)