Since the smp_mb__{before,after}*() ops are fundamentally dependent on how an arch can implement atomics it doesn't make sense to have 3 variants of them. They must all be the same. Furthermore, the 3 variants suggest they're only valid for those 3 atomic ops, while we have many more where they could be applied. So move away from smp_mb__{before,after}_{atomic,clear}_{dec,inc,bit}() and reduce the interface to just the two: smp_mb__{before,after}_atomic(). This patch prepares the way by introducing default implementations in asm-generic/barrier.h that default to a full barrier and providing __deprecated inlines for the previous 6 barriers if they're not provided by the arch. This should allow for a mostly painless transition (lots of deprecated warns in the interim).
Showing the changes to include/linux/bitops.h (1 of 6 files). Show all
Unified · Split
| @@ -32,6 +32,26 @@ extern unsigned long __sw_hweight64(__u64 w); · 31 unmodified lines | ||
| 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 | + | |
| 35 | 55 | #define for_each_set_bit(bit, addr, size) \ |
| 36 | 56 | for ((bit) = find_first_bit((addr), (size)); \ |
| 37 | 57 | (bit) < (size); \ |