mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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/13] rcu: Remove the CONFIG_TINY_RCU ifdefs in rcutiny.h
Date: Mon, 20 May 2013 07:58:15 -0700	[thread overview]
Message-ID: <1369061900-546-8-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <1369061900-546-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>
[ paulmck: Moved removal of #else to "Remove TINY_PREEMPT_RCU" as
  suggested by Josh Triplett. ]
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 include/linux/rcutiny.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
index e756251..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,8 +47,6 @@ static inline void rcu_barrier(void)
 	rcu_barrier_sched();  /* Only one CPU, so only one list of callbacks! */
 }
 
-#endif /* #ifdef CONFIG_TINY_RCU */
-
 static inline void synchronize_rcu_bh(void)
 {
 	synchronize_sched();
@@ -72,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)
 {
 }
@@ -84,8 +78,6 @@ static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
 	return 0;
 }
 
-#endif /* #ifdef CONFIG_TINY_RCU */
-
 static inline void rcu_note_context_switch(int cpu)
 {
 	rcu_sched_qs(cpu);
-- 
1.8.1.5


  parent reply	other threads:[~2013-05-20 14:58 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-20 14:57 [PATCH tip/core/rcu 0/13] v2 TINY_RCU changes for 3.11 Paul E. McKenney
2013-05-20 14:58 ` [PATCH tip/core/rcu 01/13] rcu: Remove TINY_PREEMPT_RCU Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 02/13] rcu: Remove show_tiny_preempt_stats() Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 03/13] rcu: Remove rcu_preempt_check_callbacks() Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 04/13] rcu: Remove rcu_preempt_remove_callbacks() Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 05/13] rcu: Remove rcu_preempt_process_callbacks() Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 06/13] rcu: Simplify RCU_TINY RCU callback invocation Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 07/13] rcu: Remove check_cpu_stall_preempt() Paul E. McKenney
2013-05-20 14:58   ` Paul E. McKenney [this message]
2013-05-20 14:58   ` [PATCH tip/core/rcu 09/13] rcu: Remove rcu_preempt_note_context_switch() Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 10/13] rcu: Consolidate rcutiny_plugin.h ifdefs Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 11/13] rcu: Remove TINY_PREEMPT_RCU tracing documentation Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 12/13] rcu: Shrink TINY_RCU by moving exit_rcu() Paul E. McKenney
2013-05-20 14:58   ` [PATCH tip/core/rcu 13/13] rcu: Shrink TINY_RCU by reworking CPU-stall ifdefs Paul E. McKenney
2013-05-21 17:31     ` Josh Triplett
2013-05-21 21:09       ` Paul E. McKenney
2013-05-21 21:48         ` Josh Triplett

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=1369061900-546-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

Powered by JetHome