diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 8410e26f4183..a169225869cc 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -402,16 +402,12 @@ sysret_careful: | |||
402 | sysret_signal: | 402 | sysret_signal: |
403 | TRACE_IRQS_ON | 403 | TRACE_IRQS_ON |
404 | ENABLE_INTERRUPTS(CLBR_NONE) | 404 | ENABLE_INTERRUPTS(CLBR_NONE) |
405 | testl $_TIF_DO_NOTIFY_MASK,%edx | ||
406 | jz 1f | ||
407 | |||
408 | /* Really a signal */ | ||
409 | /* edx: work flags (arg3) */ | 405 | /* edx: work flags (arg3) */ |
410 | leaq do_notify_resume(%rip),%rax | 406 | leaq do_notify_resume(%rip),%rax |
411 | leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1 | 407 | leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1 |
412 | xorl %esi,%esi # oldset -> arg2 | 408 | xorl %esi,%esi # oldset -> arg2 |
413 | call ptregscall_common | 409 | call ptregscall_common |
414 | 1: movl $_TIF_WORK_MASK,%edi | 410 | movl $_TIF_WORK_MASK,%edi |
415 | /* Use IRET because user could have changed frame. This | 411 | /* Use IRET because user could have changed frame. This |
416 | works because ptregscall_common has called FIXUP_TOP_OF_STACK. */ | 412 | works because ptregscall_common has called FIXUP_TOP_OF_STACK. */ |
417 | DISABLE_INTERRUPTS(CLBR_NONE) | 413 | DISABLE_INTERRUPTS(CLBR_NONE) |