From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Subject: Re: linux-next: manual merge of the rcu tree with the tip tree
Date: Sun, 23 Feb 2014 20:42:00 -0800 [thread overview]
Message-ID: <20140224044159.GG8264@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140224151801.198f04c4341f449d9eae09d4@canb.auug.org.au>
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@canb.auug.org.au
>
> 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 =
next prev parent reply other threads:[~2014-02-24 4:42 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 4:18 linux-next: manual merge of the rcu tree with the tip tree Stephen Rothwell
2014-02-24 4:42 ` Paul E. McKenney [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 1:55 Stephen Rothwell
2022-04-06 2:45 Stephen Rothwell
2022-04-06 16:28 ` Paul E. McKenney
2022-02-21 18:17 broonie
2021-10-12 4:48 Stephen Rothwell
2021-10-13 16:31 ` Paul E. McKenney
2021-08-17 7:09 Stephen Rothwell
2021-06-23 5:33 Stephen Rothwell
2021-06-22 4:51 Stephen Rothwell
2021-06-22 4:47 Stephen Rothwell
2021-06-22 5:04 ` Stephen Rothwell
2021-06-22 17:10 ` Paul E. McKenney
2020-10-09 4:59 Stephen Rothwell
2020-07-29 6:23 Stephen Rothwell
2020-06-26 3:14 Stephen Rothwell
2020-06-25 2:44 Stephen Rothwell
2020-06-25 3:44 ` Paul E. McKenney
2020-06-24 3:04 Stephen Rothwell
2020-06-24 4:06 ` Paul E. McKenney
2020-05-29 6:22 Stephen Rothwell
2020-05-29 6:41 ` Stephen Rothwell
2020-05-29 14:15 ` Paul E. McKenney
2020-05-29 23:38 ` Stephen Rothwell
2020-03-25 3:08 Stephen Rothwell
2020-03-25 3:18 ` Paul E. McKenney
2020-03-25 21:31 ` Paul E. McKenney
2019-12-19 0:50 Stephen Rothwell
2019-12-19 1:27 ` Paul E. McKenney
2019-12-19 1:31 ` Paul E. McKenney
2019-12-19 8:41 ` Peter Zijlstra
2019-12-19 13:38 ` Paul E. McKenney
2019-12-16 23:37 Stephen Rothwell
2018-06-22 2:27 Stephen Rothwell
2018-06-26 19:33 ` Paul E. McKenney
2017-11-10 2:14 Stephen Rothwell
2017-08-22 4:13 Stephen Rothwell
2017-07-31 3:50 Stephen Rothwell
2017-07-31 16:13 ` Paul E. McKenney
2017-08-01 0:04 ` Mathieu Desnoyers
2017-08-01 4:03 ` Paul E. McKenney
2017-08-01 4:25 ` Mathieu Desnoyers
2017-08-01 16:31 ` Paul E. McKenney
2017-08-01 13:43 ` Andy Lutomirski
2017-08-01 13:58 ` Peter Zijlstra
2017-08-01 14:15 ` Peter Zijlstra
2017-08-01 14:17 ` Andy Lutomirski
2017-08-01 14:02 ` Mathieu Desnoyers
2017-08-01 14:15 ` Andy Lutomirski
2017-08-01 15:40 ` Mathieu Desnoyers
2017-08-01 21:36 ` Paul E. McKenney
2016-07-18 5:26 Stephen Rothwell
2016-07-19 3:00 ` Paul E. McKenney
2016-06-09 5:14 Stephen Rothwell
2016-06-09 15:59 ` Paul E. McKenney
2016-03-04 4:13 Stephen Rothwell
2016-03-04 15:04 ` Paul E. McKenney
2015-07-16 2:57 Stephen Rothwell
2015-05-07 3:56 Stephen Rothwell
2012-09-05 3:59 Stephen Rothwell
2012-09-05 16:39 ` Paul E. McKenney
2012-09-05 17:11 ` Peter Zijlstra
2012-08-23 3:01 Stephen Rothwell
2012-08-23 3:22 ` Paul E. McKenney
2012-08-22 4:27 Stephen Rothwell
2012-08-22 5:05 ` Paul E. McKenney
2012-08-22 4:27 Stephen Rothwell
2012-08-22 5:03 ` Paul E. McKenney
2011-06-20 4:47 Stephen Rothwell
2011-06-20 15:17 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140224044159.GG8264@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=yangds.fnst@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).