aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-03-09 19:48:44 -0400
committerAnton Blanchard <anton@samba.org>2014-04-22 20:05:24 -0400
commitc2e31bdc120d992a90b75d94c7fa403fea362e43 (patch)
treef7e1acaa3b3be6ac301b90f69960e97b0f12fa20
parent752a6422fec3c0f5f9d4ac43d92f5dd13e22fde4 (diff)
powerpc/tm: Use STK_PARAM
Get rid of the tm specific STACK_PARAM and use STK_PARAM Signed-off-by: Anton Blanchard <anton@samba.org>
-rw-r--r--arch/powerpc/kernel/tm.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 03567c05950a..27aad248c002 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -41,7 +41,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX); \
41/* Stack frame offsets for local variables. */ 41/* Stack frame offsets for local variables. */
42#define TM_FRAME_L0 TM_FRAME_SIZE-16 42#define TM_FRAME_L0 TM_FRAME_SIZE-16
43#define TM_FRAME_L1 TM_FRAME_SIZE-8 43#define TM_FRAME_L1 TM_FRAME_SIZE-8
44#define STACK_PARAM(x) (48+((x)*8))
45 44
46 45
47/* In order to access the TM SPRs, TM must be enabled. So, do so: */ 46/* In order to access the TM SPRs, TM must be enabled. So, do so: */
@@ -113,7 +112,7 @@ _GLOBAL(tm_reclaim)
113 112
114 /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD]. */ 113 /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD]. */
115 114
116 std r3, STACK_PARAM(0)(r1) 115 std r3, STK_PARAM(R3)(r1)
117 SAVE_NVGPRS(r1) 116 SAVE_NVGPRS(r1)
118 117
119 /* We need to setup MSR for VSX register save instructions. Here we 118 /* We need to setup MSR for VSX register save instructions. Here we
@@ -202,7 +201,7 @@ dont_backup_fp:
202 /* Now get some more GPRS free */ 201 /* Now get some more GPRS free */
203 std r7, GPR7(r1) /* Temporary stash */ 202 std r7, GPR7(r1) /* Temporary stash */
204 std r12, GPR12(r1) /* '' '' '' */ 203 std r12, GPR12(r1) /* '' '' '' */
205 ld r12, STACK_PARAM(0)(r1) /* Param 0, thread_struct * */ 204 ld r12, STK_PARAM(R3)(r1) /* Param 0, thread_struct * */
206 205
207 std r11, THREAD_TM_PPR(r12) /* Store PPR and free r11 */ 206 std r11, THREAD_TM_PPR(r12) /* Store PPR and free r11 */
208 207