diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-06-23 15:09:52 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-07-09 12:15:31 -0400 |
commit | 11992c703a1c7d95f5d8759498d7617d4a504819 (patch) | |
tree | fa2fff5b57493c4912c6b1f8e514fc61f4d792b5 /kernel/rcu | |
parent | d860d40327dde251d508a234fa00bd0d90fbb656 (diff) |
rcu: Remove CONFIG_PROVE_RCU_DELAY
The CONFIG_PROVE_RCU_DELAY Kconfig parameter doesn't appear to be very
effective at finding race conditions, so this commit removes it.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
[ paulmck: Remove definition and uses as noted by Paul Bolle. ]
Diffstat (limited to 'kernel/rcu')
-rw-r--r-- | kernel/rcu/tree.c | 5 | ||||
-rw-r--r-- | kernel/rcu/update.c | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index a6c5424ffa38..1b70cb6fbe3c 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
@@ -1647,11 +1647,6 @@ static int rcu_gp_init(struct rcu_state *rsp) | |||
1647 | rnp->level, rnp->grplo, | 1647 | rnp->level, rnp->grplo, |
1648 | rnp->grphi, rnp->qsmask); | 1648 | rnp->grphi, rnp->qsmask); |
1649 | raw_spin_unlock_irq(&rnp->lock); | 1649 | raw_spin_unlock_irq(&rnp->lock); |
1650 | #ifdef CONFIG_PROVE_RCU_DELAY | ||
1651 | if ((prandom_u32() % (rcu_num_nodes + 1)) == 0 && | ||
1652 | system_state == SYSTEM_RUNNING) | ||
1653 | udelay(200); | ||
1654 | #endif /* #ifdef CONFIG_PROVE_RCU_DELAY */ | ||
1655 | cond_resched(); | 1650 | cond_resched(); |
1656 | } | 1651 | } |
1657 | 1652 | ||
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c index bc7883570530..4056d7992a6c 100644 --- a/kernel/rcu/update.c +++ b/kernel/rcu/update.c | |||
@@ -90,9 +90,6 @@ void __rcu_read_unlock(void) | |||
90 | } else { | 90 | } else { |
91 | barrier(); /* critical section before exit code. */ | 91 | barrier(); /* critical section before exit code. */ |
92 | t->rcu_read_lock_nesting = INT_MIN; | 92 | t->rcu_read_lock_nesting = INT_MIN; |
93 | #ifdef CONFIG_PROVE_RCU_DELAY | ||
94 | udelay(10); /* Make preemption more probable. */ | ||
95 | #endif /* #ifdef CONFIG_PROVE_RCU_DELAY */ | ||
96 | barrier(); /* assign before ->rcu_read_unlock_special load */ | 93 | barrier(); /* assign before ->rcu_read_unlock_special load */ |
97 | if (unlikely(ACCESS_ONCE(t->rcu_read_unlock_special))) | 94 | if (unlikely(ACCESS_ONCE(t->rcu_read_unlock_special))) |
98 | rcu_read_unlock_special(t); | 95 | rcu_read_unlock_special(t); |