- srcu-2-add-srcu-operations-to-rcutorture.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     srcu-2: add SRCU operations to rcutorture

has been removed from the -mm tree.  Its filename is

     srcu-2-add-srcu-operations-to-rcutorture.patch

This patch was dropped because an updated version was merged

------------------------------------------------------
Subject: srcu-2: add SRCU operations to rcutorture
From: "Paul E. McKenney" <paulmck@xxxxxxxxxx>

Adds SRCU operations to rcutorture and updates rcutorture documentation.

Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
DESC
srcu-2-add-srcu-operations-to-rcutorture-fix
EDESC

argh, zombiecode.

Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 kernel/rcutorture.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff -puN kernel/rcutorture.c~srcu-2-add-srcu-operations-to-rcutorture kernel/rcutorture.c
--- a/kernel/rcutorture.c~srcu-2-add-srcu-operations-to-rcutorture
+++ a/kernel/rcutorture.c
@@ -304,7 +304,7 @@ static void srcu_torture_cleanup(void)
 
 static int srcu_torture_read_lock(void)
 {
-	return (srcu_read_lock(&srcu_ctl));
+	return srcu_read_lock(&srcu_ctl);
 }
 
 static void srcu_torture_read_unlock(int idx)
@@ -348,11 +348,11 @@ static int srcu_torture_stats(char *page
 			torture_type, TORTURE_FLAG, idx);
 	for_each_possible_cpu(cpu) {
 		cnt += sprintf(&page[cnt], " %d(%d,%d)", cpu,
-			       srcu_ctl.per_cpu_ref[cpu].c[!idx],
-			       srcu_ctl.per_cpu_ref[cpu].c[idx]);
+			       per_cpu_ptr(srcu_ctl.per_cpu_ref, cpu)->c[!idx],
+			       per_cpu_ptr(srcu_ctl.per_cpu_ref, cpu)->c[idx]);
 	}
 	cnt += sprintf(&page[cnt], "\n");
-	return (cnt);
+	return cnt;
 }
 
 static struct rcu_torture_ops srcu_ops = {
@@ -693,14 +693,13 @@ rcu_torture_init(void)
 
 	for (i = 0; cur_ops = torture_ops[i], cur_ops != NULL; i++) {
 		cur_ops = torture_ops[i];
-		if (strcmp(torture_type, cur_ops->name) == 0) {
+		if (strcmp(torture_type, cur_ops->name) == 0)
 			break;
-		}
 	}
 	if (cur_ops == NULL) {
 		printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n",
 		       torture_type);
-		return (-EINVAL);
+		return -EINVAL;
 	}
 	if (cur_ops->init != NULL)
 		cur_ops->init(); /* no "goto unwind" prior to this point!!! */
_

Patches currently in -mm which might be from paulmck@xxxxxxxxxx are

rcu-documentation-fix.patch
radix-tree-rcu-lockless-readside.patch
adix-tree-rcu-lockless-readside-update.patch
srcu-3-rcu-variant-permitting-read-side-blocking.patch
srcu-3-add-srcu-operations-to-rcutorture.patch
srcu-2-add-srcu-operations-to-rcutorture.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux