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/metag | |
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/metag')
-rw-r--r-- | arch/metag/include/asm/barrier.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h index c7591e80067c..6d8b8c9b7c25 100644 --- a/arch/metag/include/asm/barrier.h +++ b/arch/metag/include/asm/barrier.h | |||
@@ -47,8 +47,6 @@ static inline void wmb(void) | |||
47 | wr_fence(); | 47 | wr_fence(); |
48 | } | 48 | } |
49 | 49 | ||
50 | #define read_barrier_depends() do { } while (0) | ||
51 | |||
52 | #ifndef CONFIG_SMP | 50 | #ifndef CONFIG_SMP |
53 | #define fence() do { } while (0) | 51 | #define fence() do { } while (0) |
54 | #define smp_mb() barrier() | 52 | #define smp_mb() barrier() |
@@ -82,7 +80,10 @@ static inline void fence(void) | |||
82 | #define smp_wmb() barrier() | 80 | #define smp_wmb() barrier() |
83 | #endif | 81 | #endif |
84 | #endif | 82 | #endif |
85 | #define smp_read_barrier_depends() do { } while (0) | 83 | |
84 | #define read_barrier_depends() do { } while (0) | ||
85 | #define smp_read_barrier_depends() do { } while (0) | ||
86 | |||
86 | #define set_mb(var, value) do { var = value; smp_mb(); } while (0) | 87 | #define set_mb(var, value) do { var = value; smp_mb(); } while (0) |
87 | 88 | ||
88 | #define smp_store_release(p, v) \ | 89 | #define smp_store_release(p, v) \ |