From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-rt-users@vger.kernel.org
Cc: rostedt@goodmis.org, tglx@linutronix.de,
linux-kernel@vger.kernel.org, mingo@elte.hu
Subject: [PATCH -rt] apply rcu_process_callbacks() changes from mainline
Date: Fri, 1 Aug 2008 14:11:46 -0700 [thread overview]
Message-ID: <20080801211146.GG14851@linux.vnet.ibm.com> (raw)
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 <paulmck@linux.vnet.ibm.com>
---
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(-)
diff -urpNa -X dontdiff linux-2.6.26-rt1/include/linux/rcuclassic.h linux-2.6.26-rt1-rhf/include/linux/rcuclassic.h
--- linux-2.6.26-rt1/include/linux/rcuclassic.h 2008-07-30 05:42:42.000000000 -0700
+++ linux-2.6.26-rt1-rhf/include/linux/rcuclassic.h 2008-07-30 10:30:31.000000000 -0700
@@ -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 */
diff -urpNa -X dontdiff linux-2.6.26-rt1/include/linux/rcupreempt.h linux-2.6.26-rt1-rhf/include/linux/rcupreempt.h
--- linux-2.6.26-rt1/include/linux/rcupreempt.h 2008-07-30 05:42:41.000000000 -0700
+++ linux-2.6.26-rt1-rhf/include/linux/rcupreempt.h 2008-07-30 10:31:44.000000000 -0700
@@ -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 */
diff -urpNa -X dontdiff linux-2.6.26-rt1/kernel/rcuclassic.c linux-2.6.26-rt1-rhf/kernel/rcuclassic.c
--- linux-2.6.26-rt1/kernel/rcuclassic.c 2008-07-30 05:42:42.000000000 -0700
+++ linux-2.6.26-rt1-rhf/kernel/rcuclassic.c 2008-07-30 10:54:35.000000000 -0700
@@ -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);
-}
reply other threads:[~2008-08-01 21:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080801211146.GG14851@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).