From 92e22ffa231f7dc2eaa4ae9e92cd4f293742a339 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josht@us.ibm.com>
Date: Wed, 4 Oct 2006 02:17:16 -0700
Subject: [PATCH] --- yaml --- r: 38455 b: refs/heads/master c:
 4b6c2cca6eef9cc4a15350bf1c61839e12e08b84 h: refs/heads/master i:   38453:
 3733568204ed79e54e455e8f645bc389e474055e   38451:
 c270ac5aa386c158a7bf50b618ffe6859042c309   38447:
 b696a7a795a45d88749d0bac474ade0e051d41c4 v: v3

---
 [refs]                              |  2 +-
 trunk/Documentation/RCU/torture.txt |  5 ++--
 trunk/kernel/rcutorture.c           | 40 ++++++++++++++++++++++++++++-
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 84aea4997a39..8b6b4f7d2435 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11a147013e39ff4cb031395cb78a9d307c4799cd
+refs/heads/master: 4b6c2cca6eef9cc4a15350bf1c61839e12e08b84
diff --git a/trunk/Documentation/RCU/torture.txt b/trunk/Documentation/RCU/torture.txt
index cc4b1efe5ea8..25a3c3f7d378 100644
--- a/trunk/Documentation/RCU/torture.txt
+++ b/trunk/Documentation/RCU/torture.txt
@@ -56,8 +56,9 @@ test_no_idle_hz	Whether or not to test the ability of RCU to operate in
 torture_type	The type of RCU to test: "rcu" for the rcu_read_lock() API,
 		"rcu_sync" for rcu_read_lock() with synchronous reclamation,
 		"rcu_bh" for the rcu_read_lock_bh() API, "rcu_bh_sync" for
-		rcu_read_lock_bh() with synchronous reclamation, and "srcu"
-		for the "srcu_read_lock()" API.
+		rcu_read_lock_bh() with synchronous reclamation, "srcu" for
+		the "srcu_read_lock()" API, and "sched" for the use of
+		preempt_disable() together with synchronize_sched().
 
 verbose		Enable debug printk()s.  Default is disabled.
 
diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c
index 0f0ff1556b5d..e2bda18f6f42 100644
--- a/trunk/kernel/rcutorture.c
+++ b/trunk/kernel/rcutorture.c
@@ -464,9 +464,47 @@ static struct rcu_torture_ops srcu_ops = {
 	.name = "srcu"
 };
 
+/*
+ * Definitions for sched torture testing.
+ */
+
+static int sched_torture_read_lock(void)
+{
+	preempt_disable();
+	return 0;
+}
+
+static void sched_torture_read_unlock(int idx)
+{
+	preempt_enable();
+}
+
+static int sched_torture_completed(void)
+{
+	return 0;
+}
+
+static void sched_torture_synchronize(void)
+{
+	synchronize_sched();
+}
+
+static struct rcu_torture_ops sched_ops = {
+	.init = rcu_sync_torture_init,
+	.cleanup = NULL,
+	.readlock = sched_torture_read_lock,
+	.readdelay = rcu_read_delay,  /* just reuse rcu's version. */
+	.readunlock = sched_torture_read_unlock,
+	.completed = sched_torture_completed,
+	.deferredfree = rcu_sync_torture_deferred_free,
+	.sync = sched_torture_synchronize,
+	.stats = NULL,
+	.name = "sched"
+};
+
 static struct rcu_torture_ops *torture_ops[] =
 	{ &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops, &srcu_ops,
-	  NULL };
+	  &sched_ops, NULL };
 
 /*
  * RCU torture writer kthread.  Repeatedly substitutes a new structure