summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2012-12-13 11:07:32 +0100
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-01-08 14:14:55 -0800
commit7e8b1e78ea028cbd32337e2aea574a8466c796bb (patch)
tree5d1f009d9292ad680b8a7a58930bb02139d377e3
parent52494535103986dbbf689b44d8c2c7efe2132b16 (diff)
downloadlinux-7e8b1e78ea028cbd32337e2aea574a8466c796bb.tar.gz
Documentation: Memory barrier semantics of atomic_xchg()
Add atomic_xchg() to documentation for atomic operations and
memory barriers.

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r--Documentation/atomic_ops.txt2
-rw-r--r--Documentation/memory-barriers.txt1
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt
index 27f2b21a9d5c..d9ca5be9b471 100644
--- a/Documentation/atomic_ops.txt
+++ b/Documentation/atomic_ops.txt
@@ -253,6 +253,8 @@ This performs an atomic exchange operation on the atomic variable v, setting
 the given new value.  It returns the old value that the atomic variable v had
 just before the operation.
 
+atomic_xchg requires explicit memory barriers around the operation.
+
 	int atomic_cmpxchg(atomic_t *v, int old, int new);
 
 This performs an atomic compare exchange operation on the atomic value v,
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index 3c4e1b3b80a1..fa5d8a9ae205 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -1685,6 +1685,7 @@ explicit lock operations, described later).  These include:
 
 	xchg();
 	cmpxchg();
+	atomic_xchg();
 	atomic_cmpxchg();
 	atomic_inc_return();
 	atomic_dec_return();