aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/stacktrace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-02 18:04:42 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-02 18:04:42 (GMT)
commit4fb5741c7c5defd88046f570694fc3249479f36f (patch)
tree73e76b26f1da72a490d9192e107d398e376b7576 /kernel/stacktrace.c
parenta68dc6188242e1cc6f72eb3361e71633b4bc02a7 (diff)
parent7eaf51a2e094229b75cc0c315f1cbbe2f3960058 (diff)
downloadkernel_replicant_linux-4fb5741c7c5defd88046f570694fc3249479f36f.zip
kernel_replicant_linux-4fb5741c7c5defd88046f570694fc3249479f36f.tar.gz
kernel_replicant_linux-4fb5741c7c5defd88046f570694fc3249479f36f.tar.bz2
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull stacktrace fix from Ingo Molnar: "Fix a stack_trace_save_tsk_reliable() regression" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: stacktrace: Unbreak stack_trace_save_tsk_reliable()
Diffstat (limited to 'kernel/stacktrace.c')
-rw-r--r--kernel/stacktrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index 5667f1d..36139de 100644
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
@@ -207,7 +207,7 @@ int stack_trace_save_tsk_reliable(struct task_struct *tsk, unsigned long *store,
ret = arch_stack_walk_reliable(consume_entry, &c, tsk);
put_task_stack(tsk);
- return ret;
+ return ret ? ret : c.len;
}
#endif