Merge tag 'efi_updates_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / firmware / efi / libstub / x86-stub.c

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 3672539..f14c4ff 100644 (file)
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -715,8 +715,11 @@ unsigned long efi_main(efi_handle_t handle,
            (IS_ENABLED(CONFIG_X86_32) && buffer_end > KERNEL_IMAGE_SIZE)    ||
            (IS_ENABLED(CONFIG_X86_64) && buffer_end > MAXMEM_X86_64_4LEVEL) ||
            (image_offset == 0)) {
+               extern char _bss[];
+
                status = efi_relocate_kernel(&bzimage_addr,
-                                            hdr->init_size, hdr->init_size,
+                                            (unsigned long)_bss - bzimage_addr,
+                                            hdr->init_size,
                                             hdr->pref_address,
                                             hdr->kernel_alignment,
                                             LOAD_PHYSICAL_ADDR);