Merge remote-tracking branch 'efi/chainsaw' into x86/efi

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 5f2ecaf3f9d8609ccdc7a56e4d232fd13bdd8dcc..fff986da623990cf74b649f5288f4c22df81ccf9 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -351,24 +351,25 @@ static void __init do_add_efi_memmap(void)
 
 int __init efi_memblock_x86_reserve_range(void)
 {
+       struct efi_info *e = &boot_params.efi_info;
        unsigned long pmap;
 
 #ifdef CONFIG_X86_32
        /* Can't handle data above 4GB at this time */
-       if (boot_params.efi_info.efi_memmap_hi) {
+       if (e->efi_memmap_hi) {
                pr_err("Memory map is above 4GB, disabling EFI.\n");
                return -EINVAL;
        }
-       pmap = boot_params.efi_info.efi_memmap;
+       pmap =  e->efi_memmap;
 #else
-       pmap = (boot_params.efi_info.efi_memmap |
-               ((__u64)boot_params.efi_info.efi_memmap_hi<<32));
+       pmap = (e->efi_memmap | ((__u64)e->efi_memmap_hi << 32));
 #endif
-       memmap.phys_map = (void *)pmap;
-       memmap.nr_map = boot_params.efi_info.efi_memmap_size /
-               boot_params.efi_info.efi_memdesc_size;
-       memmap.desc_version = boot_params.efi_info.efi_memdesc_version;
-       memmap.desc_size = boot_params.efi_info.efi_memdesc_size;
+       memmap.phys_map         = (void *)pmap;
+       memmap.nr_map           = e->efi_memmap_size /
+                                 e->efi_memdesc_size;
+       memmap.desc_size        = e->efi_memdesc_size;
+       memmap.desc_version     = e->efi_memdesc_version;
+
        memblock_reserve(pmap, memmap.nr_map * memmap.desc_size);
 
        return 0;