m68k: cmpxchg: Fix return value for default case in __arch_xchg()

BugLink: https://bugs.launchpad.net/bugs/2083196

[ Upstream commit 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 ]

The return value of __invalid_xchg_size() is assigned to tmp instead of
the return variable x. Assign it to x instead.

Fixes: 2501cf768e ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>

This commit is contained in:

Thorsten Blum

2024-07-02 05:41:17 +02:00

committed by

Mehmet Basaran

parent eea81cc0f5

commit 4b32ece4de

1 changed files with 1 additions and 1 deletions

									
										arch/m68k/include/asm/cmpxchg.h
									
		+1
		-1
	
												View File
												
				@@ -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;

					}