Skip to content

Commit b2f64cf

Browse files
chleroymaddy-kerneldev
authored andcommitted
powerpc: Don't use --- in kernel logs
When a kernel log containing --- at the start of a line is copied into a patch message, 'git am' drops everything located after that ---. Replace --- by ---- to avoid that. Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: Madhavan Srinivasan <[email protected]> Link: https://patch.msgid.link/54a1f8d2c3fb5b95434039724c8c141052ae5cc0.1739346038.git.christophe.leroy@csgroup.eu
1 parent 882b25a commit b2f64cf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/powerpc/kernel/process.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,15 @@ static inline void tm_reclaim_task(struct task_struct *tsk)
10001000

10011001
WARN_ON(tm_suspend_disabled);
10021002

1003-
TM_DEBUG("--- tm_reclaim on pid %d (NIP=%lx, "
1003+
TM_DEBUG("---- tm_reclaim on pid %d (NIP=%lx, "
10041004
"ccr=%lx, msr=%lx, trap=%lx)\n",
10051005
tsk->pid, thr->regs->nip,
10061006
thr->regs->ccr, thr->regs->msr,
10071007
thr->regs->trap);
10081008

10091009
tm_reclaim_thread(thr, TM_CAUSE_RESCHED);
10101010

1011-
TM_DEBUG("--- tm_reclaim on pid %d complete\n",
1011+
TM_DEBUG("---- tm_reclaim on pid %d complete\n",
10121012
tsk->pid);
10131013

10141014
out_and_saveregs:
@@ -2367,14 +2367,14 @@ void __no_sanitize_address show_stack(struct task_struct *tsk,
23672367
(sp + STACK_INT_FRAME_REGS);
23682368

23692369
lr = regs->link;
2370-
printk("%s--- interrupt: %lx at %pS\n",
2370+
printk("%s---- interrupt: %lx at %pS\n",
23712371
loglvl, regs->trap, (void *)regs->nip);
23722372

23732373
// Detect the case of an empty pt_regs at the very base
23742374
// of the stack and suppress showing it in full.
23752375
if (!empty_user_regs(regs, tsk)) {
23762376
__show_regs(regs);
2377-
printk("%s--- interrupt: %lx\n", loglvl, regs->trap);
2377+
printk("%s---- interrupt: %lx\n", loglvl, regs->trap);
23782378
}
23792379

23802380
firstframe = 1;

arch/powerpc/xmon/xmon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,7 @@ static void xmon_show_stack(unsigned long sp, unsigned long lr,
17701770
sp + STACK_INT_FRAME_REGS);
17711771
break;
17721772
}
1773-
printf("--- Exception: %lx %s at ", regs.trap,
1773+
printf("---- Exception: %lx %s at ", regs.trap,
17741774
getvecname(TRAP(&regs)));
17751775
pc = regs.nip;
17761776
lr = regs.link;

0 commit comments

Comments
 (0)