Date: Sun, 4 Dec 2022 05:55:20 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 929c6216b166 - main - stand: aarch64 has different nlinks than amd64 Message-ID: <202212040555.2B45tKnm086785@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=929c6216b1668b9a8bc7d9d9edfd528ef74c69f8 commit 929c6216b1668b9a8bc7d9d9edfd528ef74c69f8 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-12-04 05:46:21 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212040555.2B45tKnm086785>