diff options
author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2014-12-11 18:01:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-11 21:15:05 -0500 |
commit | 8a449718414ff10b9d5559ed3e8e09c7178774f2 (patch) | |
tree | 81097c0d6949fb90e40176ddff1f4be30467b576 /arch/s390 | |
parent | c11a9009ae6a8c42a8cd69d885601e1aa6fbea04 (diff) |
arch: Cleanup read_barrier_depends() and comments
This patch is meant to cleanup the handling of read_barrier_depends and
smp_read_barrier_depends. In multiple spots in the kernel headers
read_barrier_depends is defined as "do {} while (0)", however we then go
into the SMP vs non-SMP sections and have the SMP version reference
read_barrier_depends, and the non-SMP define it as yet another empty
do/while.
With this commit I went through and cleaned out the duplicate definitions
and reduced the number of definitions down to 2 per header. In addition I
moved the 50 line comments for the macro from the x86 and mips headers that
defined it as an empty do/while to those that were actually defining the
macro, alpha and blackfin.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/barrier.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h index b5dce6544d76..33d191d295e4 100644 --- a/arch/s390/include/asm/barrier.h +++ b/arch/s390/include/asm/barrier.h | |||
@@ -24,11 +24,12 @@ | |||
24 | 24 | ||
25 | #define rmb() mb() | 25 | #define rmb() mb() |
26 | #define wmb() mb() | 26 | #define wmb() mb() |
27 | #define read_barrier_depends() do { } while(0) | ||
28 | #define smp_mb() mb() | 27 | #define smp_mb() mb() |
29 | #define smp_rmb() rmb() | 28 | #define smp_rmb() rmb() |
30 | #define smp_wmb() wmb() | 29 | #define smp_wmb() wmb() |
31 | #define smp_read_barrier_depends() read_barrier_depends() | 30 | |
31 | #define read_barrier_depends() do { } while (0) | ||
32 | #define smp_read_barrier_depends() do { } while (0) | ||
32 | 33 | ||
33 | #define smp_mb__before_atomic() smp_mb() | 34 | #define smp_mb__before_atomic() smp_mb() |
34 | #define smp_mb__after_atomic() smp_mb() | 35 | #define smp_mb__after_atomic() smp_mb() |