summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-06-13 15:20:39 +0000
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-06-14 16:03:32 -0700
commit05dbbfe753792dcebb6b85d84fa5926f09723cfe (patch)
tree1f0a2abb4384d8d4a2c8e627d9b055bad46df53d
parent65cbea5bbd32280f4620c20a6f651c37a6058752 (diff)
downloadlinux-stable-05dbbfe753792dcebb6b85d84fa5926f09723cfe.tar.gz
linux-stable-05dbbfe753792dcebb6b85d84fa5926f09723cfe.tar.bz2
linux-stable-05dbbfe753792dcebb6b85d84fa5926f09723cfe.zip
rcutorture: Fix error return code in rcu_perf_init()
Fix to return a negative error code -ENOMEM from kcalloc() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-rw-r--r--kernel/rcu/rcuperf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
index 7b2dbdffd791..d38ab08a3fe7 100644
--- a/kernel/rcu/rcuperf.c
+++ b/kernel/rcu/rcuperf.c
@@ -638,8 +638,10 @@ rcu_perf_init(void)
writer_durations[i] =
kcalloc(MAX_MEAS, sizeof(*writer_durations[i]),
GFP_KERNEL);
- if (!writer_durations[i])
+ if (!writer_durations[i]) {
+ firsterr = -ENOMEM;
goto unwind;
+ }
firsterr = torture_create_kthread(rcu_perf_writer, (void *)i,
writer_tasks[i]);
if (firsterr)