rcu: Remove obsolete ->dynticks_fqs and ->cond_resched_completed (8d8a9d0e) · Commits · 戴 / test

kernel/rcu/tree.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+3 −9

Original line number	Diff line number	Diff line
		@@ -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. */