diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2013-11-26 10:04:48 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2013-11-26 10:04:48 -0800 |
| commit | 6194d6a0ea7eb68a3d55311818d4488faa18663f (patch) | |
| tree | 974b907d3685448c5914f08aa432303b3ef45a79 /core/isolinux.asm | |
| parent | 4c3c85630e83ed4522444c707abea6bc3db8a40b (diff) | |
| parent | 870b84dd8714ddfccc9288025331423efa6d76b7 (diff) | |
| download | syslinux-6194d6a0ea7eb68a3d55311818d4488faa18663f.tar.gz | |
Merge remote-tracking branch 'origin/elflink' into firmware
Resolved Conflicts:
com32/lib/syslinux/disk.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/isolinux.asm')
| -rw-r--r-- | core/isolinux.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index bd4e9556..c4db4133 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -420,7 +420,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K) call getlinsec pop eax pop cx - mov dx,cx + movzx edx,cx pop bp pop bx |