Index: UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S
===================================================================
--- UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S	(revision 16098)
+++ UefiCpuPkg/Library/CpuExceptionHandlerLib/Ia32/ExceptionHandlerAsm.S	(working copy)
@@ -578,7 +578,7 @@
     pushl   -8(%esp)      # save EIP in new location
     pushl   -8(%esp)      # save EFLAGS in new location
     popfl                 # restore EFLAGS
-    retf                  # far return
+    lret                  # far return
 
 DoIret:
     iretl