summaryrefslogtreecommitdiffstats
path: root/src/arch/x86/image/com32.c
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-12 12:27:02 +0200
committerSimon Rettberg2020-08-12 12:27:02 +0200
commitdf1f1c469e65156c18dd98931618a7d37c9d8691 (patch)
tree12bf4fe1a74701b5f86a696d1e28822dac055765 /src/arch/x86/image/com32.c
parentRevert "Revert "[build] Construct full version number automatically from git ... (diff)
parent[efi] Use device path to locate filesystem from which we were loaded (diff)
downloadipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.tar.gz
ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.tar.xz
ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.zip
Merge branch 'master' into openslx
Diffstat (limited to 'src/arch/x86/image/com32.c')
-rw-r--r--src/arch/x86/image/com32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/x86/image/com32.c b/src/arch/x86/image/com32.c
index 016652877..6f0e66041 100644
--- a/src/arch/x86/image/com32.c
+++ b/src/arch/x86/image/com32.c
@@ -110,7 +110,7 @@ static int com32_exec_loop ( struct image *image ) {
/* Disable interrupts */
"cli\n\t"
/* Restore stack pointer */
- "movl 24(%%esp), %%esp\n\t"
+ "movl 28(%%esp), %%esp\n\t"
/* Restore registers */
"popal\n\t" )
: