From nobody Fri Apr 24 17:55:59 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 4g2LH508fvz6ZxHK for ; Fri, 24 Apr 2026 17:56:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LH31yJSz3pyX for ; Fri, 24 Apr 2026 17:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053359; 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=ZR/rmjUCOFNcs7H90bMolhs3GV2O+J5zivWzcXYviic=; b=jou370AMx4yUcNWsQgHdd5l3VjI2p9JWoI8tiLZWC3DZLGi1FXM1Xc3H7sZAyq03tix6NF S6FaA3Vl3DCOJIe6OwKx/UVvp5M5NLg9NcyRlR80HvBfY119yuk2P1ASFzqicjIuqbYP7k xBMEI+GloDafDFexblmajzLhhXeKehs/+telvMFuUQAPy8h7E8Y4sVK1a+t4wgqDeRQk/v WoLXFN0w1QRJS4Pz/FkF/S6nQ97BfGBeuE4/Wtp0ml8j9CoXPNrw3KP2vAjNOlrNEpDZV3 lVRz1gQSfckapW151/yzDsvws08iBuSnxGiK4hrPcdMXWdSXlUlMOaLA2wwMZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053359; a=rsa-sha256; cv=none; b=SMo7ArNzpxGv0xUmyavBX+Z1rx+es/kBl/c1lcUzM8LzXYdaAKkgDU7x2OlJsVnhDCRnXI VNA4lYIxJS9YEPu69qPOBuN+KJz406vp7V6m4SgQu5OB+6MVSzPwGdZ1krlL6xoXoQc2jv jzUZCazhgfQkf9Lc1t4Y6+oDhCfyPfOioG5GTysu3dumCdUMq60L4oQ7g60ObaKD+pOsl9 lpPscNE4+8cjZJP4FF4TfIPMzJJUJTsLZhDH1VBZJhNbD4gmtdVCoiZflpjVeQyJ7DrMKr rvRZNT3BL3GaqzH29WbmfSSKHErbMKOnnPfvFmPAx7gAxlUa85RCxygY0xeHdg== 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=1777053359; 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=ZR/rmjUCOFNcs7H90bMolhs3GV2O+J5zivWzcXYviic=; b=MHrJGPjayFD1BbDMKDUQ+a17gm6Oyicsjo7nZjk4sSEMaJEKPqRqnKDrysEN7AmCqLU9Zb 4dX3IpqnPpwQMFk54MG/zrbtHKzQbEC4bVM3io9D5Uj593CvloEymtsbwPMqr5m/6Uwjmr ZVbf+tRJRRvSN+KiUC8rqncxH7t7r1hroLfFTJ3UFwLUL52StVHd3+m4BJctJGvA/GTA+E lyRgWDqVwqaMjDjOeQLz81xxLOJIhqleSTuclUWqm+znEHuqcQaI8adlJKZg+uevCQktzW GKAgr9pYwIS4NG5ULG68Mv2YCd3yjex0fOjRXUnJ9CCYB7Qv1Uqxf3dW/P5l4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LH31THjz1CQ9 for ; Fri, 24 Apr 2026 17:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c4dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:55:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d17f7f9e911a - stable/15 - vchiq: Fix return type of vchiq_copy_from_user 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d17f7f9e911ad77ac14cb2974935c57931a7720b Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:55:59 +0000 Message-Id: <69ebaeaf.1c4dd.42086423@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d17f7f9e911ad77ac14cb2974935c57931a7720b commit d17f7f9e911ad77ac14cb2974935c57931a7720b Author: John Baldwin AuthorDate: 2026-02-17 20:47:00 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:37:25 +0000 vchiq: Fix return type of vchiq_copy_from_user Change the function definition to map the declaration and consistently return an enum value. This fixes the following error reported by GCC: sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c:322:1: error: conflicting types for 'vchiq_copy_from_user' due to enum/integer mismatch; have 'int(void *, const void *, int)' [-Werror=enum-int-mismatch] 322 | vchiq_copy_from_user(void *dst, const void *src, int size) | ^~~~~~~~~~~~~~~~~~~~ In file included from sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.h:38, from sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c:61: sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h:647:1: note: previous declaration of 'vchiq_copy_from_user' with type 'VCHIQ_STATUS_T(void *, const void *, int)' 647 | vchiq_copy_from_user(void *dst, const void *src, int size); | ^~~~~~~~~~~~~~~~~~~~ Differential Revision: https://reviews.freebsd.org/D55163 (cherry picked from commit 1101292a555d24c11d7630b638dc25e1ed22c061) --- sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c index 0150ce72f0a4..8e30e1c38b6d 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -255,7 +255,7 @@ vchiq_platform_get_arm_state(VCHIQ_STATE_T *state) return &((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->arm_state; } -int +VCHIQ_STATUS_T vchiq_copy_from_user(void *dst, const void *src, int size) { @@ -266,7 +266,7 @@ vchiq_copy_from_user(void *dst, const void *src, int size) else bcopy(src, dst, size); - return 0; + return VCHIQ_SUCCESS; } VCHIQ_STATUS_T