From ebef1cd107b7034056309bf49f92a2b9e92b9fe0 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 4 Sep 2009 16:15:37 -0700 Subject: [PATCH] core: pxe: need to save/restore es around EFI CSM hack Unlike in the Syslinux 3.x branch, we need to save/restore es around the PXE EFI CSM localboot hack. This really should be moved to C, anyway, at the same time USE_PXE_PROVIDED_STACK is finally killed off. Signed-off-by: H. Peter Anvin --- core/pxelinux.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 1ebd2b5..93ef8b4 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -176,6 +176,7 @@ _start1: ; if we want to reset", so that chainloading other NBPs will work. ; efi_csm_workaround: + push es les bp,[InitStack] ; GS:SP -> original stack les bx,[es:bp+44] ; Return address cmp word [es:bx],18CDh ; Already pointing to INT 18h? @@ -229,6 +230,7 @@ efi_csm_workaround: rep movsb .skip: + pop es ; Restore CS == DS == ES section .data16 alignz 4 -- 2.7.4