aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2014-04-23 11:02:18 -0400
committerIngo Molnar <mingo@kernel.org>2014-08-14 06:48:02 -0400
commitf6b4ecee0eb7bfa66ae8d5652105ed4da53209a3 (patch)
treed3e897cb93631efaff91939ebc36f524dc6ba9b9
parent98a96f202203fecad65b44449077c695686ad4db (diff)
locking,x86: Kill atomic_or_long()
There are no users, kill it. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/20140508135851.768177189@infradead.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/include/asm/atomic.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
index 6dd1c7dd0473..bf20c817ed34 100644
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
@@ -219,21 +219,6 @@ static inline short int atomic_inc_short(short int *v)
219 return *v; 219 return *v;
220} 220}
221 221
222#ifdef CONFIG_X86_64
223/**
224 * atomic_or_long - OR of two long integers
225 * @v1: pointer to type unsigned long
226 * @v2: pointer to type unsigned long
227 *
228 * Atomically ORs @v1 and @v2
229 * Returns the result of the OR
230 */
231static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
232{
233 asm(LOCK_PREFIX "orq %1, %0" : "+m" (*v1) : "r" (v2));
234}
235#endif
236
237/* These are x86-specific, used by some header files */ 222/* These are x86-specific, used by some header files */
238#define atomic_clear_mask(mask, addr) \ 223#define atomic_clear_mask(mask, addr) \
239 asm volatile(LOCK_PREFIX "andl %0,%1" \ 224 asm volatile(LOCK_PREFIX "andl %0,%1" \