linux-next: manual merge of the akpm tree with the rcu tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/rcutree.c between commit 3c62110a0cd6 ("rcu: Tone down debugging
during boot-up and shutdown") from the rcu tree and commit "kernel/:
rename random32() to prandom_u32()" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc kernel/rcutree.c
index 2d5f94c,2f8530b..0000000
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@@ -1441,8 -1319,7 +1441,8 @@@ static int rcu_gp_init(struct rcu_stat
  					    rnp->grphi, rnp->qsmask);
  		raw_spin_unlock_irq(&rnp->lock);
  #ifdef CONFIG_PROVE_RCU_DELAY
- 		if ((random32() % (rcu_num_nodes * 8)) == 0 &&
 -		if ((prandom_u32() % (rcu_num_nodes * 8)) == 0)
++		if ((prandom_u32() % (rcu_num_nodes * 8)) == 0 &&
 +		    system_state == SYSTEM_RUNNING)
  			schedule_timeout_uninterruptible(2);
  #endif /* #ifdef CONFIG_PROVE_RCU_DELAY */
  		cond_resched();

Attachment: pgp00000.pgp
Description: PGP signature