From nobody Thu Nov 27 14:56:06 2025 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 4dHKHp6kGbz6HMkC for ; Thu, 27 Nov 2025 14:56:06 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHKHp3yhgz3nWN for ; Thu, 27 Nov 2025 14:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764255366; 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=A5mXCflSmFob/LjzT5VZQqA0M7ApB6eRtwbyaGp6qvU=; b=KFgE5ZKEHDl1Y+79POH0MRy3W60QgYrvEfsMvR1LwsmNibj8Gw2Ny4mC59J1PdSGJv/QP+ g/a7HjZYnEfEO9t74YGR7UzzOXIyr3PszNl+x0twAQSFka0BCS1m1ukqKOWyqV690r+Q7v DNpzd2fDGv8zc1Zgdt9r+FDNYj+4LP9HMmQTwYswYf0f0XLPhwrYE+zLoJNz+Gkd8m+BVC jTG/9pVnIVFgL4xQizp2RuIC+Pp/qqJza7/hYUZDKF5FotHKXs9WSeuEmepQpPjUQ7F4q7 ZTqt1K1zJOdwStJL+GzUzvtqCBcq18M2faWshJoC9m4dF3DvtRsogMn7MGpKvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764255366; 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=A5mXCflSmFob/LjzT5VZQqA0M7ApB6eRtwbyaGp6qvU=; b=gmjvfGhDBDHF0iWGZ+y5TX9N1Lckvi29qzqp3TAQtVLuOdUklD3qVvCCQPyFOEuM86gFy4 phtXO3D/6n1z68pBbP0iEFQmby9JgZqM9sA7rPcVRQRGlWYVOorSypV3w7krpNXbfcDR2A 8/sCghWYCxlq3tlwALVPb5Lb/FrqDRS+sRxs0ECJsVwMnJ54KUG0V6l3YeRXqNuZTI4o+L NRnlEkZkCpqt+LRuFFAV/EbecyDUT0Hx5HwMvspvnemZPIu1T3E6aWvWYiElnOalGuHhEP PF6hPIYROfJ18AE2dth56jClngF3pu9ZFwSwvgyTvz98xo322ideYKHCR1o1mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764255366; a=rsa-sha256; cv=none; b=gCi2tOrpvGUFaj4EiAIgd+uGZdcbfmTC0BcHM32DfwiHvfCfYQ85LADJpJKp4CBVvpcfHZ 2cVQfHuuCM9XzDUbZTP2qPH+XRul4X+jI412DCpOvDYLfnNBJ6Rtz/Ze/oEa4escXuDFnR z+GVvMWfwD+KO4QHMWaewrlJsIXRNGkuuT7fZzlhCATQcy0r6gRVc2YvHrSmqCsvmmR9xq 1zMHtS+kvFhl9T1+aZmhiWHUSBkD+OiPEv5sT5KsoU3WKYFiaMkIRsFAVfse2IT/+iTnBz gosNN/znYFhiC3OS+/G6ZdYJGc1MIsbzkQafizY+E3Zthq1XMjE0qOhPUORS+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dHKHp3PBsz5cG for ; Thu, 27 Nov 2025 14:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Nov 2025 14:56:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6aaba753830e - main - sys/_types.h: centralize __vm_offset_t and __vm_size_t definitions 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6aaba753830ec1d82959f21151dfb6563d38efba Auto-Submitted: auto-generated Date: Thu, 27 Nov 2025 14:56:06 +0000 Message-Id: <69286686.31cb4.32e873ee@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6aaba753830ec1d82959f21151dfb6563d38efba commit 6aaba753830ec1d82959f21151dfb6563d38efba Author: Brooks Davis AuthorDate: 2025-11-27 14:54:56 +0000 Commit: Brooks Davis CommitDate: 2025-11-27 14:54:56 +0000 sys/_types.h: centralize __vm_offset_t and __vm_size_t definitions Use __ptraddr_t to define __vm_offset_t and __size_t for __vm_size_t rather than per-pointer-size definitions. Reviewed by: kib, markj Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D53818 --- sys/sys/_types.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 6e69b06f689d..3589fcb87a9e 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -72,15 +72,11 @@ typedef __int64_t __intptr_t; typedef __int64_t __intfptr_t; typedef __uint64_t __uintptr_t; typedef __uint64_t __uintfptr_t; -typedef __uint64_t __vm_offset_t; -typedef __uint64_t __vm_size_t; #elif __SIZEOF_POINTER__ == 4 typedef __int32_t __intptr_t; typedef __int32_t __intfptr_t; typedef __uint32_t __uintptr_t; typedef __uint32_t __uintfptr_t; -typedef __uint32_t __vm_offset_t; -typedef __uint32_t __vm_size_t; #else #error unsupported pointer size #endif @@ -109,6 +105,9 @@ typedef __PTRADDR_TYPE__ __ptraddr_t; typedef __size_t __ptraddr_t; #endif +typedef __ptraddr_t __vm_offset_t; +typedef __size_t __vm_size_t; + /* * Target-dependent type definitions. */