From d55d400f3733059f678fc0c8a060dc8e418a578e Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 16 Apr 2005 15:25:01 -0700 Subject: [PATCH] --- yaml --- r: 81 b: refs/heads/master c: 36c1104e309fe93375e67cdbdb2a980f23965f3b h: refs/heads/master i: 79: 24906a71105d361947c833259bb204fc2c9f5102 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/entry.S | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5b1a2af68a3a..5359393638cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d61915da63e2ef03d9034e3b2ec7d8cca55d7584 +refs/heads/master: 36c1104e309fe93375e67cdbdb2a980f23965f3b diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S index e126284db7a8..053d6e80c31f 100644 --- a/trunk/arch/x86_64/kernel/entry.S +++ b/trunk/arch/x86_64/kernel/entry.S @@ -302,9 +302,7 @@ int_very_careful: leaq 8(%rsp),%rdi # &ptregs -> arg1 call syscall_trace_leave popq %rdi - btr $TIF_SYSCALL_TRACE,%edi - btr $TIF_SYSCALL_AUDIT,%edi - btr $TIF_SINGLESTEP,%edi + andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi jmp int_restore_rest int_signal: