Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / boot / compressed / eboot.c

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 65f0b24f60db3d1dfc1699d91117fbdef76d4998..926c2cc4facc9fdec21a28c73c3297545ae6e3a0 100644 (file)
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -767,7 +767,7 @@ static efi_status_t setup_e820(struct boot_params *params,
                m |= (u64)efi->efi_memmap_hi << 32;
 #endif
 
-               d = (efi_memory_desc_t *)(m + (i * efi->efi_memdesc_size));
+               d = efi_early_memdesc_ptr(m, efi->efi_memdesc_size, i);
                switch (d->type) {
                case EFI_RESERVED_TYPE:
                case EFI_RUNTIME_SERVICES_CODE: