From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tejun Heo <tj@kernel.org>, Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Chunyan Zhang <zhang.chunyan@linaro.org>,
Nicholas Piggin <npiggin@gmail.com>
Subject: Re: linux-next: manual merge of the percpu tree with the asm-generic tree
Date: Tue, 27 Sep 2016 21:59:32 +0200 [thread overview]
Message-ID: <201609272159.32261.arnd@arndb.de> (raw)
In-Reply-To: <20160927135434.0040b41c@canb.auug.org.au>
On Tuesday 27 September 2016, Stephen Rothwell wrote:
> diff --cc include/asm-generic/percpu.h
> index 70fefec69e61,40e887068da2..000000000000
> --- a/include/asm-generic/percpu.h
> +++ b/include/asm-generic/percpu.h
> @@@ -108,9 -118,9 +118,9 @@@ do {
> #define this_cpu_generic_read(pcp) \
> ({ \
> typeof(pcp) __ret; \
> - preempt_disable(); \
> + preempt_disable_notrace(); \
> - __ret = *this_cpu_ptr(&(pcp)); \
> + __ret = raw_cpu_generic_read(pcp); \
> - preempt_enable(); \
> + preempt_enable_notrace(); \
> __ret; \
> })
>
The merge solution seems correct, but this is one of only two trivial
patches I have queued up for asm-generic this time, so I wonder if we could
put the _notrace patch into the percpu tree that already has the
raw_cpu_generic_read change to avoid the conflict.
Arnd
next prev parent reply other threads:[~2016-09-27 19:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 3:54 linux-next: manual merge of the percpu tree with the asm-generic tree Stephen Rothwell
2016-09-27 19:59 ` Arnd Bergmann [this message]
2016-09-27 20:01 ` Tejun Heo
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=201609272159.32261.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=npiggin@gmail.com \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
--cc=zhang.chunyan@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.