[librm] Discard argument as part of return from real_call()

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/include/librm.h b/src/arch/x86/include/librm.h
index 44d931ea01bdd642af206640d8d0609facbd9aeb..379e085a2a51214185de9b5ed9e62b34e306ff04 100644 (file)
--- a/src/arch/x86/include/librm.h
+++ b/src/arch/x86/include/librm.h
@@ -192,7 +192,6 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
 #define REAL_CODE( asm_code_str )                      \
        "push $1f\n\t"                                  \
        "call real_call\n\t"                            \
-       "addl $4, %%esp\n\t"                            \
        TEXT16_CODE ( "\n1:\n\t"                        \
                      asm_code_str                      \
                      "\n\t"                            \

diff --git a/src/arch/x86/transitions/librm.S b/src/arch/x86/transitions/librm.S
index bf79637a8974faf0130c19c2781d75a94dd997b0..a3b78c7843b3c352ed81847e9a67d326213235cd 100644 (file)
--- a/src/arch/x86/transitions/librm.S
+++ b/src/arch/x86/transitions/librm.S
@@ -518,7 +518,7 @@ rc_rmode:
 rc_pmode:
        /* Restore registers and return */
        popal
-       ret
+       ret     $4
 
 
        /* Function vector, used because "call xx(%sp)" is not a valid