diff options
author | David S. Miller <davem@davemloft.net> | 2017-09-28 01:38:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-28 01:38:19 -0400 |
commit | 23198ddffb6cddb5d5824230af4dd4b46e4046a4 (patch) | |
tree | 652e124f2107f25a2d2507057905695375414b72 | |
parent | da61e7308df868c20a41861c0a11f6eefd822993 (diff) |
sparc32: Add cmpxchg64().
This fixes the build with i40e driver enabled.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/include/asm/cmpxchg_32.h | 3 | ||||
-rw-r--r-- | arch/sparc/lib/atomic32.c | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/cmpxchg_32.h b/arch/sparc/include/asm/cmpxchg_32.h index 83ffb83c5397..a0101a58fd3f 100644 --- a/arch/sparc/include/asm/cmpxchg_32.h +++ b/arch/sparc/include/asm/cmpxchg_32.h | |||
@@ -62,6 +62,9 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size) | |||
62 | (unsigned long)_n_, sizeof(*(ptr))); \ | 62 | (unsigned long)_n_, sizeof(*(ptr))); \ |
63 | }) | 63 | }) |
64 | 64 | ||
65 | u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new); | ||
66 | #define cmpxchg64(ptr, old, new) __cmpxchg_u64(ptr, old, new) | ||
67 | |||
65 | #include <asm-generic/cmpxchg-local.h> | 68 | #include <asm-generic/cmpxchg-local.h> |
66 | 69 | ||
67 | /* | 70 | /* |
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c index 2c373329d5cb..ddacb5aeb424 100644 --- a/arch/sparc/lib/atomic32.c +++ b/arch/sparc/lib/atomic32.c | |||
@@ -172,6 +172,20 @@ unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new) | |||
172 | } | 172 | } |
173 | EXPORT_SYMBOL(__cmpxchg_u32); | 173 | EXPORT_SYMBOL(__cmpxchg_u32); |
174 | 174 | ||
175 | u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new) | ||
176 | { | ||
177 | unsigned long flags; | ||
178 | u64 prev; | ||
179 | |||
180 | spin_lock_irqsave(ATOMIC_HASH(ptr), flags); | ||
181 | if ((prev = *ptr) == old) | ||
182 | *ptr = new; | ||
183 | spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags); | ||
184 | |||
185 | return prev; | ||
186 | } | ||
187 | EXPORT_SYMBOL(__cmpxchg_u64); | ||
188 | |||
175 | unsigned long __xchg_u32(volatile u32 *ptr, u32 new) | 189 | unsigned long __xchg_u32(volatile u32 *ptr, u32 new) |
176 | { | 190 | { |
177 | unsigned long flags; | 191 | unsigned long flags; |