[PATCH] powerpc: Merged ppc_asm.h

Merged ppc_asm.h between ppc32 & ppc64.  The majority of the file is
common between the two architectures excluding how a single GPR is
saved/restored and which GPRs are non-volatile.

Additionally, moved the ASM_CONST macro used on ppc64 into ppc_asm.h.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index 1960fb8c259c..d05509f197d0 100644
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -804,7 +804,7 @@ load_up_altivec:
         beq     1f
         add     r4,r4,r6
         addi    r4,r4,THREAD    /* want THREAD of last_task_used_altivec */
-        SAVE_32VR(0,r10,r4)
+        SAVE_32VRS(0,r10,r4)
         mfvscr  vr0
         li      r10,THREAD_VSCR
         stvx    vr0,r10,r4
@@ -824,7 +824,7 @@ load_up_altivec:
         stw     r4,THREAD_USED_VR(r5)
         lvx     vr0,r10,r5
         mtvscr  vr0
-        REST_32VR(0,r10,r5)
+        REST_32VRS(0,r10,r5)
 #ifndef CONFIG_SMP
         subi    r4,r5,THREAD
         sub     r4,r4,r6
@@ -870,7 +870,7 @@ giveup_altivec:
         addi    r3,r3,THREAD            /* want THREAD of task */
         lwz     r5,PT_REGS(r3)
         cmpwi   0,r5,0
-        SAVE_32VR(0, r4, r3)
+        SAVE_32VRS(0, r4, r3)
         mfvscr  vr0
         li      r4,THREAD_VSCR
         stvx    vr0,r4,r3
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S
index 8e52e8408316..eba5a5f8ff08 100644
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ b/arch/ppc/kernel/head_fsl_booke.S
@@ -853,7 +853,7 @@ load_up_spe:
         cmpi    0,r4,0
         beq     1f
         addi    r4,r4,THREAD    /* want THREAD of last_task_used_spe */
-        SAVE_32EVR(0,r10,r4)
+        SAVE_32EVRS(0,r10,r4)
         evxor   evr10, evr10, evr10     /* clear out evr10 */
         evmwumiaa evr10, evr10, evr10   /* evr10 <- ACC = 0 * 0 + ACC */
         li      r5,THREAD_ACC
@@ -873,7 +873,7 @@ load_up_spe:
         stw     r4,THREAD_USED_SPE(r5)
         evlddx  evr4,r10,r5
         evmra   evr4,evr4
-        REST_32EVR(0,r10,r5)
+        REST_32EVRS(0,r10,r5)
 #ifndef CONFIG_SMP
         subi    r4,r5,THREAD
         stw     r4,last_task_used_spe@l(r3)
@@ -963,7 +963,7 @@ _GLOBAL(giveup_spe)
         addi    r3,r3,THREAD            /* want THREAD of task */
         lwz     r5,PT_REGS(r3)
         cmpi    0,r5,0
-        SAVE_32EVR(0, r4, r3)
+        SAVE_32EVRS(0, r4, r3)
         evxor   evr6, evr6, evr6        /* clear out evr6 */
         evmwumiaa evr6, evr6, evr6      /* evr6 <- ACC = 0 * 0 + ACC */
         li      r4,THREAD_ACC