This reverts commit 8110080dc53335d5dd99b123144a6174f19ffc65.

Guenter noticed that this breaks PPC build when CONFIG_PPC_TRANSACTIONAL_MEM
is set, because this patch was not for 3.10.

Cc: Guenter Roeck <[email protected]>
Signed-off-by: Willy Tarreau <[email protected]>
---
 arch/powerpc/kernel/process.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a5e339806..d55357e 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1088,16 +1088,6 @@ void start_thread(struct pt_regs *regs, unsigned long 
start, unsigned long sp)
                current->thread.regs = regs - 1;
        }
 
-#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-       /*
-        * Clear any transactional state, we're exec()ing. The cause is
-        * not important as there will never be a recheckpoint so it's not
-        * user visible.
-        */
-       if (MSR_TM_SUSPENDED(mfmsr()))
-               tm_reclaim_current(0);
-#endif
-
        memset(regs->gpr, 0, sizeof(regs->gpr));
        regs->ctr = 0;
        regs->link = 0;
-- 
2.8.0.rc2.1.gbe9624a

Reply via email to