rcu: Remove obsolete ->dynticks_fqs and ->cond_resched_completed

The rcu_data structure's ->dynticks_fqs is incremented but never
accesses.  Its ->cond_resched_completed field isn't used at all.
This commit therefore removes both fields.

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

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 32f500fb24d3dfc8f9cefc4a1727bbb152e46c54..85c2c2dc4c4a0c92edc5662bf2b178e84b9d59c6 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -1039,7 +1039,6 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
         */
        if (rcu_dynticks_in_eqs_since(rdp, rdp->dynticks_snap)) {
                trace_rcu_fqs(rcu_state.name, rdp->gp_seq, rdp->cpu, TPS("dti"));
-               rdp->dynticks_fqs++;
                rcu_gpnum_ovf(rnp, rdp);
                return 1;
        }

diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index af8681fec23bf55ee48e77f8ae13749ef035fd95..bfbf97a1c29d439fffcf6d462c9761c6ddb2fec0 100644 (file)
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -203,17 +203,11 @@ struct rcu_data {
        int tick_nohz_enabled_snap;     /* Previously seen value from sysfs. */
 #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */
 
-       /* 4) reasons this CPU needed to be kicked by force_quiescent_state */
-       unsigned long dynticks_fqs;     /* Kicked due to dynticks idle. */
-       unsigned long cond_resched_completed;
-                                       /* Grace period that needs help */
-                                       /*  from cond_resched(). */
-
-       /* 5) rcu_barrier(), OOM callbacks, and expediting. */
+       /* 4) rcu_barrier(), OOM callbacks, and expediting. */
        struct rcu_head barrier_head;
        int exp_dynticks_snap;          /* Double-check need for IPI. */
 
-       /* 6) Callback offloading. */
+       /* 5) Callback offloading. */
 #ifdef CONFIG_RCU_NOCB_CPU
        struct rcu_head *nocb_head;     /* CBs waiting for kthread. */
        struct rcu_head **nocb_tail;
@@ -240,7 +234,7 @@ struct rcu_data {
                                        /* Leader CPU takes GP-end wakeups. */
 #endif /* #ifdef CONFIG_RCU_NOCB_CPU */
 
-       /* 7) Diagnostic data, including RCU CPU stall warnings. */
+       /* 6) Diagnostic data, including RCU CPU stall warnings. */
        unsigned int softirq_snap;      /* Snapshot of softirq activity. */
        /* ->rcu_iw* fields protected by leaf rcu_node ->lock. */
        struct irq_work rcu_iw;         /* Check for non-irq activity. */