diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
tree | c7839809e35fce4868910742157e8ef96782b378 /kernel/stacktrace.c | |
parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/stacktrace.c')
-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, | |||
207 | 207 | ||
208 | ret = arch_stack_walk_reliable(consume_entry, &c, tsk); | 208 | ret = arch_stack_walk_reliable(consume_entry, &c, tsk); |
209 | put_task_stack(tsk); | 209 | put_task_stack(tsk); |
210 | return ret; | 210 | return ret ? ret : c.len; |
211 | } | 211 | } |
212 | #endif | 212 | #endif |
213 | 213 | ||