2 files changed, 5 insertions, 2 deletions

diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 0d8650f7fce7..4f3cdef75797 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -611,8 +611,10 @@ GLOBAL_ENTRY(fsys_bubble_down)
         movl r2=ia64_ret_from_syscall
         ;;
         mov rp=r2                               // set the real return addr
-        tbit.z p8,p0=r3,TIF_SYSCALL_TRACE
+        and r3=_TIF_SYSCALL_TRACEAUDIT,r3
         ;;
+        cmp.eq p8,p0=r3,r0
+
 (p10)   br.cond.spnt.many ia64_ret_from_syscall // p10==true means out registers are more than 8
 (p8)    br.call.sptk.many b6=b6         // ignore this return addr
         br.cond.sptk ia64_trace_syscall
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 6891d86937d9..499b7e5317cf 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -224,7 +224,8 @@ ia64_rt_sigreturn (struct sigscratch *scr)
          * could be corrupted.
          */
         retval = (long) &ia64_leave_kernel;
-        if (test_thread_flag(TIF_SYSCALL_TRACE))
+        if (test_thread_flag(TIF_SYSCALL_TRACE)
+            || test_thread_flag(TIF_SYSCALL_AUDIT))
                 /*
                  * strace expects to be notified after sigreturn returns even though the
                  * context to which we return may not be in the middle of a syscall.