1 files changed, 13 insertions, 76 deletions

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index a94f155db78e..0d525ce3717f 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -223,7 +223,11 @@ END_FTR_SECTION_IFCLR(CPU_FTR_STCX_CHECKS_ADDRESS)
 
         beq-    1f
         ACCOUNT_CPU_USER_EXIT(r11, r12)
-        HMT_MEDIUM_LOW_HAS_PPR
+
+BEGIN_FTR_SECTION
+        HMT_MEDIUM_LOW
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
+
         ld      r13,GPR13(r1)   /* only restore r13 if returning to usermode */
 1:      ld      r2,GPR2(r1)
         ld      r1,GPR1(r1)
@@ -312,7 +316,13 @@ syscall_exit_work:
         subi    r12,r12,TI_FLAGS
 
 4:      /* Anything else left to do? */
-        SET_DEFAULT_THREAD_PPR(r3, r10)         /* Set thread.ppr = 3 */
+BEGIN_FTR_SECTION
+        lis     r3,INIT_PPR@highest     /* Set thread.ppr = 3 */
+        ld      r10,PACACURRENT(r13)
+        sldi    r3,r3,32        /* bits 11-13 are used for ppr */
+        std     r3,TASKTHREADPPR(r10)
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
+
         andi.   r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP)
         beq     ret_from_except_lite
 
@@ -452,43 +462,11 @@ _GLOBAL(_switch)
         /* r3-r13 are caller saved -- Cort */
         SAVE_8GPRS(14, r1)
         SAVE_10GPRS(22, r1)
-        mflr    r20             /* Return to switch caller */
-        mfmsr   r22
-        li      r0, MSR_FP
-#ifdef CONFIG_VSX
-BEGIN_FTR_SECTION
-        oris    r0,r0,MSR_VSX@h /* Disable VSX */
-END_FTR_SECTION_IFSET(CPU_FTR_VSX)
-#endif /* CONFIG_VSX */
-#ifdef CONFIG_ALTIVEC
-BEGIN_FTR_SECTION
-        oris    r0,r0,MSR_VEC@h /* Disable altivec */
-        mfspr   r24,SPRN_VRSAVE /* save vrsave register value */
-        std     r24,THREAD_VRSAVE(r3)
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-#endif /* CONFIG_ALTIVEC */
-        and.    r0,r0,r22
-        beq+    1f
-        andc    r22,r22,r0
-        MTMSRD(r22)
-        isync
-1:      std     r20,_NIP(r1)
+        std     r0,_NIP(r1)     /* Return to switch caller */
         mfcr    r23
         std     r23,_CCR(r1)
         std     r1,KSP(r3)      /* Set old stack pointer */
 
-#ifdef CONFIG_PPC_BOOK3S_64
-BEGIN_FTR_SECTION
-        /* Event based branch registers */
-        mfspr   r0, SPRN_BESCR
-        std     r0, THREAD_BESCR(r3)
-        mfspr   r0, SPRN_EBBHR
-        std     r0, THREAD_EBBHR(r3)
-        mfspr   r0, SPRN_EBBRR
-        std     r0, THREAD_EBBRR(r3)
-END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
-#endif
-
 #ifdef CONFIG_SMP
         /* We need a sync somewhere here to make sure that if the
          * previous task gets rescheduled on another CPU, it sees all
@@ -576,47 +554,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
         mr      r1,r8           /* start using new stack pointer */
         std     r7,PACAKSAVE(r13)
 
-#ifdef CONFIG_PPC_BOOK3S_64
-BEGIN_FTR_SECTION
-        /* Event based branch registers */
-        ld      r0, THREAD_BESCR(r4)
-        mtspr   SPRN_BESCR, r0
-        ld      r0, THREAD_EBBHR(r4)
-        mtspr   SPRN_EBBHR, r0
-        ld      r0, THREAD_EBBRR(r4)
-        mtspr   SPRN_EBBRR, r0
-
-        ld      r0,THREAD_TAR(r4)
-        mtspr   SPRN_TAR,r0
-END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
-#endif
-
-#ifdef CONFIG_ALTIVEC
-BEGIN_FTR_SECTION
-        ld      r0,THREAD_VRSAVE(r4)
-        mtspr   SPRN_VRSAVE,r0          /* if G4, restore VRSAVE reg */
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-#endif /* CONFIG_ALTIVEC */
-#ifdef CONFIG_PPC64
-BEGIN_FTR_SECTION
-        lwz     r6,THREAD_DSCR_INHERIT(r4)
-        ld      r0,THREAD_DSCR(r4)
-        cmpwi   r6,0
-        bne     1f
-        ld      r0,PACA_DSCR_DEFAULT(r13)
-1:
-BEGIN_FTR_SECTION_NESTED(70)
-        mfspr   r8, SPRN_FSCR
-        rldimi  r8, r6, FSCR_DSCR_LG, (63 - FSCR_DSCR_LG)
-        mtspr   SPRN_FSCR, r8
-END_FTR_SECTION_NESTED(CPU_FTR_ARCH_207S, CPU_FTR_ARCH_207S, 70)
-        cmpd    r0,r25
-        beq     2f
-        mtspr   SPRN_DSCR,r0
-2:
-END_FTR_SECTION_IFSET(CPU_FTR_DSCR)
-#endif
-
         ld      r6,_CCR(r1)
         mtcrf   0xFF,r6