1 files changed, 5 insertions, 9 deletions

diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 38d806467c0f..ab0178ebe00a 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -349,16 +349,12 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
         }
 
         /*
-         * If TF is set due to a debugger (PT_DTRACE), clear the TF
-         * flag so that register information in the sigcontext is
-         * correct.
+         * If TF is set due to a debugger (TIF_FORCED_TF), clear the TF
+         * flag so that register information in the sigcontext is correct.
          */
-        if (unlikely(regs->eflags & TF_MASK)) {
-                if (likely(current->ptrace & PT_DTRACE)) {
-                        current->ptrace &= ~PT_DTRACE;
-                        regs->eflags &= ~TF_MASK;
-                }
-        }
+        if (unlikely(regs->eflags & X86_EFLAGS_TF) &&
+            likely(test_and_clear_thread_flag(TIF_FORCED_TF)))
+                regs->eflags &= ~X86_EFLAGS_TF;
 
 #ifdef CONFIG_IA32_EMULATION
         if (test_thread_flag(TIF_IA32)) {