From 58166c4289367ad8988e0ff109f15ca33fef56f3 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Tue, 31 Jan 2012 16:46:34 -0800 Subject: [PATCH] --- yaml --- r: 288579 b: refs/heads/master c: 7129d383d9f46eb8276bee5fb46df63f09a70130 h: refs/heads/master i: 288577: 93cb98489cb9e6c0b7eba0db1d27bb9b55e5eb8e 288575: 3bcbab84e01f31cb705d875085b5ceda716b276e v: v3 --- [refs] | 2 +- trunk/kernel/rcutorture.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a080f4495759..c44e84ecc815 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 236fefafe5d3d34b78ed2ccf5510909716112326 +refs/heads/master: 7129d383d9f46eb8276bee5fb46df63f09a70130 diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index 5cfa23be43bd..ed1c72bd9c09 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -1000,12 +1000,12 @@ static void rcu_torture_timer(unsigned long unused) rcu_read_lock_bh_held() || rcu_read_lock_sched_held() || srcu_read_lock_held(&srcu_ctl)); - do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu); if (p == NULL) { /* Leave because rcu_torture_writer is not yet underway */ cur_ops->readunlock(idx); return; } + do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu); if (p->rtort_mbtest == 0) atomic_inc(&n_rcu_torture_mberror); spin_lock(&rand_lock); @@ -1063,13 +1063,13 @@ rcu_torture_reader(void *arg) rcu_read_lock_bh_held() || rcu_read_lock_sched_held() || srcu_read_lock_held(&srcu_ctl)); - do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu); if (p == NULL) { /* Wait for rcu_torture_writer to get underway */ cur_ops->readunlock(idx); schedule_timeout_interruptible(HZ); continue; } + do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu); if (p->rtort_mbtest == 0) atomic_inc(&n_rcu_torture_mberror); cur_ops->read_delay(&rand);