2 files changed, 11 insertions, 9 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e725ea01569e..d393f841ff5a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -110,6 +110,7 @@ config DMI
 
 config EFI
         bool
+        select UCS2_STRING
         default y
 
 config SCHED_OMIT_FRAME_POINTER
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index b55d174e5034..6b85db0a7ccc 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -453,24 +453,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;