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/init.inc | |
| 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/init.inc')
| -rw-r--r-- | core/init.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/init.inc b/core/init.inc index 995f9825..b74cf30b 100644 --- a/core/init.inc +++ b/core/init.inc @@ -47,17 +47,17 @@ common_init: ; ; The code to decompress the PM code and initialize other segments. ; - extern _lzo1x_decompress_asm_fast + extern _lzo1x_decompress_asm_fast_safe section .textnr bits 32 pm_decompress: - push 0 ; Space for decompressed size + push __pm_code_len + 16 ; Space for decompressed size push esp ; Pointer to previous word push __pm_code_start ; Target address push dword [lzo_data_size] ; Compressed size push dword __pm_code_lma - call _lzo1x_decompress_asm_fast + call _lzo1x_decompress_asm_fast_safe add esp,16 pop RM_EAX ; Decompressed size |