aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-05-13 04:54:25 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-05-13 04:55:42 -0400
commita22e5f579b98f16e24b7184d01c35de26eb5a7f7 (patch)
tree2773ac00d1e8f1dba6c5c0ac0b0c2fc5805126dd
parentcede88418b385b50f6841e4b2f1586888b8ab924 (diff)
arch: Remove __ARCH_HAVE_CMPXCHG
We removed the only user of this define in the rtmutex code. Get rid of it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--arch/alpha/include/asm/cmpxchg.h2
-rw-r--r--arch/avr32/include/asm/cmpxchg.h2
-rw-r--r--arch/hexagon/include/asm/cmpxchg.h1
-rw-r--r--arch/ia64/include/uapi/asm/cmpxchg.h2
-rw-r--r--arch/m32r/include/asm/cmpxchg.h2
-rw-r--r--arch/m68k/include/asm/cmpxchg.h1
-rw-r--r--arch/metag/include/asm/cmpxchg.h2
-rw-r--r--arch/mips/include/asm/cmpxchg.h2
-rw-r--r--arch/parisc/include/asm/cmpxchg.h2
-rw-r--r--arch/powerpc/include/asm/cmpxchg.h1
-rw-r--r--arch/s390/include/asm/cmpxchg.h2
-rw-r--r--arch/score/include/asm/cmpxchg.h2
-rw-r--r--arch/sh/include/asm/cmpxchg.h2
-rw-r--r--arch/sparc/include/asm/cmpxchg_32.h1
-rw-r--r--arch/sparc/include/asm/cmpxchg_64.h2
-rw-r--r--arch/tile/include/asm/atomic_64.h3
-rw-r--r--arch/x86/include/asm/cmpxchg.h2
17 files changed, 0 insertions, 31 deletions
diff --git a/arch/alpha/include/asm/cmpxchg.h b/arch/alpha/include/asm/cmpxchg.h
index 429e8cd0d78e..e5117766529e 100644
--- a/arch/alpha/include/asm/cmpxchg.h
+++ b/arch/alpha/include/asm/cmpxchg.h
@@ -66,6 +66,4 @@
66#undef __ASM__MB 66#undef __ASM__MB
67#undef ____cmpxchg 67#undef ____cmpxchg
68 68
69#define __HAVE_ARCH_CMPXCHG 1
70
71#endif /* _ALPHA_CMPXCHG_H */ 69#endif /* _ALPHA_CMPXCHG_H */
diff --git a/arch/avr32/include/asm/cmpxchg.h b/arch/avr32/include/asm/cmpxchg.h
index 962a6aeab787..366bbeaeb405 100644
--- a/arch/avr32/include/asm/cmpxchg.h
+++ b/arch/avr32/include/asm/cmpxchg.h
@@ -70,8 +70,6 @@ extern unsigned long __cmpxchg_u64_unsupported_on_32bit_kernels(
70 if something tries to do an invalid cmpxchg(). */ 70 if something tries to do an invalid cmpxchg(). */
71extern void __cmpxchg_called_with_bad_pointer(void); 71extern void __cmpxchg_called_with_bad_pointer(void);
72 72
73#define __HAVE_ARCH_CMPXCHG 1
74
75static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, 73static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
76 unsigned long new, int size) 74 unsigned long new, int size)
77{ 75{
diff --git a/arch/hexagon/include/asm/cmpxchg.h b/arch/hexagon/include/asm/cmpxchg.h
index 9e7802911a57..a6e34e2acbba 100644
--- a/arch/hexagon/include/asm/cmpxchg.h
+++ b/arch/hexagon/include/asm/cmpxchg.h
@@ -64,7 +64,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
64 * looks just like atomic_cmpxchg on our arch currently with a bunch of 64 * looks just like atomic_cmpxchg on our arch currently with a bunch of
65 * variable casting. 65 * variable casting.
66 */ 66 */
67#define __HAVE_ARCH_CMPXCHG 1
68 67
69#define cmpxchg(ptr, old, new) \ 68#define cmpxchg(ptr, old, new) \
70({ \ 69({ \
diff --git a/arch/ia64/include/uapi/asm/cmpxchg.h b/arch/ia64/include/uapi/asm/cmpxchg.h
index f35109b1d907..a0e3620f8f13 100644
--- a/arch/ia64/include/uapi/asm/cmpxchg.h
+++ b/arch/ia64/include/uapi/asm/cmpxchg.h
@@ -61,8 +61,6 @@ extern void ia64_xchg_called_with_bad_pointer(void);
61 * indicated by comparing RETURN with OLD. 61 * indicated by comparing RETURN with OLD.
62 */ 62 */
63 63
64#define __HAVE_ARCH_CMPXCHG 1
65
66/* 64/*
67 * This function doesn't exist, so you'll get a linker error 65 * This function doesn't exist, so you'll get a linker error
68 * if something tries to do an invalid cmpxchg(). 66 * if something tries to do an invalid cmpxchg().
diff --git a/arch/m32r/include/asm/cmpxchg.h b/arch/m32r/include/asm/cmpxchg.h
index de651db20b43..14bf9b739dd2 100644
--- a/arch/m32r/include/asm/cmpxchg.h
+++ b/arch/m32r/include/asm/cmpxchg.h
@@ -107,8 +107,6 @@ __xchg_local(unsigned long x, volatile void *ptr, int size)
107 ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr), \ 107 ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr), \
108 sizeof(*(ptr)))) 108 sizeof(*(ptr))))
109 109
110#define __HAVE_ARCH_CMPXCHG 1
111
112static inline unsigned long 110static inline unsigned long
113__cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new) 111__cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
114{ 112{
diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h
index bc755bc620ad..83b1df80f0ac 100644
--- a/arch/m68k/include/asm/cmpxchg.h
+++ b/arch/m68k/include/asm/cmpxchg.h
@@ -90,7 +90,6 @@ extern unsigned long __invalid_cmpxchg_size(volatile void *,
90 * indicated by comparing RETURN with OLD. 90 * indicated by comparing RETURN with OLD.
91 */ 91 */
92#ifdef CONFIG_RMW_INSNS 92#ifdef CONFIG_RMW_INSNS
93#define __HAVE_ARCH_CMPXCHG 1
94 93
95static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, 94static inline unsigned long __cmpxchg(volatile void *p, unsigned long old,
96 unsigned long new, int size) 95 unsigned long new, int size)
diff --git a/arch/metag/include/asm/cmpxchg.h b/arch/metag/include/asm/cmpxchg.h
index b1bc1be8540f..be29e3e44321 100644
--- a/arch/metag/include/asm/cmpxchg.h
+++ b/arch/metag/include/asm/cmpxchg.h
@@ -51,8 +51,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
51 return old; 51 return old;
52} 52}
53 53
54#define __HAVE_ARCH_CMPXCHG 1
55
56#define cmpxchg(ptr, o, n) \ 54#define cmpxchg(ptr, o, n) \
57 ({ \ 55 ({ \
58 __typeof__(*(ptr)) _o_ = (o); \ 56 __typeof__(*(ptr)) _o_ = (o); \
diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h
index 412f945f1f5e..b71ab4a5fd50 100644
--- a/arch/mips/include/asm/cmpxchg.h
+++ b/arch/mips/include/asm/cmpxchg.h
@@ -138,8 +138,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
138 __xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))); \ 138 __xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))); \
139}) 139})
140 140
141#define __HAVE_ARCH_CMPXCHG 1
142
143#define __cmpxchg_asm(ld, st, m, old, new) \ 141#define __cmpxchg_asm(ld, st, m, old, new) \
144({ \ 142({ \
145 __typeof(*(m)) __ret; \ 143 __typeof(*(m)) __ret; \
diff --git a/arch/parisc/include/asm/cmpxchg.h b/arch/parisc/include/asm/cmpxchg.h
index dbd13354ec41..0a90b965cccb 100644
--- a/arch/parisc/include/asm/cmpxchg.h
+++ b/arch/parisc/include/asm/cmpxchg.h
@@ -46,8 +46,6 @@ __xchg(unsigned long x, __volatile__ void *ptr, int size)
46#define xchg(ptr, x) \ 46#define xchg(ptr, x) \
47 ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) 47 ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
48 48
49#define __HAVE_ARCH_CMPXCHG 1
50
51/* bug catcher for when unsupported size is used - won't link */ 49/* bug catcher for when unsupported size is used - won't link */
52extern void __cmpxchg_called_with_bad_pointer(void); 50extern void __cmpxchg_called_with_bad_pointer(void);
53 51
diff --git a/arch/powerpc/include/asm/cmpxchg.h b/arch/powerpc/include/asm/cmpxchg.h
index d463c68fe7f0..ad6263cffb0f 100644
--- a/arch/powerpc/include/asm/cmpxchg.h
+++ b/arch/powerpc/include/asm/cmpxchg.h
@@ -144,7 +144,6 @@ __xchg_local(volatile void *ptr, unsigned long x, unsigned int size)
144 * Compare and exchange - if *p == old, set it to new, 144 * Compare and exchange - if *p == old, set it to new,
145 * and return the old value of *p. 145 * and return the old value of *p.
146 */ 146 */
147#define __HAVE_ARCH_CMPXCHG 1
148 147
149static __always_inline unsigned long 148static __always_inline unsigned long
150__cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new) 149__cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)
diff --git a/arch/s390/include/asm/cmpxchg.h b/arch/s390/include/asm/cmpxchg.h
index 4eadec466b8c..411464f4c97a 100644
--- a/arch/s390/include/asm/cmpxchg.h
+++ b/arch/s390/include/asm/cmpxchg.h
@@ -32,8 +32,6 @@
32 __old; \ 32 __old; \
33}) 33})
34 34
35#define __HAVE_ARCH_CMPXCHG
36
37#define __cmpxchg_double_op(p1, p2, o1, o2, n1, n2, insn) \ 35#define __cmpxchg_double_op(p1, p2, o1, o2, n1, n2, insn) \
38({ \ 36({ \
39 register __typeof__(*(p1)) __old1 asm("2") = (o1); \ 37 register __typeof__(*(p1)) __old1 asm("2") = (o1); \
diff --git a/arch/score/include/asm/cmpxchg.h b/arch/score/include/asm/cmpxchg.h
index f384839c3ee5..cc3f6420b71c 100644
--- a/arch/score/include/asm/cmpxchg.h
+++ b/arch/score/include/asm/cmpxchg.h
@@ -42,8 +42,6 @@ static inline unsigned long __cmpxchg(volatile unsigned long *m,
42 (unsigned long)(o), \ 42 (unsigned long)(o), \
43 (unsigned long)(n))) 43 (unsigned long)(n)))
44 44
45#define __HAVE_ARCH_CMPXCHG 1
46
47#include <asm-generic/cmpxchg-local.h> 45#include <asm-generic/cmpxchg-local.h>
48 46
49#endif /* _ASM_SCORE_CMPXCHG_H */ 47#endif /* _ASM_SCORE_CMPXCHG_H */
diff --git a/arch/sh/include/asm/cmpxchg.h b/arch/sh/include/asm/cmpxchg.h
index f6bd1406b897..85c97b188d71 100644
--- a/arch/sh/include/asm/cmpxchg.h
+++ b/arch/sh/include/asm/cmpxchg.h
@@ -46,8 +46,6 @@ extern void __xchg_called_with_bad_pointer(void);
46 * if something tries to do an invalid cmpxchg(). */ 46 * if something tries to do an invalid cmpxchg(). */
47extern void __cmpxchg_called_with_bad_pointer(void); 47extern void __cmpxchg_called_with_bad_pointer(void);
48 48
49#define __HAVE_ARCH_CMPXCHG 1
50
51static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old, 49static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
52 unsigned long new, int size) 50 unsigned long new, int size)
53{ 51{
diff --git a/arch/sparc/include/asm/cmpxchg_32.h b/arch/sparc/include/asm/cmpxchg_32.h
index d38b52dca216..83ffb83c5397 100644
--- a/arch/sparc/include/asm/cmpxchg_32.h
+++ b/arch/sparc/include/asm/cmpxchg_32.h
@@ -34,7 +34,6 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int
34 * 34 *
35 * Cribbed from <asm-parisc/atomic.h> 35 * Cribbed from <asm-parisc/atomic.h>
36 */ 36 */
37#define __HAVE_ARCH_CMPXCHG 1
38 37
39/* bug catcher for when unsupported size is used - won't link */ 38/* bug catcher for when unsupported size is used - won't link */
40void __cmpxchg_called_with_bad_pointer(void); 39void __cmpxchg_called_with_bad_pointer(void);
diff --git a/arch/sparc/include/asm/cmpxchg_64.h b/arch/sparc/include/asm/cmpxchg_64.h
index 0e1ed6cfbf68..faa2f61058c2 100644
--- a/arch/sparc/include/asm/cmpxchg_64.h
+++ b/arch/sparc/include/asm/cmpxchg_64.h
@@ -65,8 +65,6 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr,
65 65
66#include <asm-generic/cmpxchg-local.h> 66#include <asm-generic/cmpxchg-local.h>
67 67
68#define __HAVE_ARCH_CMPXCHG 1
69
70static inline unsigned long 68static inline unsigned long
71__cmpxchg_u32(volatile int *m, int old, int new) 69__cmpxchg_u32(volatile int *m, int old, int new)
72{ 70{
diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
index 7b11c5fadd42..0496970cef82 100644
--- a/arch/tile/include/asm/atomic_64.h
+++ b/arch/tile/include/asm/atomic_64.h
@@ -105,9 +105,6 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
105 105
106#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 106#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
107 107
108/* Define this to indicate that cmpxchg is an efficient operation. */
109#define __HAVE_ARCH_CMPXCHG
110
111#endif /* !__ASSEMBLY__ */ 108#endif /* !__ASSEMBLY__ */
112 109
113#endif /* _ASM_TILE_ATOMIC_64_H */ 110#endif /* _ASM_TILE_ATOMIC_64_H */
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 99c105d78b7e..ad19841eddfe 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -4,8 +4,6 @@
4#include <linux/compiler.h> 4#include <linux/compiler.h>
5#include <asm/alternative.h> /* Provides LOCK_PREFIX */ 5#include <asm/alternative.h> /* Provides LOCK_PREFIX */
6 6
7#define __HAVE_ARCH_CMPXCHG 1
8
9/* 7/*
10 * Non-existant functions to indicate usage errors at link time 8 * Non-existant functions to indicate usage errors at link time
11 * (or compile-time if the compiler implements __compiletime_error(). 9 * (or compile-time if the compiler implements __compiletime_error().