Merge branch 'kvm-arm-cleanup' from git://github.com/columbia/linux-kvm-arm.git

[firefly-linux-kernel-4.4.55.git] / include / asm-generic / atomic.h

diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 1ced6413ea0345580830394554e0ed2b69ba1224..33bd2de3bc1e930da34dcb8b6007825807ddacb3 100644 (file)
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -136,12 +136,6 @@ static inline void atomic_dec(atomic_t *v)
 #define atomic_xchg(ptr, v)            (xchg(&(ptr)->counter, (v)))
 #define atomic_cmpxchg(v, old, new)    (cmpxchg(&((v)->counter), (old), (new)))
 
-#define cmpxchg_local(ptr, o, n)                                              \
-       ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
-                       (unsigned long)(n), sizeof(*(ptr))))
-
-#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-
 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 {
   int c, old;