diff --git a/[refs] b/[refs] index feaf61d8adc1..f5c7a36c6996 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 016a8d5be6ddcc72ef0432d82d9f6fa34f61b907 +refs/heads/master: 971394f389992f8462c4e5ae0e3b49a10a9534a3 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index b61d20c5ee7b..35380019f0fc 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -1451,9 +1451,9 @@ static int rcu_gp_init(struct rcu_state *rsp) rnp->grphi, rnp->qsmask); raw_spin_unlock_irq(&rnp->lock); #ifdef CONFIG_PROVE_RCU_DELAY - if ((prandom_u32() % (rcu_num_nodes * 8)) == 0 && + if ((prandom_u32() % (rcu_num_nodes + 1)) == 0 && system_state == SYSTEM_RUNNING) - schedule_timeout_uninterruptible(2); + udelay(200); #endif /* #ifdef CONFIG_PROVE_RCU_DELAY */ cond_resched(); }