]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
locking/barriers: Remove definitions for [smp_]read_barrier_depends()
authorWill Deacon <will@kernel.org>
Wed, 30 Oct 2019 17:17:22 +0000 (17:17 +0000)
committerWill Deacon <will@kernel.org>
Tue, 21 Jul 2020 09:50:36 +0000 (10:50 +0100)
There are no remaining users of [smp_]read_barrier_depends(), so
remove it from the generic implementation of 'barrier.h'.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
include/asm-generic/barrier.h

index 8116744bb82cf0b990c150b1913bc86c8a813de1..fec97dc34de78e0de5b0bee375aafa859f99dbe2 100644 (file)
 #define dma_wmb()      wmb()
 #endif
 
-#ifndef read_barrier_depends
-#define read_barrier_depends()         do { } while (0)
-#endif
-
 #ifndef __smp_mb
 #define __smp_mb()     mb()
 #endif
 #define __smp_wmb()    wmb()
 #endif
 
-#ifndef __smp_read_barrier_depends
-#define __smp_read_barrier_depends()   read_barrier_depends()
-#endif
-
 #ifdef CONFIG_SMP
 
 #ifndef smp_mb
 #define smp_wmb()      __smp_wmb()
 #endif
 
-#ifndef smp_read_barrier_depends
-#define smp_read_barrier_depends()     __smp_read_barrier_depends()
-#endif
-
 #else  /* !CONFIG_SMP */
 
 #ifndef smp_mb
 #define smp_wmb()      barrier()
 #endif
 
-#ifndef smp_read_barrier_depends
-#define smp_read_barrier_depends()     do { } while (0)
-#endif
-
 #endif /* CONFIG_SMP */
 
 #ifndef __smp_store_mb
@@ -196,7 +180,6 @@ do {                                                                        \
 #define virt_mb() __smp_mb()
 #define virt_rmb() __smp_rmb()
 #define virt_wmb() __smp_wmb()
-#define virt_read_barrier_depends() __smp_read_barrier_depends()
 #define virt_store_mb(var, value) __smp_store_mb(var, value)
 #define virt_mb__before_atomic() __smp_mb__before_atomic()
 #define virt_mb__after_atomic()        __smp_mb__after_atomic()