From nobody Mon Jan 27 21:12:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yhh2V4rC4z5mHr1; Mon, 27 Jan 2025 21:12:34 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yhh2V43FFz3Tv8; Mon, 27 Jan 2025 21:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738012354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0C27zVl8yTLa64j5570jbcT9KPFYW/oLR10dBoNPxsY=; b=Lvzty/RVEazwL9YIIgjgfZvk4gqMEKGtVVlt6CUT6upOC0CRgttQwHIncK74lneSliC5XP sBHmVJwJ4aLAS1EBJJSp9fyI6XbHAktt2l4olcfVG8QcMqBllwGchNFrP4d9yKunh6mxkc YA8A9gYIc7ZdviabtV1Cvf8IWDId4jnaTftupzmSExwGRgoNjh+qVo9P8wcHXoIT5V8QGk buOlPcNLXK0GKSecapURVJGa20SgHp6Md8k4p/XiG9dzdk2iuxz4IBERjy97oLeGzE2PC+ d88UtEFN9nuyr2XDNE2RchED70iWLHZuprVJEgs6r/qeoa8HDt1/HwdyQtZRNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738012354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0C27zVl8yTLa64j5570jbcT9KPFYW/oLR10dBoNPxsY=; b=H4P6h89mBk7aStQSUnrf8VjceFrwoq348Jn0qW9og025oTISdtFkkzCAald6gOrj0uPZkB hXo0hCTvdkpAbqbvkU3TGdBMDiD2fDosiNa/0cAMwF6kLlqrZoERWaCIq8Up+KsN0CZ+jY LBri+xtT4lZA7o1CBbfh4U9x7dnQbVHrMkW5jzjt10ug1d80a7M4KU8dA8EKzbjho+Md5B yicJwLmrFnyOxd8kzjhyZ+79mZpifgJ3aqS6mb4mTrUDdVMxKOqM86yqG3VGXrMFaIPjn0 LdtZ/pSqgU8VvYmy/miEo6K1G5ZFtUkbKGgbW8KYxNbhjHpxw1SMV5RaXhnScg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738012354; a=rsa-sha256; cv=none; b=Zc5j2sf6ghStl+p0yBTVBxjAcRz3I6k5T7bvCaZQ+S1twISVY9IRG2h4JnZ9MNykmE9Vjd 2G8F3x1uYwFaI+yWNnbptUc7P2GGS0pxv1Cw8n1kMNZhEqPLCYUZ2RIiq8jPHyF9tdRaJf jM4pgEsMusjgThTEy0DeIP9ZSxyQSiKi1EU9lpTBlADSY6ybGU7e6Z4fzLIbhIaFLxdqcd FcCfAqXOrc/Tf2AcJ+ZYLn1/IrFqyrt7kuXQxtwROo1M32OlbVBPFDPxTsXlb3M7atPbPV WDaTI+O4iNqhALHxdWWwqdiKPOOoXhAyjCLtRThHr0aMFY+iKaLX5KjljenvUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yhh2V3dNXzm7W; Mon, 27 Jan 2025 21:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50RLCYVa030033; Mon, 27 Jan 2025 21:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RLCYMY030030; Mon, 27 Jan 2025 21:12:34 GMT (envelope-from git) Date: Mon, 27 Jan 2025 21:12:34 GMT Message-Id: <202501272112.50RLCYMY030030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 118a280569d3 - stable/13 - atomics: Constify loads: mips List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 118a280569d3baaee11d1766bf87fbb93cf0a6d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=118a280569d3baaee11d1766bf87fbb93cf0a6d0 commit 118a280569d3baaee11d1766bf87fbb93cf0a6d0 Author: Olivier Certner AuthorDate: 2025-01-27 20:49:48 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 21:12:16 +0000 atomics: Constify loads: mips I had forgotten that mips had been removed starting from stable/14, and didn't compile stable/13 on this architecture... Consequently, this is a direct commit to stable/13, irrelevant to other branches. It fixes the compile error observed there only, caused by the MFC of additional constification commits, including SMR and the sanitizers. Reported by: Jenkins --- sys/mips/include/atomic.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sys/mips/include/atomic.h b/sys/mips/include/atomic.h index f14fa3de65f2..900924a8809e 100644 --- a/sys/mips/include/atomic.h +++ b/sys/mips/include/atomic.h @@ -329,22 +329,22 @@ ATOMIC_ACQ_REL(subtract, 64) /* * We assume that a = b will do atomic loads and stores. */ -#define ATOMIC_STORE_LOAD(WIDTH) \ -static __inline uint##WIDTH##_t \ -atomic_load_acq_##WIDTH(__volatile uint##WIDTH##_t *p) \ -{ \ - uint##WIDTH##_t v; \ - \ - v = *p; \ - mips_sync(); \ - return (v); \ -} \ - \ -static __inline void \ -atomic_store_rel_##WIDTH(__volatile uint##WIDTH##_t *p, uint##WIDTH##_t v)\ -{ \ - mips_sync(); \ - *p = v; \ +#define ATOMIC_STORE_LOAD(WIDTH) \ +static __inline uint##WIDTH##_t \ +atomic_load_acq_##WIDTH(const __volatile uint##WIDTH##_t *p) \ +{ \ + uint##WIDTH##_t v; \ + \ + v = *p; \ + mips_sync(); \ + return (v); \ +} \ + \ +static __inline void \ +atomic_store_rel_##WIDTH(__volatile uint##WIDTH##_t *p, uint##WIDTH##_t v) \ +{ \ + mips_sync(); \ + *p = v; \ } ATOMIC_STORE_LOAD(32) @@ -745,7 +745,7 @@ atomic_thread_fence_seq_cst(void) atomic_fcmpset_rel_32((volatile u_int *)(p), (u_int *)(cmpval), \ (u_int)(newval)) #define atomic_load_acq_long(p) \ - (u_long)atomic_load_acq_32((volatile u_int *)(p)) + (u_long)atomic_load_acq_32((const volatile u_int *)(p)) #define atomic_store_rel_long(p, v) \ atomic_store_rel_32((volatile u_int *)(p), (u_int)(v)) #define atomic_fetchadd_long(p, v) \