diff options
author | Peter Zijlstra <peterz@infradead.org> | 2015-05-12 04:51:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-19 02:32:00 -0400 |
commit | b92b8b35a2e38bde319fd1d68ec84628c1f1b0fb (patch) | |
tree | 45aea6d12a580b60848363c10dc355f3307ec1ff /Documentation/memory-barriers.txt | |
parent | ab3f02fc237211f0583c1e7ba3bf504747be9b8d (diff) |
locking/arch: Rename set_mb() to smp_store_mb()
Since set_mb() is really about an smp_mb() -- not a IO/DMA barrier
like mb() rename it to match the recent smp_load_acquire() and
smp_store_release().
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/memory-barriers.txt')
-rw-r--r-- | Documentation/memory-barriers.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index f95746189b5d..fe4020e4b468 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
@@ -1662,7 +1662,7 @@ CPU from reordering them. | |||
1662 | 1662 | ||
1663 | There are some more advanced barrier functions: | 1663 | There are some more advanced barrier functions: |
1664 | 1664 | ||
1665 | (*) set_mb(var, value) | 1665 | (*) smp_store_mb(var, value) |
1666 | 1666 | ||
1667 | This assigns the value to the variable and then inserts a full memory | 1667 | This assigns the value to the variable and then inserts a full memory |
1668 | barrier after it, depending on the function. It isn't guaranteed to | 1668 | barrier after it, depending on the function. It isn't guaranteed to |
@@ -1975,7 +1975,7 @@ after it has altered the task state: | |||
1975 | CPU 1 | 1975 | CPU 1 |
1976 | =============================== | 1976 | =============================== |
1977 | set_current_state(); | 1977 | set_current_state(); |
1978 | set_mb(); | 1978 | smp_store_mb(); |
1979 | STORE current->state | 1979 | STORE current->state |
1980 | <general barrier> | 1980 | <general barrier> |
1981 | LOAD event_indicated | 1981 | LOAD event_indicated |
@@ -2016,7 +2016,7 @@ between the STORE to indicate the event and the STORE to set TASK_RUNNING: | |||
2016 | CPU 1 CPU 2 | 2016 | CPU 1 CPU 2 |
2017 | =============================== =============================== | 2017 | =============================== =============================== |
2018 | set_current_state(); STORE event_indicated | 2018 | set_current_state(); STORE event_indicated |
2019 | set_mb(); wake_up(); | 2019 | smp_store_mb(); wake_up(); |
2020 | STORE current->state <write barrier> | 2020 | STORE current->state <write barrier> |
2021 | <general barrier> STORE current->state | 2021 | <general barrier> STORE current->state |
2022 | LOAD event_indicated | 2022 | LOAD event_indicated |