diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-01-04 09:52:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-01-12 17:02:08 +0100 |
| commit | 968d7764e35b2fa4aad36481690b297e2c497c99 (patch) | |
| tree | 92930f8bccc50cf6511e780c01a35cc1295c4d33 /arch/ia64 | |
| parent | 796130b1de29575e2e3fc3b0da4bda162b750db7 (diff) | |
| download | linux-stable-968d7764e35b2fa4aad36481690b297e2c497c99.tar.gz linux-stable-968d7764e35b2fa4aad36481690b297e2c497c99.tar.bz2 linux-stable-968d7764e35b2fa4aad36481690b297e2c497c99.zip | |
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>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/uapi/asm/cmpxchg.h | 2 |
1 files changed, 1 insertions, 1 deletions
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, |