[syslinux:master] load_linux: correct a type

syslinux-bot for Scot Doyle lkml14 at scotdoyle.com
Sat Feb 14 11:09:34 PST 2015


Commit-ID:  83aad4f69065509ba5b1c080edccfed316a4cff0
Gitweb:     http://www.syslinux.org/commit/83aad4f69065509ba5b1c080edccfed316a4cff0
Author:     Scot Doyle <lkml14 at scotdoyle.com>
AuthorDate: Sat, 7 Feb 2015 13:52:05 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Sat, 14 Feb 2015 14:05:48 -0500

load_linux: correct a type

Correct base's type to match its initialization from prot_mode_base and
passage to syslinux_memmap_find(). Tested with extlinux.

Signed-off-by: Scot Doyle <lkml14 at scotdoyle.com>
Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

---
 com32/lib/syslinux/load_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
index 06ae2a9..ac73729 100644
--- a/com32/lib/syslinux/load_linux.c
+++ b/com32/lib/syslinux/load_linux.c
@@ -155,8 +155,8 @@ int bios_boot_linux(void *kernel_buf, size_t kernel_size,
 		    char *cmdline)
 {
     struct linux_header hdr, *whdr;
-    size_t real_mode_size, prot_mode_size, base;
-    addr_t real_mode_base, prot_mode_base, prot_mode_max;
+    size_t real_mode_size, prot_mode_size;
+    addr_t real_mode_base, prot_mode_base, prot_mode_max, base;
     addr_t irf_size;
     size_t cmdline_size, cmdline_offset;
     struct setup_data *sdp;


More information about the Syslinux-commits mailing list