summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-03-14 20:25:28 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-04-16 21:08:09 +0200
commitfeb20ec2bb859d1d5fbace9a9566ad4221a433fc (patch)
tree8d68d76171e20ccba5c4dcf787109a88428b2c1a /arch/m68k/include
parent41ef2d5678d83af030125550329b6ae8b74618fa (diff)
downloadlinux-feb20ec2bb859d1d5fbace9a9566ad4221a433fc.tar.gz
linux-feb20ec2bb859d1d5fbace9a9566ad4221a433fc.tar.bz2
linux-feb20ec2bb859d1d5fbace9a9566ad4221a433fc.zip
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 <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include')
-rw-r--r--arch/m68k/include/asm/cmpxchg.h3
1 files changed, 3 insertions, 0 deletions
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
/*