From 6aa972775902f7f2e730207135d42e5cf86b5955 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paul.mckenney@linaro.org>
Date: Tue, 29 May 2012 17:50:51 -0700
Subject: [PATCH] --- yaml --- r: 312179 b: refs/heads/master c:
 72472a02a9c4507ef54d03d71bb253c26015f52c h: refs/heads/master i:   312177:
 c06b2dfb0743b384745b7e15275ca33d28266363   312175:
 c88c45fb56f83331084c778e0385cfb92352699d v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/rcutorture.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2491f74fce9d..ad425ef7fef4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 143aa672f4fc643420c8325ad09c379ed33a27cf
+refs/heads/master: 72472a02a9c4507ef54d03d71bb253c26015f52c
diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c
index 045a3dc233ea..c279ee920947 100644
--- a/trunk/kernel/rcutorture.c
+++ b/trunk/kernel/rcutorture.c
@@ -1025,7 +1025,11 @@ rcu_torture_fakewriter(void *arg)
 	do {
 		schedule_timeout_uninterruptible(1 + rcu_random(&rand)%10);
 		udelay(rcu_random(&rand) & 0x3ff);
-		cur_ops->sync();
+		if (cur_ops->cb_barrier != NULL &&
+		    rcu_random(&rand) % (nfakewriters * 8) == 0)
+			cur_ops->cb_barrier();
+		else
+			cur_ops->sync();
 		rcu_stutter_wait("rcu_torture_fakewriter");
 	} while (!kthread_should_stop() && fullstop == FULLSTOP_DONTSTOP);