From: Willy Tarreau Date: Wed, 19 Oct 2016 21:18:05 +0000 (+0200) Subject: Revert "powerpc/tm: Always reclaim in start_thread() for exec() class syscalls" X-Git-Tag: v3.10.104~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baa032f71a5afac624f3626243ac26e5bef1adea;p=thirdparty%2Fkernel%2Fstable.git Revert "powerpc/tm: Always reclaim in start_thread() for exec() class syscalls" 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 Signed-off-by: Willy Tarreau --- diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index a5e339806589d..d55357ee90283 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;