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/diskstart.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/diskstart.inc')
| -rw-r--r-- | core/diskstart.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/diskstart.inc b/core/diskstart.inc index 603a6db2..875b4093 100644 --- a/core/diskstart.inc +++ b/core/diskstart.inc @@ -92,7 +92,7 @@ BannerPtr dw syslinux_banner - LDLINUX_SYS ; Base directory name and subvolume, if applicable. ; %define HAVE_CURRENTDIRNAME - global CurrentDirName, SubvolName + global CurrentDirName:data hidden, SubvolName:data hidden CurrentDirName times CURRENTDIR_MAX db 0 SubvolName times SUBVOL_MAX db 0 @@ -232,7 +232,7 @@ verify_checksum: ; ; This routine assumes CS == DS. ; - global getlinsec + global getlinsec:function hidden getlinsec: pushad add eax,[Hidden] ; Add partition offset |