1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 3182908b7e6c..7326078eaa7a 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -398,11 +398,10 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
          * little bit simple
          */
         efi_map_sz = efi_get_runtime_map_size();
-        efi_map_sz = ALIGN(efi_map_sz, 16);
         params_cmdline_sz = sizeof(struct boot_params) + cmdline_len +
                                 MAX_ELFCOREHDR_STR_LEN;
         params_cmdline_sz = ALIGN(params_cmdline_sz, 16);
-        kbuf.bufsz = params_cmdline_sz + efi_map_sz +
+        kbuf.bufsz = params_cmdline_sz + ALIGN(efi_map_sz, 16) +
                                 sizeof(struct setup_data) +
                                 sizeof(struct efi_setup_data);
 
@@ -410,7 +409,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
         if (!params)
                 return ERR_PTR(-ENOMEM);
         efi_map_offset = params_cmdline_sz;
-        efi_setup_data_offset = efi_map_offset + efi_map_sz;
+        efi_setup_data_offset = efi_map_offset + ALIGN(efi_map_sz, 16);
 
         /* Copy setup header onto bootparams. Documentation/x86/boot.txt */
         setup_header_size = 0x0202 + kernel[0x0201] - setup_hdr_offset;