powerpc: Rename asm offset TRAP to _TRAP for 32-bit

... for consistency with 64-bit.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 710336a9f0fd42fa93fc0587b4d969415ccc15d2..330cd783206fb7034dea7c993a3fc8aea0b5376f 100644 (file)
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -209,6 +209,7 @@ int main(void)
        DEFINE(_DSISR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr));
        DEFINE(ORIG_GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, orig_gpr3));
        DEFINE(RESULT, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, result));
+       DEFINE(_TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
 #ifndef CONFIG_PPC64
        DEFINE(_MQ, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, mq));
        /*
@@ -219,9 +220,7 @@ int main(void)
         */
        DEFINE(_DEAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar));
        DEFINE(_ESR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr));
-       DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
 #else /* CONFIG_PPC64 */
-       DEFINE(_TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
        DEFINE(SOFTE, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, softe));
 
        /* These _only_ to be used with {PROM,RTAS}_FRAME_SIZE!!! */

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 960da7bea0430d5b238956e525fe4987de2a5cc4..2e99ae41723c5a1d0a6d84124f393364fafbb665 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -278,7 +278,7 @@ ret_from_fork:
 syscall_dotrace:
        SAVE_NVGPRS(r1)
        li      r0,0xc00
-       stw     r0,TRAP(r1)
+       stw     r0,_TRAP(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
        bl      do_syscall_trace_enter
        lwz     r0,GPR0(r1)     /* Restore original registers */
@@ -299,12 +299,12 @@ syscall_exit_work:
        ori     r10,r10,MSR_EE
        SYNC
        MTMSRD(r10)             /* re-enable interrupts */
-       lwz     r4,TRAP(r1)
+       lwz     r4,_TRAP(r1)
        andi.   r4,r4,1
        beq     4f
        SAVE_NVGPRS(r1)
        li      r4,0xc00
-       stw     r4,TRAP(r1)
+       stw     r4,_TRAP(r1)
 4:
        addi    r3,r1,STACK_FRAME_OVERHEAD
        bl      do_syscall_trace_leave
@@ -410,49 +410,49 @@ show_syscalls_task:
        .globl  ppc_sigsuspend
 ppc_sigsuspend:
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        rlwinm  r0,r0,0,0,30            /* clear LSB to indicate full */
-       stw     r0,TRAP(r1)             /* register set saved */
+       stw     r0,_TRAP(r1)            /* register set saved */
        b       sys_sigsuspend
 
        .globl  ppc_rt_sigsuspend
 ppc_rt_sigsuspend:
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        rlwinm  r0,r0,0,0,30
-       stw     r0,TRAP(r1)
+       stw     r0,_TRAP(r1)
        b       sys_rt_sigsuspend
 
        .globl  ppc_fork
 ppc_fork:
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        rlwinm  r0,r0,0,0,30            /* clear LSB to indicate full */
-       stw     r0,TRAP(r1)             /* register set saved */
+       stw     r0,_TRAP(r1)            /* register set saved */
        b       sys_fork
 
        .globl  ppc_vfork
 ppc_vfork:
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        rlwinm  r0,r0,0,0,30            /* clear LSB to indicate full */
-       stw     r0,TRAP(r1)             /* register set saved */
+       stw     r0,_TRAP(r1)            /* register set saved */
        b       sys_vfork
 
        .globl  ppc_clone
 ppc_clone:
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        rlwinm  r0,r0,0,0,30            /* clear LSB to indicate full */
-       stw     r0,TRAP(r1)             /* register set saved */
+       stw     r0,_TRAP(r1)            /* register set saved */
        b       sys_clone
 
        .globl  ppc_swapcontext
 ppc_swapcontext:
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        rlwinm  r0,r0,0,0,30            /* clear LSB to indicate full */
-       stw     r0,TRAP(r1)             /* register set saved */
+       stw     r0,_TRAP(r1)            /* register set saved */
        b       sys_swapcontext
 
 /*
@@ -469,9 +469,9 @@ handle_page_fault:
        cmpwi   r3,0
        beq+    ret_from_except
        SAVE_NVGPRS(r1)
-       lwz     r0,TRAP(r1)
+       lwz     r0,_TRAP(r1)
        clrrwi  r0,r0,1
-       stw     r0,TRAP(r1)
+       stw     r0,_TRAP(r1)
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lwz     r4,_DAR(r1)
@@ -617,7 +617,7 @@ BEGIN_FTR_SECTION
        b       2b
 END_FTR_SECTION_IFSET(CPU_FTR_601)
        li      r10,-1
-       stw     r10,TRAP(r11)
+       stw     r10,_TRAP(r11)
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lis     r10,MSR_KERNEL@h
        ori     r10,r10,MSR_KERNEL@l
@@ -899,12 +899,12 @@ do_user_signal:                   /* r10 contains MSR_KERNEL here */
        SYNC
        MTMSRD(r10)             /* hard-enable interrupts */
        /* save r13-r31 in the exception frame, if not already done */
-       lwz     r3,TRAP(r1)
+       lwz     r3,_TRAP(r1)
        andi.   r0,r3,1
        beq     2f
        SAVE_NVGPRS(r1)
        rlwinm  r3,r3,0,0,30
-       stw     r3,TRAP(r1)
+       stw     r3,_TRAP(r1)
 2:     li      r3,0
        addi    r4,r1,STACK_FRAME_OVERHEAD
        bl      do_signal
@@ -936,12 +936,12 @@ nonrecoverable:
 BEGIN_FTR_SECTION
        blr
 END_FTR_SECTION_IFSET(CPU_FTR_601)
-       lwz     r3,TRAP(r1)
+       lwz     r3,_TRAP(r1)
        andi.   r0,r3,1
        beq     4f
        SAVE_NVGPRS(r1)
        rlwinm  r3,r3,0,0,30
-       stw     r3,TRAP(r1)
+       stw     r3,_TRAP(r1)
 4:     addi    r3,r1,STACK_FRAME_OVERHEAD
        bl      nonrecoverable_exception
        /* shouldn't return */

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index f8673f7b2b2db35abd654f8e2c9963dca49a997b..600ea19d08b58134ca5f4b6045a4cfd045899416 100644 (file)
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -294,7 +294,7 @@ label:                                              \
 
 #define EXC_XFER_TEMPLATE(n, hdlr, trap, copyee, tfer, ret)    \
        li      r10,trap;                                       \
-       stw     r10,TRAP(r11);                                  \
+       stw     r10,_TRAP(r11);                                 \
        li      r10,MSR_KERNEL;                                 \
        copyee(r10, r9);                                        \
        bl      tfer;                                           \

diff --git a/arch/powerpc/kernel/head_4xx.S b/arch/powerpc/kernel/head_4xx.S
index 10c261c6702199384dd8aa52444c1d81136f9081..2590e97f553901d666f27091ac79d220fa10708c 100644 (file)
--- a/arch/powerpc/kernel/head_4xx.S
+++ b/arch/powerpc/kernel/head_4xx.S
@@ -214,7 +214,7 @@ label:
 
 #define EXC_XFER_TEMPLATE(hdlr, trap, msr, copyee, tfer, ret)  \
        li      r10,trap;                                       \
-       stw     r10,TRAP(r11);                                  \
+       stw     r10,_TRAP(r11);                                 \
        lis     r10,msr@h;                                      \
        ori     r10,r10,msr@l;                                  \
        copyee(r10, r9);                                        \

diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index de0978742221ae6eb0ddfb7e6a60120c7c48c4fa..bc6d1ac55235aa80ecedcf8f70eb5cec8b213f24 100644 (file)
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -175,7 +175,7 @@ label:                                              \
 
 #define EXC_XFER_TEMPLATE(n, hdlr, trap, copyee, tfer, ret)    \
        li      r10,trap;                                       \
-       stw     r10,TRAP(r11);                                  \
+       stw     r10,_TRAP(r11);                                 \
        li      r10,MSR_KERNEL;                                 \
        copyee(r10, r9);                                        \
        bl      tfer;                                           \