powerpc/64s: restore_math remove TM test
authorNicholas Piggin <npiggin@gmail.com>
Tue, 23 Jun 2020 23:41:37 +0000 (09:41 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 16 Jul 2020 03:00:24 +0000 (13:00 +1000)
The TM test in restore_math added by commit dc16b553c949e ("powerpc:
Always restore FPU/VEC/VSX if hardware transactional memory in use") is
no longer necessary after commit a8318c13e79ba ("powerpc/tm: Fix
restoring FP/VMX facility incorrectly on interrupts"), which removed
the cases where restore_math has to restore if TM is active.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200623234139.2262227-1-npiggin@gmail.com
arch/powerpc/kernel/process.c

index 4650b9b..02d691b 100644 (file)
@@ -530,8 +530,7 @@ void notrace restore_math(struct pt_regs *regs)
 {
        unsigned long msr;
 
-       if (!MSR_TM_ACTIVE(regs->msr) &&
-               !current->thread.load_fp && !loadvec(current->thread))
+       if (!current->thread.load_fp && !loadvec(current->thread))
                return;
 
        msr = regs->msr;