From 5623c89b1911c61ce55e72f272685428abf95f9d Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 2 Feb 2012 07:52:54 -0800 Subject: [PATCH] --- yaml --- r: 288581 b: refs/heads/master c: 3c1b1ce00d2702d6be9b92233822e560f37ea780 h: refs/heads/master i: 288579: 58166c4289367ad8988e0ff109f15ca33fef56f3 v: v3 --- [refs] | 2 +- trunk/kernel/rcutorture.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 576bc08f9b24..7883ffb85eda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bde23c6892878e48f64de668660778991bc2fb56 +refs/heads/master: 3c1b1ce00d2702d6be9b92233822e560f37ea780 diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index ed1c72bd9c09..a89b381a8c6e 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -1465,12 +1465,15 @@ rcu_torture_onoff(void *arg) static int __cpuinit rcu_torture_onoff_init(void) { + int ret; + if (onoff_interval <= 0) return 0; onoff_task = kthread_run(rcu_torture_onoff, NULL, "rcu_torture_onoff"); if (IS_ERR(onoff_task)) { + ret = PTR_ERR(onoff_task); onoff_task = NULL; - return PTR_ERR(onoff_task); + return ret; } return 0; }