diff --git a/[refs] b/[refs] index cc1e4aa99a5b..f309f72a437a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 +refs/heads/master: e3d7be270c5b1be07ffadcc8b56599ad8e975c1d diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index 27003e2421c7..0c40c13c5402 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -196,7 +196,10 @@ static void rcu_stutter_wait(void) { while (stutter_pause_test || !rcutorture_runnable) - schedule_timeout_interruptible(1); + if (rcutorture_runnable) + schedule_timeout_interruptible(1); + else + schedule_timeout_interruptible(HZ); } /*