[PATCH] ia64: fix xchg() warning

[PATCH] ia64: fix xchg() warning

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The definition if xchg() causes a harmless warning in some files, like:

In file included from ../arch/ia64/include/uapi/asm/intrinsics.h:22,
                 from ../arch/ia64/include/asm/intrinsics.h:11,
                 from ../arch/ia64/include/asm/bitops.h:19,
                 from ../include/linux/bitops.h:32,
                 from ../include/linux/kernel.h:11,
                 from ../fs/nfs/read.c:12:
../fs/nfs/read.c: In function 'nfs_read_completion':
../arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value]
   57 | ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr))))
      | ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../fs/nfs/read.c:196:5: note: in expansion of macro 'xchg'
  196 |     xchg(&nfs_req_openctx(req)->error, error);
      |     ^~~~

Change it to a compound expression like the other architectures have
to get a clean defconfig build.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/ia64/include/uapi/asm/cmpxchg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/ia64/include/uapi/asm/cmpxchg.h b/arch/ia64/include/uapi/asm/cmpxchg.h
index d69c979936d4..5d90307fd6e0 100644
--- a/arch/ia64/include/uapi/asm/cmpxchg.h
+++ b/arch/ia64/include/uapi/asm/cmpxchg.h
@@ -54,7 +54,7 @@ extern void ia64_xchg_called_with_bad_pointer(void);
 })
 
 #define xchg(ptr, x)							\
-((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr))))
+({(__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)));})
 
 /*
  * Atomic compare and exchange.  Compare OLD with MEM, if identical,
-- 
2.29.2

Re: [PATCH] ia64: fix xchg() warning

[John Paul Adrian Glaubitz]

Hi Arnd!

On 1/4/21 9:58 AM, Arnd Bergmann wrote:
> Change it to a compound expression like the other architectures have
> to get a clean defconfig build.

Slightly OT: Has your other fix for the timer regression on ia64 already been
merged? I can test this patch later today.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH] ia64: fix xchg() warning

[Arnd Bergmann]

On Mon, Jan 4, 2021 at 10:06 AM John Paul Adrian Glaubitz
<glaubitz@physik.fu-berlin.de> wrote:
>
> Hi Arnd!
>
> On 1/4/21 9:58 AM, Arnd Bergmann wrote:
> > Change it to a compound expression like the other architectures have
> > to get a clean defconfig build.
>
> Slightly OT: Has your other fix for the timer regression on ia64 already been
> merged? I can test this patch later today.

I have not received any reply from the ia64 maintainers, I assume they were
both out of office for Christmas.

      Arnd

RE: [PATCH] ia64: fix xchg() warning

[Luck, Tony]

> I have not received any reply from the ia64 maintainers, I assume they were
> both out of office for Christmas.

I'm back in the office ... but have no working ia64 machines, nor time to look at patches :-(

Should drop me from the MAINTAINTERS file.

-Tony

Re: [PATCH] ia64: fix xchg() warning

[Arnd Bergmann]

On Mon, Jan 4, 2021 at 5:00 PM Luck, Tony <tony.luck@intel.com> wrote:
>
> > I have not received any reply from the ia64 maintainers, I assume they were
> > both out of office for Christmas.
>
> I'm back in the office ... but have no working ia64 machines, nor time to look at patches :-(
>
> Should drop me from the MAINTAINTERS file.

If you like, I can apply the patch below and take that through my
asm-generic tree along with the two bug fixes I sent:

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f2e55faaf7f..b74093803154 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8432,11 +8432,8 @@ F: drivers/i3c/
 F: include/linux/i3c/

 IA64 (Itanium) PLATFORM
-M: Tony Luck <tony.luck@intel.com>
-M: Fenghua Yu <fenghua.yu@intel.com>
 L: linux-ia64@vger.kernel.org
-S: Odd Fixes
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
+S: Orphan
 F: Documentation/ia64/
 F: arch/ia64/

Is that what you had in mind? I see that Fenghua Yu has not been
actively involved for a long time. If you are both out, that would
make the port unmaintained, but that may actually help find someone
else to either volunteer as a maintainer or pay someone if they
have a commercial interest.

    Arnd

Re: [PATCH] ia64: fix xchg() warning

[Luck, Tony]

On Tue, Jan 05, 2021 at 02:17:41PM +0100, Arnd Bergmann wrote:
> On Mon, Jan 4, 2021 at 5:00 PM Luck, Tony <tony.luck@intel.com> wrote:
> >
> > > I have not received any reply from the ia64 maintainers, I assume they were
> > > both out of office for Christmas.
> >
> > I'm back in the office ... but have no working ia64 machines, nor time to look at patches :-(
> >
> > Should drop me from the MAINTAINTERS file.
> 
> If you like, I can apply the patch below and take that through my
> asm-generic tree along with the two bug fixes I sent:
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0f2e55faaf7f..b74093803154 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -8432,11 +8432,8 @@ F: drivers/i3c/
>  F: include/linux/i3c/
> 
>  IA64 (Itanium) PLATFORM
> -M: Tony Luck <tony.luck@intel.com>
> -M: Fenghua Yu <fenghua.yu@intel.com>
>  L: linux-ia64@vger.kernel.org
> -S: Odd Fixes
> -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
> +S: Orphan
>  F: Documentation/ia64/
>  F: arch/ia64/
> 
> Is that what you had in mind? I see that Fenghua Yu has not been
> actively involved for a long time. If you are both out, that would
> make the port unmaintained, but that may actually help find someone
> else to either volunteer as a maintainer or pay someone if they
> have a commercial interest.

Yes. Fenghua has moved to working on other things, so that looks good.

Acked-by: Tony Luck <tony.luck@intel.com>

-Tony

Re: [PATCH] ia64: fix xchg() warning

[John Paul Adrian Glaubitz]

Hi!

On 1/5/21 4:36 PM, Luck, Tony wrote:
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 0f2e55faaf7f..b74093803154 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -8432,11 +8432,8 @@ F: drivers/i3c/
>>  F: include/linux/i3c/
>>
>>  IA64 (Itanium) PLATFORM
>> -M: Tony Luck <tony.luck@intel.com>
>> -M: Fenghua Yu <fenghua.yu@intel.com>
>>  L: linux-ia64@vger.kernel.org
>> -S: Odd Fixes
>> -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
>> +S: Orphan
>>  F: Documentation/ia64/
>>  F: arch/ia64/
>>
>> Is that what you had in mind? I see that Fenghua Yu has not been
>> actively involved for a long time. If you are both out, that would
>> make the port unmaintained, but that may actually help find someone
>> else to either volunteer as a maintainer or pay someone if they
>> have a commercial interest.
> 
> Yes. Fenghua has moved to working on other things, so that looks good.
> 
> Acked-by: Tony Luck <tony.luck@intel.com>

I wonder whether I can take over maintainership. I'm certainly not experienced as
Tony or Fenghua, but I guess one can grow with the task, can't one?

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913