summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/entry_64.S
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2006-08-09 09:00:30 +0200
committerPaul Mackerras <paulus@samba.org>2006-08-25 05:17:08 +0200
commit11a27ad782fc7ae4b7d6ac8fefad4ceb415300d6 (patch)
tree10e3f8925e8b659a833017ceb674edbbe2fd3c82 /arch/powerpc/kernel/entry_64.S
parentMerge branch 'merge' (diff)
downloadlinux-11a27ad782fc7ae4b7d6ac8fefad4ceb415300d6.tar.xz
linux-11a27ad782fc7ae4b7d6ac8fefad4ceb415300d6.zip
[POWERPC] SLB shadow buffer cleanup
Cleanup some of the #define magic as suggested by Milton. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
-rw-r--r--arch/powerpc/kernel/entry_64.S13
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 5baea498ea64..2cd872b5283b 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -323,11 +323,6 @@ _GLOBAL(ret_from_fork)
* The code which creates the new task context is in 'copy_thread'
* in arch/powerpc/kernel/process.c
*/
-#define SHADOW_SLB_BOLTED_STACK_ESID \
- (SLBSHADOW_SAVEAREA + 0x10*(SLB_NUM_BOLTED-1))
-#define SHADOW_SLB_BOLTED_STACK_VSID \
- (SLBSHADOW_SAVEAREA + 0x10*(SLB_NUM_BOLTED-1) + 8)
-
.align 7
_GLOBAL(_switch)
mflr r0
@@ -383,10 +378,10 @@ BEGIN_FTR_SECTION
/* Update the last bolted SLB */
ld r9,PACA_SLBSHADOWPTR(r13)
- li r12,0
- std r12,SHADOW_SLB_BOLTED_STACK_ESID(r9) /* Clear ESID */
- std r7,SHADOW_SLB_BOLTED_STACK_VSID(r9) /* Save VSID */
- std r0,SHADOW_SLB_BOLTED_STACK_ESID(r9) /* Save ESID */
+ li r12,0
+ std r12,SLBSHADOW_STACKESID(r9) /* Clear ESID */
+ std r7,SLBSHADOW_STACKVSID(r9) /* Save VSID */
+ std r0,SLBSHADOW_STACKESID(r9) /* Save ESID */
slbie r6
slbie r6 /* Workaround POWER5 < DD2.1 issue */