From owner-svn-src-all@FreeBSD.ORG Tue Jul 10 14:21:26 2012 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 4FB8A106566B; Tue, 10 Jul 2012 14:21:26 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9528FC17; Tue, 10 Jul 2012 14:21:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6AELQx0086364; Tue, 10 Jul 2012 14:21:26 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6AELPDJ086362; Tue, 10 Jul 2012 14:21:25 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201207101421.q6AELPDJ086362@svn.freebsd.org> From: Warner Losh Date: Tue, 10 Jul 2012 14:21:25 +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: r238347 - 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, 10 Jul 2012 14:21:26 -0000 Author: imp Date: Tue Jul 10 14:21:25 2012 New Revision: 238347 URL: http://svn.freebsd.org/changeset/base/238347 Log: Revert committal of local change accidentally swept up in r238329. Modified: head/sys/arm/include/atomic.h Modified: head/sys/arm/include/atomic.h ============================================================================== --- head/sys/arm/include/atomic.h Tue Jul 10 13:17:32 2012 (r238346) +++ head/sys/arm/include/atomic.h Tue Jul 10 14:21:25 2012 (r238347) @@ -347,9 +347,7 @@ atomic_readandclear_32(volatile u_int32_ #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(dst, old, new) \ - atomic_cmpset_ptr((volatile uint32_t *)(dst), (volatile uint32_t)(old), \ - (volatile uint32_t)(new)) +#define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_store_ptr atomic_store_32 #define atomic_store_rel_ptr atomic_store_ptr