diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-06-07 15:12:07 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-07 15:12:07 -0700 |
| commit | 4afa3c9082377c6bd96b1bde412f03ba9fa003ac (patch) | |
| tree | f6c4d016cedd0f5bc43589df95aba1bca4b4ed91 /core/pxelinux.asm | |
| parent | 98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff) | |
| parent | c0d18deeee22f3466fd863d64b432660965ec66e (diff) | |
| download | syslinux-4afa3c9082377c6bd96b1bde412f03ba9fa003ac.tar.gz | |
Merge remote-tracking branch 'mfleming/elflink-dot-zero' into elflink
Resolved Conflicts:
com32/elflink/ldlinux/execute.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/pxelinux.asm')
| -rw-r--r-- | core/pxelinux.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm index c7d38894..ef9c7238 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -89,6 +89,7 @@ LocalBootType resw 1 ; Local boot return code DHCPMagic resb 1 ; PXELINUX magic flags section .text16 + global StackBuf StackBuf equ STACK_TOP-44 ; Base of stack if we use our own StackHome equ StackBuf |