| From 95ceed6a10dc5dd0fdf79a5a69d713d924bb645b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 21 Sep 2020 13:43:25 +0200 |
| Subject: um: Clean up stacktrace dump |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ Upstream commit 273fe1b676cb59d41e177980a981e27806872954 ] |
| |
| We currently get a few stray newlines, due to the interaction |
| between printk() and the code here. Remove a few explicit |
| newline prints to neaten the output. |
| |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Stable-dep-of: 0f659ff362ea ("um: Always dump trace for specified task in show_stack") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/um/kernel/sysrq.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c |
| index 1b54b6431499b..47f20304af26a 100644 |
| --- a/arch/um/kernel/sysrq.c |
| +++ b/arch/um/kernel/sysrq.c |
| @@ -47,14 +47,12 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack, |
| if (kstack_end(stack)) |
| break; |
| if (i && ((i % STACKSLOTS_PER_LINE) == 0)) |
| - printk("%s\n", loglvl); |
| + pr_cont("\n"); |
| pr_cont(" %08lx", *stack++); |
| } |
| - printk("%s\n", loglvl); |
| |
| printk("%sCall Trace:\n", loglvl); |
| dump_trace(current, &stackops, (void *)loglvl); |
| - printk("%s\n", loglvl); |
| } |
| |
| void show_stack(struct task_struct *task, unsigned long *stack) |
| -- |
| 2.43.0 |
| |
