From fd76ae095493c802df0cda9030755b623a6c1a91 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 6 Jul 2007 02:39:50 -0700 Subject: [PATCH] --- yaml --- r: 58221 b: refs/heads/master c: 1e2e99f0e4aa6363e8515ed17011c210c8f1b52a h: refs/heads/master i: 58219: 4412d7e9ccd35522f774a09c68d5652e3980b45e v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/entry.S | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 04b1da6e0cce..92235c0b537d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef7320edb1dd2cf6c969d1dcef4a9499a42f24da +refs/heads/master: 1e2e99f0e4aa6363e8515ed17011c210c8f1b52a diff --git a/trunk/arch/i386/kernel/entry.S b/trunk/arch/i386/kernel/entry.S index b1f16ee65e4d..3c3c220488c9 100644 --- a/trunk/arch/i386/kernel/entry.S +++ b/trunk/arch/i386/kernel/entry.S @@ -367,10 +367,6 @@ ENTRY(system_call) CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL GET_THREAD_INFO(%ebp) - testl $TF_MASK,PT_EFLAGS(%esp) - jz no_singlestep - orl $_TIF_SINGLESTEP,TI_flags(%ebp) -no_singlestep: # system call tracing in operation / emulation /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */ testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp) @@ -385,6 +381,10 @@ syscall_exit: # setting need_resched or sigpending # between sampling and the iret TRACE_IRQS_OFF + testl $TF_MASK,PT_EFLAGS(%esp) # If tracing set singlestep flag on exit + jz no_singlestep + orl $_TIF_SINGLESTEP,TI_flags(%ebp) +no_singlestep: movl TI_flags(%ebp), %ecx testw $_TIF_ALLWORK_MASK, %cx # current->work jne syscall_exit_work