[syslinux:firmware] efi: Update the correct copy of hdr

syslinux-bot for Matt Fleming matt.fleming at intel.com
Fri Nov 9 09:06:29 PST 2012


Commit-ID:  f01bd6bf93b0962e345593fa504ef91ef5e8dafe
Gitweb:     http://www.syslinux.org/commit/f01bd6bf93b0962e345593fa504ef91ef5e8dafe
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 11 Sep 2012 17:28:09 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 11 Sep 2012 18:21:04 +0100

efi: Update the correct copy of hdr

There are two struct linux_header variables in efi_boot(), only one of
which points to the boot params that we pass to the kernel we're
booting. Fix the initramfs code to update the correct variable,
otherwise the kernel won't know about any initramfs we've loaded.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 efi/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/efi/main.c b/efi/main.c
index f3f92f5..e31d529 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -905,8 +905,8 @@ int efi_boot_linux(void *kernel_buf, size_t kernel_size,
 			goto free_map;
 		}
 
-		hdr->ramdisk_image = (uint32_t)last;
-		hdr->ramdisk_size = irf_size;
+		bhdr->ramdisk_image = (uint32_t)last;
+		bhdr->ramdisk_size = irf_size;
 
 		/* Copy initramfs into allocated memory */
 		for (ip = initramfs->next; ip->len; ip = ip->next) {


More information about the Syslinux-commits mailing list