From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca,
josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de,
peterz@infradead.org, rostedt@goodmis.org,
Valdis.Kletnieks@vt.edu, dhowells@redhat.com,
edumazet@google.com, darren@dvhart.com, fweisbec@gmail.com,
sbw@mit.edu, "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH tip/core/rcu 08/12] rcu: Remove the CONFIG_TINY_RCU ifdefs in rcutiny.h
Date: Fri, 12 Apr 2013 16:48:27 -0700 [thread overview]
Message-ID: <1365810511-24811-8-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <1365810511-24811-1-git-send-email-paulmck@linux.vnet.ibm.com>
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Now that CONFIG_TINY_PREEMPT_RCU is no more, this commit removes
the CONFIG_TINY_RCU ifdefs from include/linux/rcutiny.h in favor of
unconditionally compiling the CONFIG_TINY_RCU legs of those ifdefs.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
include/linux/rcutiny.h | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
index 592fad8..07b5aff 100644
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
@@ -37,8 +37,6 @@ static inline void rcu_barrier_sched(void)
wait_rcu_gp(call_rcu_sched);
}
-#ifdef CONFIG_TINY_RCU
-
static inline void synchronize_rcu_expedited(void)
{
synchronize_sched(); /* Only one CPU, so pretty fast anyway!!! */
@@ -49,17 +47,6 @@ static inline void rcu_barrier(void)
rcu_barrier_sched(); /* Only one CPU, so only one list of callbacks! */
}
-#else /* #ifdef CONFIG_TINY_RCU */
-
-void synchronize_rcu_expedited(void);
-
-static inline void rcu_barrier(void)
-{
- wait_rcu_gp(call_rcu);
-}
-
-#endif /* #else #ifdef CONFIG_TINY_RCU */
-
static inline void synchronize_rcu_bh(void)
{
synchronize_sched();
@@ -81,8 +68,6 @@ static inline void kfree_call_rcu(struct rcu_head *head,
call_rcu(head, func);
}
-#ifdef CONFIG_TINY_RCU
-
static inline void rcu_preempt_note_context_switch(void)
{
}
@@ -93,19 +78,6 @@ static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
return 0;
}
-#else /* #ifdef CONFIG_TINY_RCU */
-
-void rcu_preempt_note_context_switch(void);
-int rcu_preempt_needs_cpu(void);
-
-static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
-{
- *delta_jiffies = ULONG_MAX;
- return rcu_preempt_needs_cpu();
-}
-
-#endif /* #else #ifdef CONFIG_TINY_RCU */
-
static inline void rcu_note_context_switch(int cpu)
{
rcu_sched_qs(cpu);
--
1.8.1.5
next prev parent reply other threads:[~2013-04-12 23:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-12 23:48 [PATCH tip/core/rcu 0/12] TINY_RCU changes for 3.11 Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 01/12] rcu: Remove TINY_PREEMPT_RCU Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 02/12] rcu: Remove show_tiny_preempt_stats() Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 03/12] rcu: Remove rcu_preempt_check_callbacks() Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 04/12] rcu: Remove rcu_preempt_remove_callbacks() Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 05/12] rcu: Remove rcu_preempt_process_callbacks() Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 06/12] rcu: Simplify RCU_TINY RCU callback invocation Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 07/12] rcu: Remove check_cpu_stall_preempt() Paul E. McKenney
2013-04-12 23:48 ` Paul E. McKenney [this message]
2013-04-13 18:28 ` [PATCH tip/core/rcu 08/12] rcu: Remove the CONFIG_TINY_RCU ifdefs in rcutiny.h Josh Triplett
2013-04-12 23:48 ` [PATCH tip/core/rcu 09/12] rcu: Remove rcu_preempt_note_context_switch() Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 10/12] rcu: Consolidate rcutiny_plugin.h ifdefs Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 11/12] rcu: Remove TINY_PREEMPT_RCU tracing documentation Paul E. McKenney
2013-04-12 23:48 ` [PATCH tip/core/rcu 12/12] rcu: Shrink TINY_RCU by moving exit_rcu() Paul E. McKenney
2013-04-13 18:30 ` [PATCH tip/core/rcu 0/12] TINY_RCU changes for 3.11 Josh Triplett
2013-04-13 19:38 ` Paul E. McKenney
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=1365810511-24811-8-git-send-email-paulmck@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=Valdis.Kletnieks@vt.edu \
--cc=akpm@linux-foundation.org \
--cc=darren@dvhart.com \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=josh@joshtriplett.org \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--cc=niv@us.ibm.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sbw@mit.edu \
--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
all inboxes | Powered by JetHome®