diff --git a/service/ptos/head/arch/amd64/frameasm.h b/service/ptos/head/arch/amd64/frameasm.h
index 5ff5d6d..a316ad0 100644
--- a/service/ptos/head/arch/amd64/frameasm.h
+++ b/service/ptos/head/arch/amd64/frameasm.h
@@ -85,11 +85,11 @@
  * pushed onto the stack.
  */
 #define INTR_EXIT()         ;\
-    _POP_FRAME()            ;\
+    _TRAP_POPALL()          ;\
     testb $3, 8(%rsp)       ;\
     jz 1f                   ;\
     lfence                  ;\
     swapgs                  ;\
-1:
+1:  iretq
 
 #endif  /* !_MACHINE_FRAMEASM_H_ */