diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-01-29 14:01:07 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-01-29 15:11:28 +0000 |
| commit | bf20364b582c383b4927f898de213b1cc0981a80 (patch) | |
| tree | 5412e0c14cf74df0d7ea29ff182e23d3281aac3e /core/isolinux.asm | |
| parent | afd985f6eec18a0f66a8fc55f9c5e3431128310f (diff) | |
| parent | a2d79191b501276026a0a16ec2fa664630a20476 (diff) | |
| download | syslinux-bf20364b582c383b4927f898de213b1cc0981a80.tar.gz | |
Merge tag 'syslinux-5.01' into firmwaresyslinux-6.00-pre4
Conflicts:
Makefile
NEWS
com32/cmenu/Makefile
com32/elflink/ldlinux/Makefile
com32/gfxboot/Makefile
com32/gpllib/Makefile
com32/include/sys/module.h
com32/lib/Makefile
com32/lib/sys/module/elf_module.c
com32/menu/Makefile
com32/rosh/Makefile
com32/samples/Makefile
core/init.c
mk/elf.mk
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/isolinux.asm')
| -rw-r--r-- | core/isolinux.asm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index 673134b0..b54beb4a 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -433,7 +433,9 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K) .ok: xor bx,bx push bp + push eax call getlinsec + pop eax pop cx mov dx,cx pop bp @@ -441,6 +443,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K) shl cx,SECTOR_SHIFT - 4 add bx,cx + add eax,edx sub bp,dx jnz .more |