From owner-svn-src-all@FreeBSD.ORG Mon Mar 2 20:40:26 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 619605AC; Mon, 2 Mar 2015 20:40:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CA1F1BB; Mon, 2 Mar 2015 20:40:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t22KeQSo082073; Mon, 2 Mar 2015 20:40:26 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t22KeQfY082072; Mon, 2 Mar 2015 20:40:26 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201503022040.t22KeQfY082072@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Mon, 2 Mar 2015 20:40:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r279543 - head/sys/arm/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Mon, 02 Mar 2015 20:40:26 -0000 Author: ian Date: Mon Mar 2 20:40:25 2015 New Revision: 279543 URL: https://svnweb.freebsd.org/changeset/base/279543 Log: Revert r279338. The casts are apparently bogus, despite the fact that they've been working in i386 (where this change came from). Modified: head/sys/arm/include/atomic.h Modified: head/sys/arm/include/atomic.h ============================================================================== --- head/sys/arm/include/atomic.h Mon Mar 2 20:38:17 2015 (r279542) +++ head/sys/arm/include/atomic.h Mon Mar 2 20:40:25 2015 (r279543) @@ -1103,23 +1103,13 @@ atomic_store_long(volatile u_long *dst, *dst = src; } -#define atomic_clear_ptr(p, v) \ - atomic_clear_32((volatile uint32_t *)(p), (uint32_t)(v)) -#define atomic_set_ptr(p, v) \ - atomic_set_32((volatile uint32_t *)(p), (uint32_t)(v)) -#define atomic_cmpset_ptr(p, cmpval, newval) \ - atomic_cmpset_32((volatile u_int32_t *)(p), (u_int32_t)(cmpval), \ - (u_int32_t)(newval)) -#define atomic_cmpset_rel_ptr(p, cmpval, newval) \ - atomic_cmpset_rel_32((volatile u_int32_t *)(p), (u_int32_t)(cmpval), \ - (u_int32_t)(newval)) -#define atomic_cmpset_acq_ptr(p, cmpval, newval) \ - atomic_cmpset_acq_32((volatile u_int32_t *)(p), (u_int32_t)(cmpval), \ - (u_int32_t)(newval)) -#define atomic_store_ptr(p, v) \ - atomic_store_32((volatile uint32_t *)(p), (uint32_t)(v)) -#define atomic_store_rel_ptr(p, v) \ - atomic_store_rel_32((volatile uint32_t *)(p), (uint32_t)(v)) +#define atomic_clear_ptr atomic_clear_32 +#define atomic_set_ptr atomic_set_32 +#define atomic_cmpset_ptr atomic_cmpset_32 +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_32 +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_32 +#define atomic_store_ptr atomic_store_32 +#define atomic_store_rel_ptr atomic_store_rel_32 #define atomic_add_int atomic_add_32 #define atomic_add_acq_int atomic_add_acq_32