Commit 968d7764 authored Jan 04, 2021 by Arnd Bergmann

ia64: fix xchg() warning



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>

parent 796130b1

arch/ia64/include/uapi/asm/cmpxchg.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,