summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-02-23 09:56:00 -0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-05-05 23:16:57 -0700
commit108aae22339f445c134aeb48eca25df1014ab08d (patch)
tree34a5ecb48e93726932004d36edcd60275cd47ce6
parent561190e3b3db372403fb6a327b0121b4cae1b87e (diff)
downloadlinux-108aae22339f445c134aeb48eca25df1014ab08d.tar.bz2
rcu: Use WARN_ON_ONCE for DEBUG_OBJECTS_RCU_HEAD warnings
Avoid additional multiple-warning confusion in memory-corruption scenarios. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r--kernel/rcupdate.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index b54d6d18258c..7784bd216b6a 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -147,12 +147,12 @@ static int rcuhead_fixup_init(void *addr, enum debug_obj_state state)
* attempt any fixup and just print a warning.
*/
#ifndef CONFIG_PREEMPT
- WARN_ON(1);
+ WARN_ON_ONCE(1);
return 0;
#endif
if (rcu_preempt_depth() != 0 || preempt_count() != 0 ||
irqs_disabled()) {
- WARN_ON(1);
+ WARN_ON_ONCE(1);
return 0;
}
rcu_barrier();
@@ -196,12 +196,12 @@ static int rcuhead_fixup_activate(void *addr, enum debug_obj_state state)
* attempt any fixup and just print a warning.
*/
#ifndef CONFIG_PREEMPT
- WARN_ON(1);
+ WARN_ON_ONCE(1);
return 0;
#endif
if (rcu_preempt_depth() != 0 || preempt_count() != 0 ||
irqs_disabled()) {
- WARN_ON(1);
+ WARN_ON_ONCE(1);
return 0;
}
rcu_barrier();
@@ -233,12 +233,12 @@ static int rcuhead_fixup_free(void *addr, enum debug_obj_state state)
* attempt any fixup and just print a warning.
*/
#ifndef CONFIG_PREEMPT
- WARN_ON(1);
+ WARN_ON_ONCE(1);
return 0;
#endif
if (rcu_preempt_depth() != 0 || preempt_count() != 0 ||
irqs_disabled()) {
- WARN_ON(1);
+ WARN_ON_ONCE(1);
return 0;
}
rcu_barrier();