1 files changed, 6 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 508c54b92fa6..ee061c3715de 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -42,7 +42,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX);		\
 /* Stack frame offsets for local variables. */
 #define TM_FRAME_L0     TM_FRAME_SIZE-16
 #define TM_FRAME_L1     TM_FRAME_SIZE-8
-#define STACK_PARAM(x)  (48+((x)*8))
 
 
 /* In order to access the TM SPRs, TM must be enabled.  So, do so: */
@@ -109,12 +108,12 @@ _GLOBAL(tm_reclaim)
         mflr    r0
         stw     r6, 8(r1)
         std     r0, 16(r1)
-        std     r2, 40(r1)
+        std     r2, STK_GOT(r1)
         stdu    r1, -TM_FRAME_SIZE(r1)
 
         /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD]. */
 
-        std     r3, STACK_PARAM(0)(r1)
+        std     r3, STK_PARAM(R3)(r1)
         SAVE_NVGPRS(r1)
 
         /* We need to setup MSR for VSX register save instructions.  Here we
@@ -210,7 +209,7 @@ dont_backup_fp:
         /* Now get some more GPRS free */
         std     r7, GPR7(r1)                    /* Temporary stash */
         std     r12, GPR12(r1)                  /* ''   ''    ''   */
-        ld      r12, STACK_PARAM(0)(r1)         /* Param 0, thread_struct * */
+        ld      r12, STK_PARAM(R3)(r1)          /* Param 0, thread_struct * */
 
         std     r11, THREAD_TM_PPR(r12)         /* Store PPR and free r11 */
 
@@ -297,7 +296,7 @@ dont_backup_fp:
         ld      r0, 16(r1)
         mtcr    r4
         mtlr    r0
-        ld      r2, 40(r1)
+        ld      r2, STK_GOT(r1)
 
         /* Load system default DSCR */
         ld      r4, DSCR_DEFAULT@toc(r2)
@@ -320,7 +319,7 @@ _GLOBAL(__tm_recheckpoint)
         mflr    r0
         stw     r5, 8(r1)
         std     r0, 16(r1)
-        std     r2, 40(r1)
+        std     r2, STK_GOT(r1)
         stdu    r1, -TM_FRAME_SIZE(r1)
 
         /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD].
@@ -478,7 +477,7 @@ restore_gprs:
         ld      r0, 16(r1)
         mtcr    r4
         mtlr    r0
-        ld      r2, 40(r1)
+        ld      r2, STK_GOT(r1)
 
         /* Load system default DSCR */
         ld      r4, DSCR_DEFAULT@toc(r2)