diff options
| author | Thorsten Blum <thorsten.blum@toblux.com> | 2024-07-02 05:41:17 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2024-07-09 09:19:31 +0200 |
| commit | 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 (patch) | |
| tree | 6e656afc5f65cadfe05f1be79d6b8db8902ab0f1 /arch/m68k/include/asm | |
| parent | m68k: defconfig: Update defconfigs for v6.10-rc1 (diff) | |
| download | linux-21b9e722ad28c19c2bc83f18f540b3dbd89bf762.tar.xz linux-21b9e722ad28c19c2bc83f18f540b3dbd89bf762.zip | |
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
The return value of __invalid_xchg_size() is assigned to tmp instead of
the return variable x. Assign it to x instead.
Fixes: 2501cf768e4009a0 ("m68k: Fix xchg/cmpxchg to fail to link if given an inappropriate pointer")
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/20240702034116.140234-2-thorsten.blum@toblux.com
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm')
| -rw-r--r-- | arch/m68k/include/asm/cmpxchg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h index d7f3de9c5d6f..4ba14f3535fc 100644 --- a/arch/m68k/include/asm/cmpxchg.h +++ b/arch/m68k/include/asm/cmpxchg.h @@ -32,7 +32,7 @@ static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, in x = tmp; break; default: - tmp = __invalid_xchg_size(x, ptr, size); + x = __invalid_xchg_size(x, ptr, size); break; } |