apply rcu_process_callbacks() changes from mainline

PATCH New Paul E. McKenney 1 participant 1 message Aug 1, 2008 RCU

Share & tools

Paul E. McKenney

author

2008-08-01 21:11 UTC #0 lore raw

PATCH 1/1 apply rcu_process_callbacks() changes from mainline

On its way to mainline, rcu_process_callbacks() became a static function and the unused function rcu_advance_callbacks() was removed. The attached patch adjusts -rt to better match mainline.

Signed-off-by Paul E. McKenney <[email protected]>

---

 include/linux/rcuclassic.h |    3 ---
 include/linux/rcupreempt.h |    2 --
 kernel/rcuclassic.c        |   13 +------------
 kernel/rcupreempt.c        |    2 +-
 4 files changed, 2 insertions(+), 18 deletions(-)

include/linux/rcuclassic.h +0 -3

diff -urpNa -X dontdiff linux-2.6.26-rt1/include/linux/rcuclassic.h linux-2.6.26-rt1-rhf/include/linux/rcuclassic.h
@@ -162,7 +162,4 @@ extern long rcu_batches_completed_bh(voi
 #define rcu_exit_nohz()		do { } while (0)
 #define rcu_preempt_boost_init() do { } while (0)
 
-struct softirq_action;
-extern void rcu_process_callbacks(struct softirq_action *unused);
-
 #endif /* __LINUX_RCUCLASSIC_H */

include/linux/rcupreempt.h +0 -2

diff -urpNa -X dontdiff linux-2.6.26-rt1/include/linux/rcupreempt.h linux-2.6.26-rt1-rhf/include/linux/rcupreempt.h
@@ -146,6 +146,4 @@ static inline void rcu_exit_nohz(void)
 #define rcu_exit_nohz()		do { } while (0)
 #endif /* CONFIG_NO_HZ */
 
-extern void rcu_process_callbacks(struct softirq_action *unused);
-
 #endif /* __LINUX_RCUPREEMPT_H */

kernel/rcuclassic.c +1 ~~-11~~

diff -urpNa -X dontdiff linux-2.6.26-rt1/kernel/rcuclassic.c linux-2.6.26-rt1-rhf/kernel/rcuclassic.c
@@ -458,7 +458,7 @@ static void __rcu_process_callbacks(stru
 		rcu_do_batch(rdp);
 }
 
-void rcu_process_callbacks(struct softirq_action *unused)
+static void rcu_process_callbacks(struct softirq_action *unused)
 {
 	__rcu_process_callbacks(&rcu_ctrlblk, &__get_cpu_var(rcu_data));
 	__rcu_process_callbacks(&rcu_bh_ctrlblk, &__get_cpu_var(rcu_bh_data));

@@ -513,17 +513,6 @@ int rcu_needs_cpu(int cpu)
 	return (!!rdp->curlist || !!rdp_bh->curlist || rcu_pending(cpu));
 }
 
-void rcu_advance_callbacks(int cpu, int user)
-{
-	if (user ||
-	    (idle_cpu(cpu) && !in_softirq() &&
-				hardirq_count() <= (1 << HARDIRQ_SHIFT))) {
-		rcu_qsctr_inc(cpu);
-		rcu_bh_qsctr_inc(cpu);
-	} else if (!in_softirq())
-		rcu_bh_qsctr_inc(cpu);
-}