diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:03:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:03:38 -0400 |
| commit | badc48e6605ddeeb2484afae5993c859494decaa (patch) | |
| tree | 7da638f9bb53b1812b71e40ad6deca91d59ad301 /Documentation/memory-barriers.txt | |
| parent | 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a (diff) | |
| parent | 2f880b65fdbc2d4915bddc59d75a176329570fdd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'Documentation/memory-barriers.txt')
| -rw-r--r-- | Documentation/memory-barriers.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 92f0056d928c..c61d8b876fdb 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
| @@ -1031,7 +1031,7 @@ conflict on any particular lock. | |||
| 1031 | LOCKS VS MEMORY ACCESSES | 1031 | LOCKS VS MEMORY ACCESSES |
| 1032 | ------------------------ | 1032 | ------------------------ |
| 1033 | 1033 | ||
| 1034 | Consider the following: the system has a pair of spinlocks (N) and (Q), and | 1034 | Consider the following: the system has a pair of spinlocks (M) and (Q), and |
| 1035 | three CPUs; then should the following sequence of events occur: | 1035 | three CPUs; then should the following sequence of events occur: |
| 1036 | 1036 | ||
| 1037 | CPU 1 CPU 2 | 1037 | CPU 1 CPU 2 |
| @@ -1678,7 +1678,7 @@ CPU's caches by some other cache event: | |||
| 1678 | smp_wmb(); | 1678 | smp_wmb(); |
| 1679 | <A:modify v=2> <C:busy> | 1679 | <A:modify v=2> <C:busy> |
| 1680 | <C:queue v=2> | 1680 | <C:queue v=2> |
| 1681 | p = &b; q = p; | 1681 | p = &v; q = p; |
| 1682 | <D:request p> | 1682 | <D:request p> |
| 1683 | <B:modify p=&v> <D:commit p=&v> | 1683 | <B:modify p=&v> <D:commit p=&v> |
| 1684 | <D:read p> | 1684 | <D:read p> |