/spare/repo/netdev-2.6 branch 'ieee80211'

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 493819e543a5..ca914c3bd49c 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -211,9 +211,7 @@ int unhandled_signal(struct task_struct *tsk, int sig)
 {
         if (tsk->pid == 1)
                 return 1;
-        /* Warn for strace, but not for gdb */
-        if (!test_ti_thread_flag(tsk->thread_info, TIF_SYSCALL_TRACE) &&
-            (tsk->ptrace & PT_PTRACED))
+        if (tsk->ptrace & PT_PTRACED)
                 return 0;
         return (tsk->sighand->action[sig-1].sa.sa_handler == SIG_IGN) ||
                 (tsk->sighand->action[sig-1].sa.sa_handler == SIG_DFL);