2 files changed, 6 insertions, 14 deletions

diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 2418804e66b4..536b574b6161 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -72,23 +72,18 @@ static long syscall_trace_enter(struct pt_regs *regs)
 
         struct thread_info *ti = current_thread_info();
         unsigned long ret = 0;
-        bool emulated = false;
         u32 work;
 
         if (IS_ENABLED(CONFIG_DEBUG_ENTRY))
                 BUG_ON(regs != task_pt_regs(current));
 
-        work = READ_ONCE(ti->flags) & _TIF_WORK_SYSCALL_ENTRY;
+        work = READ_ONCE(ti->flags);
 
-        if (unlikely(work & _TIF_SYSCALL_EMU))
-                emulated = true;
-
-        if ((emulated || (work & _TIF_SYSCALL_TRACE)) &&
-            tracehook_report_syscall_entry(regs))
-                return -1L;
-
-        if (emulated)
-                return -1L;
+        if (work & (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU)) {
+                ret = tracehook_report_syscall_entry(regs);
+                if (ret || (work & _TIF_SYSCALL_EMU))
+                        return -1L;
+        }
 
 #ifdef CONFIG_SECCOMP
         /*
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index a166c960bc9e..36998e0c3fc4 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -747,9 +747,6 @@ static int ioperm_get(struct task_struct *target,
 void ptrace_disable(struct task_struct *child)
 {
         user_disable_single_step(child);
-#ifdef TIF_SYSCALL_EMU
-        clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
-#endif
 }
 
 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION