From 335aa20d1927e7496d10f029f128a5bb9ac26fb7 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 24 Feb 2008 00:03:29 +0300 Subject: [PATCH] --- yaml --- r: 86252 b: refs/heads/master c: 02c608c1fefe821a4c6fc34c45a0dea3cebf4764 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/atomic_ops.txt | 3 ++- trunk/Documentation/memory-barriers.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9ecd309203ef..204b15488a54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dda81ca31dc73e695ff8b83351f7aaefbef192a +refs/heads/master: 02c608c1fefe821a4c6fc34c45a0dea3cebf4764 diff --git a/trunk/Documentation/atomic_ops.txt b/trunk/Documentation/atomic_ops.txt index f20c10c2858f..4ef245010457 100644 --- a/trunk/Documentation/atomic_ops.txt +++ b/trunk/Documentation/atomic_ops.txt @@ -186,7 +186,8 @@ If the atomic value v is not equal to u, this function adds a to v, and returns non zero. If v is equal to u then it returns zero. This is done as an atomic operation. -atomic_add_unless requires explicit memory barriers around the operation. +atomic_add_unless requires explicit memory barriers around the operation +unless it fails (returns 0). atomic_inc_not_zero, equivalent to atomic_add_unless(v, 1, 0) diff --git a/trunk/Documentation/memory-barriers.txt b/trunk/Documentation/memory-barriers.txt index 4e17beba2379..1f506f7830ec 100644 --- a/trunk/Documentation/memory-barriers.txt +++ b/trunk/Documentation/memory-barriers.txt @@ -1493,7 +1493,7 @@ explicit lock operations, described later). These include: atomic_dec_and_test(); atomic_sub_and_test(); atomic_add_negative(); - atomic_add_unless(); + atomic_add_unless(); /* when succeeds (returns 1) */ test_and_set_bit(); test_and_clear_bit(); test_and_change_bit();