From: Thorsten Blum Date: Tue, 2 Jul 2024 03:41:17 +0000 (+0200) Subject: m68k: cmpxchg: Fix return value for default case in __arch_xchg() X-Git-Tag: v6.11-rc1~190^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21b9e722ad28c19c2bc83f18f540b3dbd89bf762;p=thirdparty%2Flinux.git 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 Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/20240702034116.140234-2-thorsten.blum@toblux.com Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h index d7f3de9c5d6f7..4ba14f3535fcb 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; }