From a0ed69564177bf409d9cd71b0973578b4487313b Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paul.mckenney@linaro.org>
Date: Mon, 25 Jun 2012 12:54:17 -0700
Subject: [PATCH] --- yaml --- r: 312197 b: refs/heads/master c:
 cfca927972e31a5b3da49bf641c525732ff3c357 h: refs/heads/master i:   312195:
 ca80bf78958597c3e9879fefab3750bd6f2db2bc v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/rcutree.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 363ff988a70e..440ea4a7e538 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf01537ecf192d9ff15c32a355db5d5af22bea4d
+refs/heads/master: cfca927972e31a5b3da49bf641c525732ff3c357
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
index 95c7b61e77e4..4154c9567a6d 100644
--- a/trunk/kernel/rcutree.c
+++ b/trunk/kernel/rcutree.c
@@ -1612,6 +1612,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
 		rdp->n_force_qs_snap = rsp->n_force_qs;
 	} else if (rdp->qlen < rdp->qlen_last_fqs_check - qhimark)
 		rdp->qlen_last_fqs_check = rdp->qlen;
+	WARN_ON_ONCE((rdp->nxtlist == NULL) != (rdp->qlen == 0));
 
 	local_irq_restore(flags);