From owner-svn-src-all@freebsd.org Wed Feb 19 19:51:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 543DC243BEB; Wed, 19 Feb 2020 19:51:10 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48N7dB1Kzpz46VB; Wed, 19 Feb 2020 19:51:10 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C5CDDFA6; Wed, 19 Feb 2020 19:51:10 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01JJp9gf084044; Wed, 19 Feb 2020 19:51:09 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01JJp9v6084043; Wed, 19 Feb 2020 19:51:09 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <202002191951.01JJp9v6084043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Wed, 19 Feb 2020 19:51:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358129 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: jeff X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 358129 X-SVN-Commit-Repository: base 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.29 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: Wed, 19 Feb 2020 19:51:10 -0000 Author: jeff Date: Wed Feb 19 19:51:09 2020 New Revision: 358129 URL: https://svnweb.freebsd.org/changeset/base/358129 Log: Since r357940 it is no longer possible to use a single type cast for all atomic_*_ptr functions. Modified: head/sys/sys/smr.h Modified: head/sys/sys/smr.h ============================================================================== --- head/sys/sys/smr.h Wed Feb 19 18:48:46 2020 (r358128) +++ head/sys/sys/smr.h Wed Feb 19 19:51:09 2020 (r358129) @@ -120,7 +120,7 @@ typedef struct { \ */ #define smr_serialized_load(p, ex) ({ \ SMR_ASSERT(ex, "smr_serialized_load"); \ - (__typeof((p)->__ptr))atomic_load_ptr((uintptr_t *)&(p)->__ptr);\ + (__typeof((p)->__ptr))atomic_load_ptr(&(p)->__ptr); \ }) /* @@ -155,7 +155,7 @@ typedef struct { \ */ #define smr_unserialized_load(p, ex) ({ \ SMR_ASSERT(ex, "smr_unserialized_load"); \ - (__typeof((p)->__ptr))atomic_load_ptr((uintptr_t *)&(p)->__ptr);\ + (__typeof((p)->__ptr))atomic_load_ptr(&(p)->__ptr); \ }) /*