1 files changed, 14 insertions, 26 deletions

diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 68027bfa5f8e..a67e00aa3caa 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -519,6 +519,13 @@ static int save_tm_user_regs(struct pt_regs *regs,
 {
         unsigned long msr = regs->msr;
 
+        /* Remove TM bits from thread's MSR.  The MSR in the sigcontext
+         * just indicates to userland that we were doing a transaction, but we
+         * don't want to return in transactional state.  This also ensures
+         * that flush_fp_to_thread won't set TIF_RESTORE_TM again.
+         */
+        regs->msr &= ~MSR_TS_MASK;
+
         /* Make sure floating point registers are stored in regs */
         flush_fp_to_thread(current);
 
@@ -1015,29 +1022,24 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
         tm_frame = &rt_sf->uc_transact.uc_mcontext;
         if (MSR_TM_ACTIVE(regs->msr)) {
+                if (__put_user((unsigned long)&rt_sf->uc_transact,
+                               &rt_sf->uc.uc_link) ||
+                    __put_user((unsigned long)tm_frame,
+                               &rt_sf->uc_transact.uc_regs))
+                        goto badframe;
                 if (save_tm_user_regs(regs, frame, tm_frame, sigret))
                         goto badframe;
         }
         else
 #endif
         {
+                if (__put_user(0, &rt_sf->uc.uc_link))
+                        goto badframe;
                 if (save_user_regs(regs, frame, tm_frame, sigret, 1))
                         goto badframe;
         }
         regs->link = tramp;
 
-#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-        if (MSR_TM_ACTIVE(regs->msr)) {
-                if (__put_user((unsigned long)&rt_sf->uc_transact,
-                               &rt_sf->uc.uc_link)
-                    || __put_user((unsigned long)tm_frame, &rt_sf->uc_transact.uc_regs))
-                        goto badframe;
-        }
-        else
-#endif
-                if (__put_user(0, &rt_sf->uc.uc_link))
-                        goto badframe;
-
         current->thread.fp_state.fpscr = 0;     /* turn off all fp exceptions */
 
         /* create a stack frame for the caller of the handler */
@@ -1056,13 +1058,6 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
         /* enter the signal handler in native-endian mode */
         regs->msr &= ~MSR_LE;
         regs->msr |= (MSR_KERNEL & MSR_LE);
-#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-        /* Remove TM bits from thread's MSR.  The MSR in the sigcontext
-         * just indicates to userland that we were doing a transaction, but we
-         * don't want to return in transactional state:
-         */
-        regs->msr &= ~MSR_TS_MASK;
-#endif
         return 1;
 
 badframe:
@@ -1484,13 +1479,6 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
         regs->nip = (unsigned long) ka->sa.sa_handler;
         /* enter the signal handler in big-endian mode */
         regs->msr &= ~MSR_LE;
-#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-        /* Remove TM bits from thread's MSR.  The MSR in the sigcontext
-         * just indicates to userland that we were doing a transaction, but we
-         * don't want to return in transactional state:
-         */
-        regs->msr &= ~MSR_TS_MASK;
-#endif
         return 1;
 
 badframe: