Skip to contentSkip to conversation

powerpc: Call check_if_tm_restore_required() in enable_kernel_*()

PATCH Applied Anton Blanchard 2 participants 2 messages Dec 10, 2015 – Dec 14, 2015 PowerPC

lore
Share & tools
lore

Anton Blanchard

author
#0 lore raw

PATCH 1/1 powerpc: Call check_if_tm_restore_required() in enable_kernel_*()

Commit a0e72cf12b1a ("powerpc: Create msr_check_and_{set,clear}()") removed a call to check_if_tm_restore_required() in the enable_kernel_*() functions. Add them back in.

Fixes a0e72cf12b1a ("powerpc: Create msr_check_and_{set,clear}()")
Reported-by Rashmica Gupta <[email protected]>
Signed-off-by Anton Blanchard <[email protected]>
---
 arch/powerpc/kernel/process.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
arch/powerpc/kernel/process.c +10 -3
index fffc2d2..0cffb2c 100644
@@ -181,8 +181,10 @@ void enable_kernel_fp(void)
 
 	msr_check_and_set(MSR_FP);
 
-	if (current->thread.regs && (current->thread.regs->msr & MSR_FP))
+	if (current->thread.regs && (current->thread.regs->msr & MSR_FP)) {
+		check_if_tm_restore_required(current);
 		__giveup_fpu(current);
+	}
 }
 EXPORT_SYMBOL(enable_kernel_fp);
 #endif /* CONFIG_PPC_FPU */

@@ -204,8 +206,10 @@ void enable_kernel_altivec(void)
 
 	msr_check_and_set(MSR_VEC);
 
-	if (current->thread.regs && (current->thread.regs->msr & MSR_VEC))
+	if (current->thread.regs && (current->thread.regs->msr & MSR_VEC)) {
+		check_if_tm_restore_required(current);
 		__giveup_altivec(current);
+	}
 }
 EXPORT_SYMBOL(enable_kernel_altivec);
 

@@ -249,6 +253,7 @@ void enable_kernel_vsx(void)
 	msr_check_and_set(MSR_FP|MSR_VEC|MSR_VSX);
 
 	if (current->thread.regs && (current->thread.regs->msr & MSR_VSX)) {
+		check_if_tm_restore_required(current);
 		if (current->thread.regs->msr & MSR_FP)
 			__giveup_fpu(current);
 		if (current->thread.regs->msr & MSR_VEC)

@@ -289,8 +294,10 @@ void enable_kernel_spe(void)
 
 	msr_check_and_set(MSR_SPE);
 
-	if (current->thread.regs && (current->thread.regs->msr & MSR_SPE))
+	if (current->thread.regs && (current->thread.regs->msr & MSR_SPE)) {
+		check_if_tm_restore_required(current);
 		__giveup_spe(current);
+	}
 }
 EXPORT_SYMBOL(enable_kernel_spe);
Signature · 1 line
2.5.0
reviewer Applied
#1 lore raw
Quoted 7 lines · Anton Blanchard

Commit a0e72cf12b1a ("powerpc: Create msr_check_and_{set,clear}()") removed a call to check_if_tm_restore_required() in the enable_kernel_*() functions. Add them back in.

Fixes a0e72cf12b1a ("powerpc: Create msr_check_and_{set,clear}()")
Reported-by Rashmica Gupta <[email protected]>
Signed-off-by Anton Blanchard <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/d64d02ce4ebaa79bf1c026e8

cheers