diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index faf8d5e74b0b..ab4b7ffd526d 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -411,7 +411,7 @@ ENTRY(ret_from_fork) | |||
411 | RESTORE_REST | 411 | RESTORE_REST |
412 | 412 | ||
413 | testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? | 413 | testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? |
414 | je int_ret_from_sys_call | 414 | jz retint_restore_args |
415 | 415 | ||
416 | testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET | 416 | testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET |
417 | jnz int_ret_from_sys_call | 417 | jnz int_ret_from_sys_call |
@@ -612,8 +612,6 @@ tracesys: | |||
612 | GLOBAL(int_ret_from_sys_call) | 612 | GLOBAL(int_ret_from_sys_call) |
613 | DISABLE_INTERRUPTS(CLBR_NONE) | 613 | DISABLE_INTERRUPTS(CLBR_NONE) |
614 | TRACE_IRQS_OFF | 614 | TRACE_IRQS_OFF |
615 | testl $3,CS-ARGOFFSET(%rsp) | ||
616 | je retint_restore_args | ||
617 | movl $_TIF_ALLWORK_MASK,%edi | 615 | movl $_TIF_ALLWORK_MASK,%edi |
618 | /* edi: mask to check */ | 616 | /* edi: mask to check */ |
619 | GLOBAL(int_with_check) | 617 | GLOBAL(int_with_check) |