Merge branch 'master' into upstream

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index f32a22997c3d..c86a5ddff050 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -815,9 +815,6 @@ void do_signal32(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        if (try_to_freeze())
-                goto no_signal;
-
         if (test_thread_flag(TIF_RESTORE_SIGMASK))
                 oldset = &current->saved_sigmask;
         else
@@ -836,9 +833,10 @@ void do_signal32(struct pt_regs *regs)
                         if (test_thread_flag(TIF_RESTORE_SIGMASK))
                                 clear_thread_flag(TIF_RESTORE_SIGMASK);
                 }
+
+                return;
         }
 
-no_signal:
         /*
          * Who's code doesn't conform to the restartable syscall convention
          * dies here!!!  The li instruction, a single machine instruction,
@@ -856,6 +854,7 @@ no_signal:
                         regs->regs[7] = regs->regs[26];
                         regs->cp0_epc -= 4;
                 }
+                regs->regs[0] = 0;      /* Don't deal with this again.  */
         }
 
         /*