From nobody Sun Dec 4 05:55:20 2022 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 4NPwrS4mQJz4jQb0; Sun, 4 Dec 2022 05:55:20 +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 4NPwrS45Kjz4S2H; Sun, 4 Dec 2022 05:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670133320; 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=4c6kEV9Ty6rdUgG6OsjQD5kAfXtU/K82se8hNQqJDFc=; b=RMBevc3CazNlxh4uHrdDmW2jQTFxTBboGFo+gghixUdsJi4wRFrh0tUzOjWc00rzbwW6h9 ByzcMr9UmsgaaBBfyNQgO+KMfDH5/pkhE0Y+2YZZ8DQRsAEz1CZnku86GSrI0bimYqFnpk cTisppjwUthsBtsv/AJGMcf0cbPMkQlPdExM/TcW4BFC5a61qxpoIqp9MHiGsWnryMaWWT AXxQ8/I2q1m3hRxXf+/TeToOFK6GBU4KksFDK0k5H5xS/ChVFDVsdD6WhIka+Ti3HVOcbt XIxuWEkN9fi3DPYd18h58tSt47abfE4IXnqs/FgRlddBw0rmDz9hZ36if8giOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670133320; 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=4c6kEV9Ty6rdUgG6OsjQD5kAfXtU/K82se8hNQqJDFc=; b=ohUoguWQgmmmTFKYZSIEKuMstWDdXhycG1MXtFZoGFlkboLWVxur7vkCUDZOnAgDGWqVCf xD5HWeYiiw2rwyu6ClR10IhId3izG5KeVDdSzh2oMBr6Kd5RUByfyUBnZrXa7cc7WV1+7M T4KKdpABoTKcwDukHOT5snIFmk1/+TWaqqAICwiEyz3Wn2d3GeCOjUtla1f9RV85p0EbJ1 WfPUXF8GvJMxscNPNg7oww/fsbUHyZjKetfkU83t7BFUS2M7C9KY9WTwzhW0BWrYgrjmOC 4E7N2xu6TALTyMJqkzrOJ0r8UGRBH/hmcAOdHMLjGKxRKgMofX2ImtoAJNR+tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670133320; a=rsa-sha256; cv=none; b=Sd+1YFAtcfmVSNVTSIMpc5INJmiW55v+894I1BTc+CaY667CHQf9cgjj9F45ShfJuzkUqk X9DhPxp28/Tx8qfvuENoeUrcd0xWHNalnb0YkKMW8argxCbzlO7j6KnhZ3T8/FX9KQ9tB2 h1X7IcONCxY1luyhznyX1tAsobiMpi+zK8uSfuR9r4PybzBuAlx8pJ8JK9vz2Cz8f9aPXS tawXvJwlvHxkFHzFFewOjP8vJhkf/x9SSb77Oss+91YALlvBfetkoKLeE0GYClArtvX//Z F06V6cIZa7pbif7vYqgGGoMGHZ8J7FBCvvstNisbgS9H1NjO/6SMe7tM+QeHgQ== 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 4NPwrS2zj1z1N1N; Sun, 4 Dec 2022 05:55:20 +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 2B45tKpk086786; Sun, 4 Dec 2022 05:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B45tKnm086785; Sun, 4 Dec 2022 05:55:20 GMT (envelope-from git) Date: Sun, 4 Dec 2022 05:55:20 GMT Message-Id: <202212040555.2B45tKnm086785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 929c6216b166 - main - stand: aarch64 has different nlinks than amd64 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 929c6216b1668b9a8bc7d9d9edfd528ef74c69f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=929c6216b1668b9a8bc7d9d9edfd528ef74c69f8 commit 929c6216b1668b9a8bc7d9d9edfd528ef74c69f8 Author: Warner Losh AuthorDate: 2022-12-04 05:46:21 +0000 Commit: Warner Losh CommitDate: 2022-12-04 05:53:18 +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 --- 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;