[3.11.y.z extended stable] Patch "powerpc/tm: Disable IRQ in tm_recheckpoint" has been added to staging queue

[Mauricio Faria de Oliveira]

Hi Mikey and Luis,

On 05/14/2014 11:58 AM, Luis Henriques wrote:
> This is a note to let you know that I have just added a patch titled
>
>      powerpc/tm: Disable IRQ in tm_recheckpoint
>
> to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree
> which can be found at:
 > [...]

This one seems to break a build with ubuntu-trusty.git's master-next.
Reverting it made the build to pass fine.

Maybe there's another commit to pull in?

Thanks.

> diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
> index 7e9dff8..81f929f 100644
> --- a/arch/powerpc/kernel/signal_32.c
> +++ b/arch/powerpc/kernel/signal_32.c
> @@ -863,6 +863,8 @@ static long restore_tm_user_regs(struct pt_regs *regs,
>   	 * transactional versions should be loaded.
>   	 */
>   	tm_enable();
> +	/* Make sure the transaction is marked as failed */
> +	current->thread.tm_texasr |= TEXASR_FS;
>   	/* This loads the checkpointed FP/VEC state, if used */
>   	tm_recheckpoint(&current->thread, msr);
>   	/* Get the top half of the MSR */


$ fakeroot debian/rules binary-generic
[...]
   CC      arch/powerpc/kernel/signal_32.o
/home/test/hdrs/k/arch/powerpc/kernel/signal_32.c: In function 
‘restore_tm_user_regs’:
/home/test/hdrs/k/arch/powerpc/kernel/signal_32.c:885:37: error: 
‘TEXASR_FS’ undeclared (first use in this function)
   current->thread.tm_texasr |= TEXASR_FS;
                                      ^
/home/test/hdrs/k/arch/powerpc/kernel/signal_32.c:885:37: note: each 
undeclared identifier is reported only once for each function it appears in
make[3]: *** [arch/powerpc/kernel/signal_32.o] Error 1



-- 
Mauricio Faria de Oliveira
IBM Linux Technology Center