From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933955AbcI0UAH (ORCPT <rfc822;w@1wt.eu>);
        Tue, 27 Sep 2016 16:00:07 -0400
Received: from mout.kundenserver.de ([212.227.126.133]:51171 "EHLO
        mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1756100AbcI0UAD (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 27 Sep 2016 16:00:03 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the percpu tree with the asm-generic tree
Date: Tue, 27 Sep 2016 21:59:32 +0200
User-Agent: KMail/1.12.2 (Linux/4.7.0-rc7+; KDE/4.3.2; x86_64; ; )
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>
References: <20160927135434.0040b41c@canb.auug.org.au>
In-Reply-To: <20160927135434.0040b41c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201609272159.32261.arnd@arndb.de>
X-Provags-ID: V03:K0:sVerJffd89Bmg0b769M8FgmScX6hNH6tLw6woGkm+r/wvhMP8if
 8RaEWUg1E5y1zPXSfdf3IOBJ/iEK+izRWGgjeJfZoL3b3JwfBl+ezHF9/GDxZ3K14pADN/k
 fpxZPOBKvZjBc8hx+XRmCejln/HDCeCwWLMEVtExVcjCfgz0ctGF08AGTJ0UIpP0CKBaK+2
 vYBpWosaZUos67013OIRQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:mASFMiYCt3o=:Aoh4iHV9IjDeKElD6D2wNi
 zibDwtwSmRXeqjG2q0ETSJv9bBak1b8KtOJFwLWz32yJnqexuxiTGTrXD6rkPShOjVZE/LX2f
 F35GrlEP7VNN0TOgA0+6iF+aQ3QajFMtM1Ysccmj8iRoHpdnSgyRLspTpLPOaZEYqyDqGnHR9
 1B2JkpKE05fA3bHJlFpO7+eW1gudFIH3FinEv3bxCSF74jXKR4I4w4p/t+KH/w7Je1ctywBj9
 Vh5k3048z1b3BljsbN45lcB8/b0hAG2jlzCHKjr9u84z07yUAJOL83D140rhrofAQb9izMlga
 3jLNQEuN2vCgShklbYEu5M283Z11S+rZILfyc2y0OPE67L/HDq09w6Pw7bzC4BqZTGbvPXuI5
 tvmVwV/dXFi/eHLtUBdULnXvti8a9Izgj9YYeJu0/TRUEIESMNy5Rn0YTk2xh/1ojesfixnsO
 aBADU42dB2VTmJY1IsfaVvzY9gNNT7sN1R67S3cp1x3jf3nr/rAgcjQC4XRYd/yaIYgOYs8sd
 JiRST4pmdlGLteYoxuvQao65hrY+kyfrMvWSAuCozByEYwT9k/rsgPirl/pjaDa5llCH6OwG2
 QVqsJ6MiWrXNHw+pBRO66sQhpB49CFRgOJZmzYeHLBe2vNKMhhSypklpxNBd8sZv4S+CT8ubp
 Gju1U3zDts7dVPh2r9ECOdP1ew+ep+rB8v1OsedOPo5sJUIXvhAGhBu/JMR9QPfRgoMQQmJHw
 JphtN6IGWJ1AtWbr
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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