From nobody Tue Feb 17 20:48:15 2026 X-Original-To: dev-commits-src-main@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 4fFsDH6z2qz6S3rg for ; Tue, 17 Feb 2026 20:48:15 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFsDH4R7Fz3xbc for ; Tue, 17 Feb 2026 20:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361295; 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=rsD8+0CI6IFXrUruZHVWa6METJxWFY6puFco6C7PTvY=; b=HP33WBO6AuXZQriUMSg0n+2GOfeBFZK5+WAX5AEijftl4UtJJT3OpW7wn/SWCZF+/M6iuc 0ddwEERVmJPCVKs7WtnOMxHnBzQisJKCWvFJLRdjZre8XmOsOVzTmow0Fzr6hy8cRnCVuZ f8NSinfV9+SGIa6XQN1LRvwbQ2pdz/2WHQXm4lULpwsbD2fW4HF84669dGB6Y7IZHaI3wX iISuLSIEoHeppSHeXV41tDr65rwXOvVfPwaeQDGebIZ8Fd8K3rxWdwMqMztYnfQyf5mxaB 41XtWOjZzxDFA9I+1f9TJEmAo31BMH7vQI0BU+BOenNQ6ty+a8G2VubOwCu6Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361295; a=rsa-sha256; cv=none; b=mqgK6bMLlScehBIecjovj/KG4FPOwFGoDhF3+pHHoFWtIQ10nWXrhkOqHZ2NZgV3IvYqHH idC41elUqVcfplK/8GcCzIeLXe/0I2N67m/qZ/pg0/5tbe8MQS6QiXqfhZV0uDCXDSk3ZK k7gbIY2BZWdivClMKyPTn0CegMFZ7mg971+Cov73N8hqGw2Nh0oPE8Zeq6aHxbKSAHuXmZ F+0QoVM1HziM2zN1tT0tFkyABrrZq/ZFg9AYAerRrmeXbynh+G8DK+jzpBtDCYJ7GhA2e2 Ze5ADAvM6yE+MK3OumjvepMMwZdWnkGOAU2A+8oVCi+yPcGbDG93VI0n0ftEBA== 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=1771361295; 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=rsD8+0CI6IFXrUruZHVWa6METJxWFY6puFco6C7PTvY=; b=g/fEmB7yFQkWjzTAgO2jhHJsAp+zlSvwbT8Z/+FakaZW5F8TZBggVNeKO9hHVIBjVqdWZf cTiZyMtj4fVWhhERMtc7gFVpRyzJo8YX2SHfWZzhTMYZ3oaFk0sqnXXTUaPp2BcZV6cQGB 6dFGVaw+xifGk3Avoqtjp9JTu0RNx1GbLpL90eJj0JXh3KA4HE7wdXduK1GVMCfeFFdOAs C6hGelGbAUqoHmUZsfmG+gyIDWrEKklfjpWpOcRu80zygpgx4VtosncLnZskTlfBmMe8NE quwK0hC2/HiBLw70MzeomzeJljxfF9SKTelv3D9pMGkGMiThikd71iJ846T3mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDH3zZRz9BC for ; Tue, 17 Feb 2026 20:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:48:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1101292a555d - main - vchiq: Fix return type of vchiq_copy_from_user List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1101292a555d24c11d7630b638dc25e1ed22c061 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:48:15 +0000 Message-Id: <6994d40f.1ffc3.2b6e266f@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1101292a555d24c11d7630b638dc25e1ed22c061 commit 1101292a555d24c11d7630b638dc25e1ed22c061 Author: John Baldwin AuthorDate: 2026-02-17 20:47:00 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:47:00 +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 --- 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 7e105a6b3b77..57e5036ca363 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -318,7 +318,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) { @@ -329,7 +329,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