diff options
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 3a058bb16409..e70f3881d7e4 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -283,7 +283,7 @@ sysret_careful: | |||
283 | sysret_signal: | 283 | sysret_signal: |
284 | TRACE_IRQS_ON | 284 | TRACE_IRQS_ON |
285 | sti | 285 | sti |
286 | testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx | 286 | testl $_TIF_DO_NOTIFY_MASK,%edx |
287 | jz 1f | 287 | jz 1f |
288 | 288 | ||
289 | /* Really a signal */ | 289 | /* Really a signal */ |
@@ -377,7 +377,7 @@ int_very_careful: | |||
377 | jmp int_restore_rest | 377 | jmp int_restore_rest |
378 | 378 | ||
379 | int_signal: | 379 | int_signal: |
380 | testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx | 380 | testl $_TIF_DO_NOTIFY_MASK,%edx |
381 | jz 1f | 381 | jz 1f |
382 | movq %rsp,%rdi # &ptregs -> arg1 | 382 | movq %rsp,%rdi # &ptregs -> arg1 |
383 | xorl %esi,%esi # oldset -> arg2 | 383 | xorl %esi,%esi # oldset -> arg2 |
@@ -603,7 +603,7 @@ retint_careful: | |||
603 | jmp retint_check | 603 | jmp retint_check |
604 | 604 | ||
605 | retint_signal: | 605 | retint_signal: |
606 | testl $(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY),%edx | 606 | testl $_TIF_DO_NOTIFY_MASK,%edx |
607 | jz retint_swapgs | 607 | jz retint_swapgs |
608 | TRACE_IRQS_ON | 608 | TRACE_IRQS_ON |
609 | sti | 609 | sti |