diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2014-04-23 17:02:18 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-01-11 02:05:00 +0000 |
| commit | 827dbc948ec942b71223b213f5e7f9246fdb1712 (patch) | |
| tree | 2d6c0e47168758979adfc281ac7c4a7789789a8e /arch/x86 | |
| parent | c6ca8aabc36fc9f268781f0de30a1160b8f8390f (diff) | |
| download | linux-stable-827dbc948ec942b71223b213f5e7f9246fdb1712.tar.gz linux-stable-827dbc948ec942b71223b213f5e7f9246fdb1712.tar.bz2 linux-stable-827dbc948ec942b71223b213f5e7f9246fdb1712.zip | |
locking,x86: Kill atomic_or_long()
commit f6b4ecee0eb7bfa66ae8d5652105ed4da53209a3 upstream.
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>
[bwh: Backported to 3.16 because this function is broken after
"x86/atomic: Fix smp_mb__{before,after}_atomic()"]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/atomic.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h index 940f4c6b42a0..4a47578c3044 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -218,21 +218,6 @@ static inline short int atomic_inc_short(short int *v) return *v; } -#ifdef CONFIG_X86_64 -/** - * atomic_or_long - OR of two long integers - * @v1: pointer to type unsigned long - * @v2: pointer to type unsigned long - * - * Atomically ORs @v1 and @v2 - * Returns the result of the OR - */ -static inline void atomic_or_long(unsigned long *v1, unsigned long v2) -{ - asm(LOCK_PREFIX "orq %1, %0" : "+m" (*v1) : "r" (v2)); -} -#endif - /* These are x86-specific, used by some header files */ #define atomic_clear_mask(mask, addr) \ asm volatile(LOCK_PREFIX "andl %0,%1" \ |