Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

locking: Remove deprecated smp_mb__() barriers

Its been a while and there are no in-tree users left, so remove the
deprecated barriers.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Chen, Gong <gong.chen@linux.intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Joe Perches <joe@perches.com>
Cc: John Sullivan <jsrhbz@kanargh.force9.co.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Peter Zijlstra and committed by
Ingo Molnar
2e39465a 98a96f20

-72
-36
include/linux/atomic.h
··· 3 3 #define _LINUX_ATOMIC_H 4 4 #include <asm/atomic.h> 5 5 6 - /* 7 - * Provide __deprecated wrappers for the new interface, avoid flag day changes. 8 - * We need the ugly external functions to break header recursion hell. 9 - */ 10 - #ifndef smp_mb__before_atomic_inc 11 - static inline void __deprecated smp_mb__before_atomic_inc(void) 12 - { 13 - extern void __smp_mb__before_atomic(void); 14 - __smp_mb__before_atomic(); 15 - } 16 - #endif 17 - 18 - #ifndef smp_mb__after_atomic_inc 19 - static inline void __deprecated smp_mb__after_atomic_inc(void) 20 - { 21 - extern void __smp_mb__after_atomic(void); 22 - __smp_mb__after_atomic(); 23 - } 24 - #endif 25 - 26 - #ifndef smp_mb__before_atomic_dec 27 - static inline void __deprecated smp_mb__before_atomic_dec(void) 28 - { 29 - extern void __smp_mb__before_atomic(void); 30 - __smp_mb__before_atomic(); 31 - } 32 - #endif 33 - 34 - #ifndef smp_mb__after_atomic_dec 35 - static inline void __deprecated smp_mb__after_atomic_dec(void) 36 - { 37 - extern void __smp_mb__after_atomic(void); 38 - __smp_mb__after_atomic(); 39 - } 40 - #endif 41 - 42 6 /** 43 7 * atomic_add_unless - add unless the number is already a given value 44 8 * @v: pointer of type atomic_t
-20
include/linux/bitops.h
··· 32 32 */ 33 33 #include <asm/bitops.h> 34 34 35 - /* 36 - * Provide __deprecated wrappers for the new interface, avoid flag day changes. 37 - * We need the ugly external functions to break header recursion hell. 38 - */ 39 - #ifndef smp_mb__before_clear_bit 40 - static inline void __deprecated smp_mb__before_clear_bit(void) 41 - { 42 - extern void __smp_mb__before_atomic(void); 43 - __smp_mb__before_atomic(); 44 - } 45 - #endif 46 - 47 - #ifndef smp_mb__after_clear_bit 48 - static inline void __deprecated smp_mb__after_clear_bit(void) 49 - { 50 - extern void __smp_mb__after_atomic(void); 51 - __smp_mb__after_atomic(); 52 - } 53 - #endif 54 - 55 35 #define for_each_set_bit(bit, addr, size) \ 56 36 for ((bit) = find_first_bit((addr), (size)); \ 57 37 (bit) < (size); \
-16
kernel/sched/core.c
··· 90 90 #define CREATE_TRACE_POINTS 91 91 #include <trace/events/sched.h> 92 92 93 - #ifdef smp_mb__before_atomic 94 - void __smp_mb__before_atomic(void) 95 - { 96 - smp_mb__before_atomic(); 97 - } 98 - EXPORT_SYMBOL(__smp_mb__before_atomic); 99 - #endif 100 - 101 - #ifdef smp_mb__after_atomic 102 - void __smp_mb__after_atomic(void) 103 - { 104 - smp_mb__after_atomic(); 105 - } 106 - EXPORT_SYMBOL(__smp_mb__after_atomic); 107 - #endif 108 - 109 93 void start_bandwidth_timer(struct hrtimer *period_timer, ktime_t period) 110 94 { 111 95 unsigned long delta;