From nobody Tue Jan 24 22:13:49 2023 X-Original-To: dev-commits-src-branches@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 4P1h7y0QvVz3bgcG; Tue, 24 Jan 2023 22:13:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h7x6lG3z3Jg0; Tue, 24 Jan 2023 22:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598430; 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=l4YpC7wvfEMPD13l+HUdi6Ja7DZJz/HDMCPuZVOzU2k=; b=rbgF3uBKvAwa6aMFFhLI7ei9nHlXFILEVkfM9rgIObxfLMskgIroryKXHuCC4pgloSUtbe CaKnESpWyxnLZ6PvWBL/tlgrxY09lWjwReAB0KGzzGCaE0tb0Cvi5QJWftkKnvxGbIZ+IG qYoOmzYxghh/akgIImgC1gf5HNI9PiFLfd4kVZ+D7XVrRzTaq2WYZdWQ4zUCWMmvIH6C3o kIp10dFma9XiY++t700mMwATO/1FrM82URFYADebtjs9ITRQXzti/xut48efE7WobJQMR1 MNhIf9aleyNBz8R9TU9OykpfuijpsWC97i7qz5zHinQJJ4Ii7oxYdE6YncCSzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598430; 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=l4YpC7wvfEMPD13l+HUdi6Ja7DZJz/HDMCPuZVOzU2k=; b=xOvzLGMegpg+iIDm48cdct4ZebKyP6tjbP7g3N+KLBLWLg52rWJW/IJTn7tPZp77Xh/nWe pN0o0l6MdOvfeZ5bGVol+b3I6vKQI9bxBcGnAkE0nAg9Pj+3fnXfH9k/Vwr+9nFqIdzWjM jpWqokXq9V+ix+ni7vTdDMRqxsdx4GjCvsCyAr1osqtAqf0T+pR8TaAHt/Pnd9+CZdkfez CGCgXBEOKpIiO59zBh+AVhUVbDnZ7G577JtpojztFeJWGDE5s0yncJkPPDd7xigdY/RlLJ vmMf6lQWSkXHwQ8u/GhPBaizXOgDmy7OdIdr2InrM3/P70pCFRtm/5nwR/cqYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598430; a=rsa-sha256; cv=none; b=nxWwVm+sd45B5/uSigo1cfnok7cPoVftm5HbR090+d8o0ViuNpT/ixQwVqDHLGWz8ozZVs pl5zrW7/1qsUbWLhTab8DOj8+6r5sqIV1jexLWr6YjcROeNdKgc0taOoZlrESLGk0uVj1J GCxxGvpPxbbLU5Uz9O2FadtrQRcirLVk/ZT1OgMnsCrVW0iE+FqOdB4IyV29qrW3tEemXA CpNQf2bSd8Eh49SPWRNen9tR7N8jGz5wyrrA6GAdRpXhcT0A436kc+XcM9LqFBVLcnlLob 6+Po27FRsu10YluXtKr3LnlXnv1AjNJh50shycJ8hSF6i5y4Bz5a638ypzjPOg== 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 4P1h7x5q22zQk4; Tue, 24 Jan 2023 22:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMDn5B088960; Tue, 24 Jan 2023 22:13:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDniK088959; Tue, 24 Jan 2023 22:13:49 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:49 GMT Message-Id: <202301242213.30OMDniK088959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 76cd49c8fecf - stable/13 - stand: aarch64 has different nlinks than amd64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 76cd49c8fecf77412c9449c3e7583fb8d0455f28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=76cd49c8fecf77412c9449c3e7583fb8d0455f28 commit 76cd49c8fecf77412c9449c3e7583fb8d0455f28 Author: Warner Losh AuthorDate: 2022-12-04 05:46:21 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:42 +0000 stand: aarch64 has different nlinks than amd64 Some typedefs are system dependent, so move them into stat_arch.h where they are used. On amd64, nlinks is a int64_t, while on aarch64 it's an int (or int32_t). Sponsored by: Netflix (cherry picked from commit 929c6216b1668b9a8bc7d9d9edfd528ef74c69f8) --- stand/kboot/arch/aarch64/stat_arch.h | 2 ++ stand/kboot/arch/amd64/stat_arch.h | 2 ++ stand/kboot/arch/powerpc64/stat_arch.h | 2 ++ stand/kboot/host_syscall.h | 1 - 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stand/kboot/arch/aarch64/stat_arch.h b/stand/kboot/arch/aarch64/stat_arch.h index 2462caed8682..9b52fe60c449 100644 --- a/stand/kboot/arch/aarch64/stat_arch.h +++ b/stand/kboot/arch/aarch64/stat_arch.h @@ -6,6 +6,8 @@ * Note: From the musl project */ +typedef int host_nlink_t; + struct host_kstat { host_dev_t st_dev; host_ino_t st_ino; diff --git a/stand/kboot/arch/amd64/stat_arch.h b/stand/kboot/arch/amd64/stat_arch.h index 81f3738f3ea6..74946abd2cda 100644 --- a/stand/kboot/arch/amd64/stat_arch.h +++ b/stand/kboot/arch/amd64/stat_arch.h @@ -6,6 +6,8 @@ * Note: From the musl project */ +typedef uint64_t host_nlink_t; + struct host_kstat { host_dev_t st_dev; host_ino_t st_ino; diff --git a/stand/kboot/arch/powerpc64/stat_arch.h b/stand/kboot/arch/powerpc64/stat_arch.h index be5584951afb..103849b0e82b 100644 --- a/stand/kboot/arch/powerpc64/stat_arch.h +++ b/stand/kboot/arch/powerpc64/stat_arch.h @@ -6,6 +6,8 @@ * Note: From the musl project */ +typedef uint64_t host_nlink_t; + struct host_kstat { host_dev_t st_dev; host_ino_t st_ino; diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 0029004f675a..ea0745542a5b 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -37,7 +37,6 @@ long host_syscall(int number, ...); */ typedef uint64_t host_dev_t; typedef uint64_t host_ino_t; -typedef int64_t host_nlink_t; typedef unsigned int host_mode_t; typedef unsigned int host_uid_t; typedef unsigned int host_gid_t;