Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af72ab64 authored Oct 29, 2015 by Anton Blanchard Committed by Michael Ellerman Dec 01, 2015

powerpc: Don't disable MSR bits in do_load_up_transact_*() functions



Similar to the non TM load_up_*() functions, don't disable the MSR
bits on the way out.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 07e45c12

arch/powerpc/kernel/fpu.S

+0 −4

Original line number	Diff line number	Diff line
		@@ -73,10 +73,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
		MTFSF_L(fr0)
		REST_32FPVSRS(0, R4, R7)

		/* FP/VSX off again */
		MTMSRD(r6)
		SYNC

		blr
		#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */

arch/powerpc/kernel/vector.S

+0 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,6 @@ _GLOBAL(do_load_up_transact_altivec)
		addi r10,r3,THREAD_TRANSACT_VRSTATE
		REST_32VRS(0,r4,r10)

		/* Disable VEC again. */
		MTMSRD(r6)
		isync

		blr
		#endif