From: Geert Uytterhoeven Date: Thu, 14 Mar 2013 19:25:28 +0000 (+0100) Subject: m68k: Add missing cmpxchg64() if CONFIG_RMW_INSNS=y X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=feb20ec2bb859d1d5fbace9a9566ad4221a433fc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git m68k: Add missing cmpxchg64() if CONFIG_RMW_INSNS=y If CONFIG_RMW_INSNS=y: drivers/block/blockconsole.c: In function ‘bcon_advance_console_bytes’: drivers/block/blockconsole.c:164: error: implicit declaration of function ‘cmpxchg64’ Map cmpxchg64 to cmpxchg64_local, which is already mapped to __cmpxchg64_local_generic, just like for the CONFIG_RMW_INSNS=n case. Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h index 5c81d0eae5cf..bc755bc620ad 100644 --- a/arch/m68k/include/asm/cmpxchg.h +++ b/arch/m68k/include/asm/cmpxchg.h @@ -124,6 +124,9 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, #define cmpxchg_local(ptr, o, n) \ ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \ (unsigned long)(n), sizeof(*(ptr)))) + +#define cmpxchg64(ptr, o, n) cmpxchg64_local((ptr), (o), (n)) + #else /*