Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index b87aefa082e2..c2ec6c77874e 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -98,13 +98,17 @@ struct rcu_data {
         long            batch;           /* Batch # for current RCU batch */
         struct rcu_head *nxtlist;
         struct rcu_head **nxttail;
-        long            count; /* # of queued items */
+        long            qlen;            /* # of queued callbacks */
         struct rcu_head *curlist;
         struct rcu_head **curtail;
         struct rcu_head *donelist;
         struct rcu_head **donetail;
+        long            blimit;          /* Upper limit on a processed batch */
         int cpu;
         struct rcu_head barrier;
+#ifdef CONFIG_SMP
+        long            last_rs_qlen;    /* qlen during the last resched */
+#endif
 };
 
 DECLARE_PER_CPU(struct rcu_data, rcu_data);