diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 11:04:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 11:04:42 -0700 |
| commit | 4fb5741c7c5defd88046f570694fc3249479f36f (patch) | |
| tree | 73e76b26f1da72a490d9192e107d398e376b7576 | |
| parent | a68dc6188242e1cc6f72eb3361e71633b4bc02a7 (diff) | |
| parent | 7eaf51a2e094229b75cc0c315f1cbbe2f3960058 (diff) | |
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()
| -rw-r--r-- | kernel/stacktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c index 5667f1da3ede..36139de0a3c4 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 |