Message ID | 1467781086-21125-1-git-send-email-mikey@neuling.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Wed, 2016-06-07 at 04:58:06 UTC, Michael Neuling wrote: > At the start of __tm_recheckpoint we save the kernel stack pointer > (r1) in SPRG SCRATCH0 (SPRG2) so that we can restore it after the > trecheckpoint. ... > > This patches moves the saving of r1 to the SPRG to the region where we > are guaranteed not to take any further SLB misses. > > Signed-off-by: Michael Neuling <mikey@neuling.org> > Acked-by: Cyril Bur <cyrilbur@gmail.com> > Cc: stable@vger.kernel.org # v3.9+ Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/eb584b3ee4d317cf7e0068bec0 cheers
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S index b7019b5..298afcf 100644 --- a/arch/powerpc/kernel/tm.S +++ b/arch/powerpc/kernel/tm.S @@ -338,8 +338,6 @@ _GLOBAL(__tm_recheckpoint) */ subi r7, r7, STACK_FRAME_OVERHEAD - SET_SCRATCH0(r1) - mfmsr r6 /* R4 = original MSR to indicate whether thread used FP/Vector etc. */ @@ -468,6 +466,7 @@ restore_gprs: * until we turn MSR RI back on. */ + SET_SCRATCH0(r1) ld r5, -8(r1) ld r1, -16(r1)