rcu: Remove orphan/adopt event-tracing fields

The rcu_node structure's ->n_cbs_orphaned and ->n_cbs_adopted fields
are updated, but never read.  This commit therefore removes them.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index f431114bc06a3ac92caeed4816ff12816c2dc4a3..f5acf34247fbbc62dd517b1af7df2d77eab4517a 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3871,7 +3871,6 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
         * because _rcu_barrier() excludes CPU-hotplug operations, so it
         * cannot be running now.  Thus no memory barrier is required.
         */
-       rdp->n_cbs_orphaned += rcu_segcblist_n_cbs(&rdp->cblist);
        rcu_segcblist_extract_count(&rdp->cblist, &rsp->orphan_done);
 
        /*
@@ -3910,7 +3909,6 @@ static void rcu_adopt_orphan_cbs(struct rcu_state *rsp, unsigned long flags)
                return;
 
        /* Do the accounting first. */
-       rdp->n_cbs_adopted += rsp->orphan_done.len;
        if (rsp->orphan_done.len_lazy != rsp->orphan_done.len)
                rcu_idle_count_callbacks_posted();
        rcu_segcblist_insert_count(&rdp->cblist, &rsp->orphan_done);

diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index 9af0f31d6847a0893e1d9070e08096281e806e63..aec53c4d4aeccfd7b216a1875dde1a21a976ecdd 100644 (file)
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -219,8 +219,6 @@ struct rcu_data {
                                        /* qlen at last check for QS forcing */
        unsigned long   n_cbs_invoked;  /* count of RCU cbs invoked. */
        unsigned long   n_nocbs_invoked; /* count of no-CBs RCU cbs invoked. */
-       unsigned long   n_cbs_orphaned; /* RCU cbs orphaned by dying CPU */
-       unsigned long   n_cbs_adopted;  /* RCU cbs adopted from dying CPU */
        unsigned long   n_force_qs_snap;
                                        /* did other CPU force QS recently? */
        long            blimit;         /* Upper limit on a processed batch */