From nobody Fri Jul 17 02:31:38 2026 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 4h1Ynl1nKKz6mHYJ for ; Fri, 17 Jul 2026 02:31:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h1Ynl0w3zz3MnK for ; Fri, 17 Jul 2026 02:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784255499; 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=pXq6b4zl9Ql6SUiI6tAkDF+0jqDAqlpk2h6W5assHgc=; b=BCjhPgR0vyBvmUf0Vcr6b73ZpTGGdNduYgxKnlCo7ScoeABRCkARu5v+/T/L47U/73lRFs Dt21DXu0MFy5w+wpcCLB7Ty4DPgQFNi0DvFfIyrHTmoHdcJmO4dZQEgT6ttjzglPobqh+v AGv2kZmSocf02s5R8QxA2edBw9Hogg3QFXpl84N49k/UBN9bb5gMx/BcOTcgY8D072zV9D Kt+h+oFbjVnk/Z7ZvNGlyrusLxvUcyy5lyFTtCw4yAndislMtCmxh1JnuZWX9qRfyd1ibW PKjrWJQSLWY8ey7XbCc9fHa13TKtMdjRrwqQRDBDCF9+xwXueZnxctTupBkszg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784255499; a=rsa-sha256; cv=none; b=xrpv//HWTu/vBk/i3e+2MLGHzXeOxJbTUt+V7hAgvdz/Da1reJJtk0n3iqqrhUorx9Tgnj 7m4yoUHbDZPSEd8lcsh3hoR0VSh/14sc1OMC7+xvfanxHYnIJpTO+kM66uSrOscvAKk+zW b2QjEwt/Ksn5d0dzEUf8tk++EBIBJtKRzZVyVr0oqUo6HOh6lMPERe+pTrvOEx0hDeruVr Oftyrhd58FWWcoS3mCWpe4cQSJssX4SBKULjywISmAmU1AVst00SYIT9c2aSMwe7N7XsrD Th9GzZ0PYcOzny2enn5BFKTkclcpY/OQuG1Xdz70ZkT2Iivp0nn/yRWfELWkvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784255499; 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=pXq6b4zl9Ql6SUiI6tAkDF+0jqDAqlpk2h6W5assHgc=; b=DwEcnMEoxQ1HzmgT8nX3pq4AVodScmUu5KQnj5XKuh9P5BLHZeGrpEQ3HZg+XFpdOFYgUD wXVk35crfpv4jcOFlCTQbqkiKdu45wxplXljJHalnmZWtBrQJ65tij5A9jqPWAgiMAQWJ9 xGm2AzyGaSXFAMo8jPXlmcwHZhGPhV7ODG94U9jwptIQA7fSGumron7KWhAiOaXbEofCAH YTx9IQIbikz0/fDHrKouCEUs+692VbaJD066ynUVxom7M76EaUehDPTXAZrIBMX5ARawdX iXs7kUglMUW9/FwWX5vPF7+PEnY6GFDesZ6AXJqI0endMjHYdT6QDFlHkYZBmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h1Ynk6yWbzCr4 for ; Fri, 17 Jul 2026 02:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c11d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Jul 2026 02:31:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 5cafd6213f14 - main - exterr_set: sync the definition with the header declaration 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cafd6213f145bbe2a70d55eb90a3d894e66115b Auto-Submitted: auto-generated Date: Fri, 17 Jul 2026 02:31:38 +0000 Message-Id: <6a59940a.1c11d.5d8c1a96@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=5cafd6213f145bbe2a70d55eb90a3d894e66115b commit 5cafd6213f145bbe2a70d55eb90a3d894e66115b Author: Enji Cooper AuthorDate: 2026-07-17 02:26:17 +0000 Commit: Enji Cooper CommitDate: 2026-07-17 02:31:16 +0000 exterr_set: sync the definition with the header declaration This unbreaks buildkernel with TARGET=armv7 (32-bit arm). More work may be required in order to unbreak `exterr_set` with 32-bit kernels. Fixes: 844009378da9 ("exterr: allow exterr to fit pointers on CHERI targets") --- sys/kern/sys_generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index c867867f2618..cf152018c689 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2353,8 +2353,8 @@ kern_exterrctl(struct thread *td, u_int op, u_int flags, void *ptr) } int -exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1, - uintptr_t pp2, int line) +exterr_set(int eerror, int category, const char *mmsg, uintptr64_t pp1, + uintptr64_t pp2, int line) { struct thread *td;