From owner-svn-src-all@FreeBSD.ORG Tue Feb 3 19:06:12 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85BA51065687; Tue, 3 Feb 2009 19:06:12 +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 740A38FC2C; Tue, 3 Feb 2009 19:06:12 +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 n13J6CWI038789; Tue, 3 Feb 2009 19:06:12 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n13J6CYC038788; Tue, 3 Feb 2009 19:06:12 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902031906.n13J6CYC038788@svn.freebsd.org> From: Sam Leffler Date: Tue, 3 Feb 2009 19:06:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188085 - head/sys/arm/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2009 19:06:13 -0000 Author: sam Date: Tue Feb 3 19:06:12 2009 New Revision: 188085 URL: http://svn.freebsd.org/changeset/base/188085 Log: force atomic_cmpset_ptr types to match atomic_cmpset_32; this matches what powerpc does Submitted by: stass MFC after: 2 weeks Modified: head/sys/arm/include/atomic.h Modified: head/sys/arm/include/atomic.h ============================================================================== --- head/sys/arm/include/atomic.h Tue Feb 3 19:00:56 2009 (r188084) +++ head/sys/arm/include/atomic.h Tue Feb 3 19:06:12 2009 (r188085) @@ -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