Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / include / asm-i386 / signal.h

diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h
index 53945c9..c3e8ade 100644 (file)
--- a/include/asm-i386/signal.h
+++ b/include/asm-i386/signal.h
@@ -221,8 +221,10 @@ struct pt_regs;
 
 #define ptrace_signal_deliver(regs, cookie)            \
        do {                                            \
-               if (test_and_clear_thread_flag(TIF_FORCED_TF)) \
+               if (current->ptrace & PT_DTRACE) {      \
+                       current->ptrace &= ~PT_DTRACE;  \
                        (regs)->eflags &= ~TF_MASK;     \
+               }                                       \
        } while (0)
 
 #endif /* __KERNEL__ */