[PATCH] s390: atomic primitives
Hugh Dickins <hugh@veritas.com> Fix the broken atomic_cmpxchg primitive. Add atomic_sub_and_test, atomic64_sub_return, atomic64_sub_and_test, atomic64_cmpxchg, atomic64_add_unless and atomic64_inc_not_zero. Replace old style atomic_compare_and_swap by atomic_cmpxchg. Shorten the whole header by defining most primitives with the two inline functions atomic_add_return and atomic_sub_return. In addition this patch contains the s390 related fixes of Hugh's "mm: fill arch atomic64 gaps" patch. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
8d93c700a4
commit
973bd99375
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: iucv.c,v 1.45 2005/04/26 22:59:06 braunu Exp $
|
||||
* $Id: iucv.c,v 1.47 2005/11/21 11:35:22 mschwide Exp $
|
||||
*
|
||||
* IUCV network driver
|
||||
*
|
||||
@@ -29,7 +29,7 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* RELEASE-TAG: IUCV lowlevel driver $Revision: 1.45 $
|
||||
* RELEASE-TAG: IUCV lowlevel driver $Revision: 1.47 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -355,7 +355,7 @@ do { \
|
||||
static void
|
||||
iucv_banner(void)
|
||||
{
|
||||
char vbuf[] = "$Revision: 1.45 $";
|
||||
char vbuf[] = "$Revision: 1.47 $";
|
||||
char *version = vbuf;
|
||||
|
||||
if ((version = strchr(version, ':'))) {
|
||||
@@ -477,7 +477,7 @@ grab_param(void)
|
||||
ptr++;
|
||||
if (ptr >= iucv_param_pool + PARAM_POOL_SIZE)
|
||||
ptr = iucv_param_pool;
|
||||
} while (atomic_compare_and_swap(0, 1, &ptr->in_use));
|
||||
} while (atomic_cmpxchg(&ptr->in_use, 0, 1) != 0);
|
||||
hint = ptr - iucv_param_pool;
|
||||
|
||||
memset(&ptr->param, 0, sizeof(ptr->param));
|
||||
|
Reference in New Issue
Block a user