Merge tag 'microblaze-v5.15' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / arch / powerpc / kernel / exceptions-64e.S

diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 1401787..711c66b 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -545,8 +545,8 @@ __end_interrupts:
                                PROLOG_ADDITION_2REGS)
        mfspr   r14,SPRN_DEAR
        mfspr   r15,SPRN_ESR
-       std     r14,_DAR(r1)
-       std     r15,_DSISR(r1)
+       std     r14,_DEAR(r1)
+       std     r15,_ESR(r1)
        ld      r14,PACA_EXGEN+EX_R14(r13)
        ld      r15,PACA_EXGEN+EX_R15(r13)
        EXCEPTION_COMMON(0x300)
@@ -558,8 +558,8 @@ __end_interrupts:
                                PROLOG_ADDITION_2REGS)
        li      r15,0
        mr      r14,r10
-       std     r14,_DAR(r1)
-       std     r15,_DSISR(r1)
+       std     r14,_DEAR(r1)
+       std     r15,_ESR(r1)
        ld      r14,PACA_EXGEN+EX_R14(r13)
        ld      r15,PACA_EXGEN+EX_R15(r13)
        EXCEPTION_COMMON(0x400)
@@ -575,8 +575,8 @@ __end_interrupts:
                                PROLOG_ADDITION_2REGS)
        mfspr   r14,SPRN_DEAR
        mfspr   r15,SPRN_ESR
-       std     r14,_DAR(r1)
-       std     r15,_DSISR(r1)
+       std     r14,_DEAR(r1)
+       std     r15,_ESR(r1)
        ld      r14,PACA_EXGEN+EX_R14(r13)
        ld      r15,PACA_EXGEN+EX_R15(r13)
        EXCEPTION_COMMON(0x600)
@@ -587,7 +587,7 @@ __end_interrupts:
        NORMAL_EXCEPTION_PROLOG(0x700, BOOKE_INTERRUPT_PROGRAM,
                                PROLOG_ADDITION_1REG)
        mfspr   r14,SPRN_ESR
-       std     r14,_DSISR(r1)
+       std     r14,_ESR(r1)
        ld      r14,PACA_EXGEN+EX_R14(r13)
        EXCEPTION_COMMON(0x700)
        addi    r3,r1,STACK_FRAME_OVERHEAD
@@ -1057,8 +1057,8 @@ bad_stack_book3e:
        std     r11,_CCR(r1)
        mfspr   r10,SPRN_DEAR
        mfspr   r11,SPRN_ESR
-       std     r10,_DAR(r1)
-       std     r11,_DSISR(r1)
+       std     r10,_DEAR(r1)
+       std     r11,_ESR(r1)
        std     r0,GPR0(r1);            /* save r0 in stackframe */         \
        std     r2,GPR2(r1);            /* save r2 in stackframe */         \
        SAVE_4GPRS(3, r1);              /* save r3 - r6 in stackframe */    \
@@ -1127,7 +1127,7 @@ found_iprot:
  * r3 = MAS0_TLBSEL (for the iprot array)
  * r4 = SPRN_TLBnCFG
  */
-       bl      invstr                          /* Find our address */
+       bcl     20,31,$+4                       /* Find our address */
 invstr:        mflr    r6                              /* Make it accessible */
        mfmsr   r7
        rlwinm  r5,r7,27,31,31                  /* extract MSR[IS] */
@@ -1196,7 +1196,7 @@ skpinv:   addi    r6,r6,1                         /* Increment */
        mfmsr   r6
        xori    r6,r6,MSR_IS
        mtspr   SPRN_SRR1,r6
-       bl      1f              /* Find our address */
+       bcl     20,31,$+4       /* Find our address */
 1:     mflr    r6
        addi    r6,r6,(2f - 1b)
        mtspr   SPRN_SRR0,r6
@@ -1256,7 +1256,7 @@ skpinv:   addi    r6,r6,1                         /* Increment */
  * r4 = MAS0 w/TLBSEL & ESEL for the temp mapping
  */
        /* Now we branch the new virtual address mapped by this entry */
-       bl      1f              /* Find our address */
+       bcl     20,31,$+4       /* Find our address */
 1:     mflr    r6
        addi    r6,r6,(2f - 1b)
        tovirt(r6,r6)