Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jun 2019 18:04:42 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jun 2019 18:04:42 +0000 (11:04 -0700)
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()

1  2 
kernel/stacktrace.c

diff --combined kernel/stacktrace.c
index 5667f1da3eded0ee81ea430179b73ee8a9c2b6ce,90d3e0bf0302dbe39a8ea4913bddab3cfacfb6a5..36139de0a3c4bcb7ba7da936a8d43fba08aa5929
@@@ -1,4 -1,3 +1,4 @@@
 +// SPDX-License-Identifier: GPL-2.0-only
  /*
   * kernel/stacktrace.c
   *
@@@ -207,7 -206,7 +207,7 @@@ int stack_trace_save_tsk_reliable(struc
  
        ret = arch_stack_walk_reliable(consume_entry, &c, tsk);
        put_task_stack(tsk);
-       return ret;
+       return ret ? ret : c.len;
  }
  #endif