Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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()

diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index 5667f1d..36139de 100644 (file)
--- 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