diff options
| author |   Vasily Gorbik <gor@linux.ibm.com> | 2019-11-22 12:35:34 +0100 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2019-11-30 10:52:45 +0100 |
| commit | 103b4cca60d2c8c51f1290cc984b7046ccb8b46d (patch) | |
| tree | 505c6574f045baadc36ddc70154e3a433a45a2e9 /arch/s390 | |
| parent | s390: disable preemption when switching to nodat stack with CALL_ON_STACK (diff) | |
| download | linux-dev-103b4cca60d2c8c51f1290cc984b7046ccb8b46d.tar.xz linux-dev-103b4cca60d2c8c51f1290cc984b7046ccb8b46d.zip | |
s390/unwind: unify task is current checks
Avoid mixture of task == NULL and task == current meaning the same
thing and simply always initialize task with current in unwind_start.
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/stacktrace.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/unwind.h | 3 | ||||
| -rw-r--r-- | arch/s390/kernel/dumpstack.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/s390/include/asm/stacktrace.h b/arch/s390/include/asm/stacktrace.h index fee40212af11..0ae4bbf7779c 100644 --- a/arch/s390/include/asm/stacktrace.h +++ b/arch/s390/include/asm/stacktrace.h @@ -38,7 +38,7 @@ static inline unsigned long get_stack_pointer(struct task_struct *task, { if (regs) return (unsigned long) kernel_stack_pointer(regs); - if (!task || task == current) + if (task == current) return current_stack_pointer(); return (unsigned long) task->thread.ksp; } diff --git a/arch/s390/include/asm/unwind.h b/arch/s390/include/asm/unwind.h index eaaefeceef6f..a2d8dd766987 100644 --- a/arch/s390/include/asm/unwind.h +++ b/arch/s390/include/asm/unwind.h @@ -61,7 +61,8 @@ static inline void unwind_start(struct unwind_state *state, struct pt_regs *regs, unsigned long sp) { - sp = sp ? : get_stack_pointer(task, regs); + task = task ?: current; + sp = sp ?: get_stack_pointer(task, regs); __unwind_start(state, task, regs, sp); } diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c index 34bdc60c0b11..fc442aec0d96 100644 --- a/arch/s390/kernel/dumpstack.c +++ b/arch/s390/kernel/dumpstack.c @@ -93,8 +93,6 @@ int get_stack_info(unsigned long sp, struct task_struct *task, if (!sp) goto unknown; - task = task ? : current; - /* Check per-task stack */ if (in_task_stack(sp, task, info)) goto recursion_check; @@ -128,8 +126,6 @@ void show_stack(struct task_struct *task, unsigned long *stack) struct unwind_state state; printk("Call Trace:\n"); - if (!task) - task = current; unwind_for_each_frame(&state, task, NULL, (unsigned long) stack) printk(state.reliable ? " [<%016lx>] %pSR \n" : "([<%016lx>] %pSR)\n", |