Skip to content

Commit

Permalink
powerpc: Don't disable MSR bits in do_load_up_transact_*() functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
antonblanchard authored and mpe committed Dec 1, 2015
1 parent 07e45c1 commit af72ab6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
4 changes: 0 additions & 4 deletions arch/powerpc/kernel/fpu.S
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
4 changes: 0 additions & 4 deletions arch/powerpc/kernel/vector.S
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit af72ab6

Please sign in to comment.