From owner-svn-src-projects@FreeBSD.ORG Mon Feb 2 21:01:20 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E34C10658C6; Mon, 2 Feb 2009 21:01:20 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 693BD8FC08; Mon, 2 Feb 2009 21:01:20 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n12L1Kg8007337; Mon, 2 Feb 2009 21:01:20 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n12L1KaM007336; Mon, 2 Feb 2009 21:01:20 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902022101.n12L1KaM007336@svn.freebsd.org> From: Sam Leffler Date: Mon, 2 Feb 2009 21:01:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188026 - projects/cambria/sys/arm/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2009 21:01:23 -0000 Author: sam Date: Mon Feb 2 21:01:20 2009 New Revision: 188026 URL: http://svn.freebsd.org/changeset/base/188026 Log: force atomic_cmpset_ptr types to match atomic_cmpset_32; this matches what powerpc does Submitted by: stass Modified: projects/cambria/sys/arm/include/atomic.h Modified: projects/cambria/sys/arm/include/atomic.h ============================================================================== --- projects/cambria/sys/arm/include/atomic.h Mon Feb 2 20:51:26 2009 (r188025) +++ projects/cambria/sys/arm/include/atomic.h Mon Feb 2 21:01:20 2009 (r188026) @@ -344,7 +344,8 @@ atomic_readandclear_32(volatile u_int32_ #define atomic_clear_ptr atomic_clear_32 #define atomic_set_ptr atomic_set_32 -#define atomic_cmpset_ptr atomic_cmpset_32 +#define atomic_cmpset_ptr(dst, old, new) \ + atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new)) #define atomic_cmpset_rel_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_store_ptr atomic_store_32