diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
| commit | 10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch) | |
| tree | d8ee3bfc6e55e739e0f135cd6d945955c670dd46 /core/callback.inc | |
| parent | 35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff) | |
| parent | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff) | |
| download | syslinux-6.00-pre3.tar.gz | |
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts:
Makefile
com32/elflink/ldlinux/Makefile
com32/lib/sys/module/elf_module.c
core/cleanup.c
core/comboot.inc
core/conio.c
core/fs/fs.c
core/init.c
core/mem/free.c
core/mem/malloc.c
core/timer.inc
diag/geodsp/Makefile
extlinux/main.c
mk/embedded.mk
modules/Makefile
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/callback.inc')
| -rw-r--r-- | core/callback.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/callback.inc b/core/callback.inc index d98d8008..454b4522 100644 --- a/core/callback.inc +++ b/core/callback.inc @@ -37,12 +37,12 @@ ; - Return segment (== real mode cs == 0) ; - Return flags ; - global core_farcall + global core_farcall:function hidden core_farcall: mov eax,[esp+1*4] ; CS:IP jmp core_syscall - global core_intcall + global core_intcall:function hidden core_intcall: movzx eax,byte [esp+1*4] ; INT number mov eax,[eax*4] ; Get CS:IP from low memory @@ -142,7 +142,7 @@ core_syscall: ; followed by the return CS:IP and the CS:IP of the target function. ; The value of IF is copied from the calling routine. ; - global core_cfarcall + global core_cfarcall:function hidden core_cfarcall: pushfd ; Save IF among other things... push ebx |