diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2022-02-15 19:31:25 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-02-16 13:09:47 +0100 |
| commit | 76b372814b088aeb76f0f753d968c8aa6d297f2a (patch) | |
| tree | 72a77fe6ec26bcf2bfcb228dcb6aa23423ea9e91 /arch/powerpc/kernel | |
| parent | powerpc/ftrace: Have arch_ftrace_get_regs() return NULL unless FL_SAVE_REGS i... (diff) | |
| download | linux-76b372814b088aeb76f0f753d968c8aa6d297f2a.tar.xz linux-76b372814b088aeb76f0f753d968c8aa6d297f2a.zip | |
powerpc/ftrace: Style cleanup in ftrace_mprofile.S
Add some line breaks to better match the file's style, add
some space after comma and fix a couple of misplaced blanks.
Suggested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/973506292d0c7b05c06530c8e11803ce38e5eda2.1644949750.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/trace/ftrace_mprofile.S | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/trace/ftrace_mprofile.S b/arch/powerpc/kernel/trace/ftrace_mprofile.S index eb077270ec2f..89639e64acd1 100644 --- a/arch/powerpc/kernel/trace/ftrace_mprofile.S +++ b/arch/powerpc/kernel/trace/ftrace_mprofile.S @@ -87,8 +87,9 @@ _GLOBAL(ftrace_regs_caller) #endif #ifdef CONFIG_LIVEPATCH_64 - mr r14,r7 /* remember old NIP */ + mr r14, r7 /* remember old NIP */ #endif + /* Calculate ip from nip-4 into r3 for call below */ subi r3, r7, MCOUNT_INSN_SIZE @@ -102,7 +103,7 @@ _GLOBAL(ftrace_regs_caller) PPC_STL r11, _CCR(r1) /* Load &pt_regs in r6 for call below */ - addi r6, r1 ,STACK_FRAME_OVERHEAD + addi r6, r1, STACK_FRAME_OVERHEAD /* ftrace_call(r3, r4, r5, r6) */ .globl ftrace_regs_call @@ -113,6 +114,7 @@ ftrace_regs_call: /* Load ctr with the possibly modified NIP */ PPC_LL r3, _NIP(r1) mtctr r3 + #ifdef CONFIG_LIVEPATCH_64 cmpd r14, r3 /* has NIP been altered? */ #endif @@ -196,7 +198,7 @@ _GLOBAL(ftrace_caller) #ifdef CONFIG_LIVEPATCH_64 SAVE_GPR(14, r1) - mr r14,r7 /* remember old NIP */ + mr r14, r7 /* remember old NIP */ #endif /* Calculate ip from nip-4 into r3 for call below */ subi r3, r7, MCOUNT_INSN_SIZE @@ -210,7 +212,7 @@ _GLOBAL(ftrace_caller) PPC_STL r8, _MSR(r1) /* Load &pt_regs in r6 for call below */ - addi r6, r1 ,STACK_FRAME_OVERHEAD + addi r6, r1, STACK_FRAME_OVERHEAD /* ftrace_call(r3, r4, r5, r6) */ .globl ftrace_call @@ -220,6 +222,7 @@ ftrace_call: PPC_LL r3, _NIP(r1) mtctr r3 + #ifdef CONFIG_LIVEPATCH_64 cmpd r14, r3 /* has NIP been altered? */ REST_GPR(14, r1) @@ -244,6 +247,7 @@ ftrace_call: /* Based on the cmpd above, if the NIP was altered handle livepatch */ bne- livepatch_handler #endif + bctr /* jump after _mcount site */ #ifdef CONFIG_LIVEPATCH_64 |