|
@@ -269,11 +269,14 @@ ENTRY(ret_from_fork)
|
|
|
testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
|
|
|
jz 1f
|
|
|
|
|
|
- testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
|
|
|
- jnz int_ret_from_sys_call
|
|
|
-
|
|
|
- RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET
|
|
|
- jmp ret_from_sys_call # go to the SYSRET fastpath
|
|
|
+ /*
|
|
|
+ * By the time we get here, we have no idea whether our pt_regs,
|
|
|
+ * ti flags, and ti status came from the 64-bit SYSCALL fast path,
|
|
|
+ * the slow path, or one of the ia32entry paths.
|
|
|
+ * Use int_ret_from_sys_call to return, since it can safely handle
|
|
|
+ * all of the above.
|
|
|
+ */
|
|
|
+ jmp int_ret_from_sys_call
|
|
|
|
|
|
1:
|
|
|
subq $REST_SKIP, %rsp # leave space for volatiles
|