Patchwork [1/6] powerpc: Move branch instruction from ACCOUNT_CPU_USER_ENTRY to caller

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Nov. 15, 2012, 12:40 a.m.
Message ID <1352940045.23412.38.camel@pasglop>
Download mbox | patch
Permalink /patch/199084/
State Not Applicable
Headers show

Comments

Benjamin Herrenschmidt - Nov. 15, 2012, 12:40 a.m.
On Tue, 2012-10-30 at 23:51 -0700, Haren Myneni wrote:
        ld      r4,excf+EX_R11(r13);    /* get back r11 */                  \
        mfspr   r5,SPRN_SPRG_GEN_SCRATCH;/* get back r13 */                 \
        std     r12,GPR12(r1);          /* save r12 in stackframe */        \


Please , please, please ... at the very least TEST BUILD the stuff you
change... I'm fixing that one up here this time.

Ben.

Patch

--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -159,8 +159,9 @@  exc_##n##_common:                                                       \
        std     r9,GPR9(r1);            /* save r9 in stackframe */         \
        std     r10,_NIP(r1);           /* save SRR0 to stackframe */       \
        std     r11,_MSR(r1);           /* save SRR1 to stackframe */       \
+       beq     1f                      /* if from kernel mode */

Missing semicolon

        ACCOUNT_CPU_USER_ENTRY(r10,r11);/* accounting (uses cr0+eq) */      \
-       ld      r3,excf+EX_R10(r13);    /* get back r10 */                  \
+1:     ld      r3,excf+EX_R10(r13);    /* get back r10 */                  \