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/mips | |
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/mips')
-rw-r--r-- | arch/mips/include/asm/barrier.h | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h index d0101dd0575e..3d69aa829a76 100644 --- a/arch/mips/include/asm/barrier.h +++ b/arch/mips/include/asm/barrier.h | |||
@@ -10,58 +10,6 @@ | |||
10 | 10 | ||
11 | #include <asm/addrspace.h> | 11 | #include <asm/addrspace.h> |
12 | 12 | ||
13 | /* | ||
14 | * read_barrier_depends - Flush all pending reads that subsequents reads | ||
15 | * depend on. | ||
16 | * | ||
17 | * No data-dependent reads from memory-like regions are ever reordered | ||
18 | * over this barrier. All reads preceding this primitive are guaranteed | ||
19 | * to access memory (but not necessarily other CPUs' caches) before any | ||
20 | * reads following this primitive that depend on the data return by | ||
21 | * any of the preceding reads. This primitive is much lighter weight than | ||
22 | * rmb() on most CPUs, and is never heavier weight than is | ||
23 | * rmb(). | ||
24 | * | ||
25 | * These ordering constraints are respected by both the local CPU | ||
26 | * and the compiler. | ||
27 | * | ||
28 | * Ordering is not guaranteed by anything other than these primitives, | ||
29 | * not even by data dependencies. See the documentation for | ||
30 | * memory_barrier() for examples and URLs to more information. | ||
31 | * | ||
32 | * For example, the following code would force ordering (the initial | ||
33 | * value of "a" is zero, "b" is one, and "p" is "&a"): | ||
34 | * | ||
35 | * <programlisting> | ||
36 | * CPU 0 CPU 1 | ||
37 | * | ||
38 | * b = 2; | ||
39 | * memory_barrier(); | ||
40 | * p = &b; q = p; | ||
41 | * read_barrier_depends(); | ||
42 | * d = *q; | ||
43 | * </programlisting> | ||
44 | * | ||
45 | * because the read of "*q" depends on the read of "p" and these | ||
46 | * two reads are separated by a read_barrier_depends(). However, | ||
47 | * the following code, with the same initial values for "a" and "b": | ||
48 | * | ||
49 | * <programlisting> | ||
50 | * CPU 0 CPU 1 | ||
51 | * | ||
52 | * a = 2; | ||
53 | * memory_barrier(); | ||
54 | * b = 3; y = b; | ||
55 | * read_barrier_depends(); | ||
56 | * x = a; | ||
57 | * </programlisting> | ||
58 | * | ||
59 | * does not enforce ordering, since there is no data dependency between | ||
60 | * the read of "a" and the read of "b". Therefore, on some CPUs, such | ||
61 | * as Alpha, "y" could be set to 3 and "x" to 0. Use rmb() | ||
62 | * in cases like this where there are no data dependencies. | ||
63 | */ | ||
64 | |||
65 | #define read_barrier_depends() do { } while(0) | 13 | #define read_barrier_depends() do { } while(0) |
66 | #define smp_read_barrier_depends() do { } while(0) | 14 | #define smp_read_barrier_depends() do { } while(0) |
67 | 15 | ||