On Mon, Feb 24, 2014 at 03:18:01PM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in
> kernel/rcu/rcutorture.c between commit d277d868dab6 ("rcu: Use MAX_NICE
> to replace hardcoding of 19") from the tip tree (where this file is
> called kernel/rcu/torture.c) and commit 5ccf60f23d33 ("rcutorture: Rename
> PRINTK to TOROUT") from the rcu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hello, Stephen,
Looks correct at first glance, thank you!
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc kernel/rcu/rcutorture.c
> index 219761db1a46,f59d48597dde..000000000000
> --- a/kernel/rcu/rcutorture.c
> +++ b/kernel/rcu/rcutorture.c
> @@@ -802,10 -693,10 +693,10 @@@ rcu_torture_writer(void *arg
> struct rcu_torture *rp;
> struct rcu_torture *rp1;
> struct rcu_torture *old_rp;
> - static DEFINE_RCU_RANDOM(rand);
> + static DEFINE_TORTURE_RANDOM(rand);
>
> - VERBOSE_PRINTK_STRING("rcu_torture_writer task started");
> + VERBOSE_TOROUT_STRING("rcu_torture_writer task started");
> - set_user_nice(current, 19);
> + set_user_nice(current, MAX_NICE);
>
> do {
> schedule_timeout_uninterruptible(1);
> @@@ -868,19 -756,19 +756,19 @@@
> static int
> rcu_torture_fakewriter(void *arg)
> {
> - DEFINE_RCU_RANDOM(rand);
> + DEFINE_TORTURE_RANDOM(rand);
>
> - VERBOSE_PRINTK_STRING("rcu_torture_fakewriter task started");
> + VERBOSE_TOROUT_STRING("rcu_torture_fakewriter task started");
> - set_user_nice(current, 19);
> + set_user_nice(current, MAX_NICE);
>
> do {
> - schedule_timeout_uninterruptible(1 + rcu_random(&rand)%10);
> - udelay(rcu_random(&rand) & 0x3ff);
> + schedule_timeout_uninterruptible(1 + torture_random(&rand)%10);
> + udelay(torture_random(&rand) & 0x3ff);
> if (cur_ops->cb_barrier != NULL &&
> - rcu_random(&rand) % (nfakewriters * 8) == 0) {
> + torture_random(&rand) % (nfakewriters * 8) == 0) {
> cur_ops->cb_barrier();
> } else if (gp_normal == gp_exp) {
> - if (rcu_random(&rand) & 0x80)
> + if (torture_random(&rand) & 0x80)
> cur_ops->sync();
> else
> cur_ops->exp_sync();
> @@@ -986,8 -871,8 +871,8 @@@ rcu_torture_reader(void *arg
> struct timer_list t;
> unsigned long long ts;
>
> - VERBOSE_PRINTK_STRING("rcu_torture_reader task started");
> + VERBOSE_TOROUT_STRING("rcu_torture_reader task started");
> - set_user_nice(current, 19);
> + set_user_nice(current, MAX_NICE);
> if (irqreader && cur_ops->irq_capable)
> setup_timer_on_stack(&t, rcu_torture_timer, 0);
>
> @@@ -1583,8 -1160,8 +1160,8 @@@ static int rcu_torture_barrier_cbs(voi
> struct rcu_head rcu;
>
> init_rcu_head_on_stack(&rcu);
> - VERBOSE_PRINTK_STRING("rcu_torture_barrier_cbs task started");
> + VERBOSE_TOROUT_STRING("rcu_torture_barrier_cbs task started");
> - set_user_nice(current, 19);
> + set_user_nice(current, MAX_NICE);
> do {
> wait_event(barrier_cbs_wq[myid],
> (newphase =
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
