From nobody Fri Apr 28 08:57:15 2023 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 4Q761S106bz48CJK; Fri, 28 Apr 2023 08:57:16 +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 4Q761S00fTz4RtL; Fri, 28 Apr 2023 08:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672236; 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=IZMWeSxHn+T14Czy+6UQVlauJ7Aq9Y1piX8g1pDnw/g=; b=kwmieaEPvMylz+N2xp1VwcwUoNWRnPUpIw2CTKPK1zKhs3Lbi5Uz6FI4IkAvioVOtQA+rA lWKnEn+/txMDr6CoK2PX25NQ9mKNLB/exAk2ZWPsUtosm72+MCr9UnhsiJ9ntFGLa+RY1k hTwdW/3vGOqfS7EmBY4n9NixlrhXRps9gUxiGoXn/J2idzxFT2iEd5/73uGhP/ExrLeWdL j2lIBa+X7Mop58sG0wfYJ0Isn3SP0m5DmxPp+rUFWo0Ut6jLx5ye0CXKjaYj/cRx+HuzAI 9buxUx5AOv7YRR+zTJ9LVis+DC869EqQdfkeoi/bM0pKsHM8EA4oaQYoLAPipg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682672236; 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=IZMWeSxHn+T14Czy+6UQVlauJ7Aq9Y1piX8g1pDnw/g=; b=icuGxPOwvlPL8dy1e/5hdd1L4aeW3/MN3/+ga+//w4rfGCLt0oUpUGkFdRetmGfisH3ooL pmlBN/+lJRKNNdzZfiaJYYY4TBq0x/QK7pDFk4qvbky5YNwqinvUVQ0PgWm6Xxu7Ill25L +MPx24U0248+U9+yadJ80UckbhUYRtaT9RDu9eCwrE4iea0vYe2kpR60/6SSC5I8rJgOvz jsQKi0xTG8fh+cczt1fXF4Fa2dYeTbAV7DTHBJ4mnXF8GONhbPgeb/3YlgcNu3DZt5i4b1 2nkHmRKGCAL3ykeT1smBOkIReKI1rAogImwILOHmY+6Wrw5mCp0b6DrUMNSiZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682672236; a=rsa-sha256; cv=none; b=Y0P158KT+7WzaffyUJn+Xo5uHmP8o/tiJ5yhOwO0nvIadRf96opgQUbOBg9xQyYLqnl/BY 8/wxwx9Bzw/tocSjZ+fmmb2WBY9zYQp1sYvyEM7jLcTbloIS8HPfRMsP+4yuuYLzslviLP r3jOBcIuLwooNDFduCxOd1EMKuOJCdthboepLaUteJpdLQttWg1SC8XgxrxWwDHCAjl5Un RBXZeCRurR/1FsoYEtGSm2N35+JZ8ork+p40WMHpnJkdCd62GHHsY0AL0kJG8BJznMs083 hePm4lMjKqbijKUcT1qj59ZmTbFP+AQGauSjvzac+PxGv/0c7gq9ykSYNJJjjg== 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 4Q761R66PzztTy; Fri, 28 Apr 2023 08:57:15 +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 33S8vFIx018051; Fri, 28 Apr 2023 08:57:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S8vFfR018050; Fri, 28 Apr 2023 08:57:15 GMT (envelope-from git) Date: Fri, 28 Apr 2023 08:57:15 GMT Message-Id: <202304280857.33S8vFfR018050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 19973638bee2 - main - linux(4): Move dev_t type declaration under /compat/linux 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19973638bee2205be2a7eb07bc154b8afb1e44a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=19973638bee2205be2a7eb07bc154b8afb1e44a3 commit 19973638bee2205be2a7eb07bc154b8afb1e44a3 Author: Dmitry Chagin AuthorDate: 2023-04-28 08:55:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-28 08:55:02 +0000 linux(4): Move dev_t type declaration under /compat/linux As of version 2.6.0 of the Linux kernel, dev_t is a 32-bit unsigned integer on all platforms. Move it into the MI linux.h under /compat/linux. --- sys/amd64/linux/linux.h | 1 - sys/amd64/linux32/linux.h | 1 - sys/arm64/linux/linux.h | 1 - sys/compat/linux/linux.h | 5 +++++ sys/i386/linux/linux.h | 1 - 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 4aa45ad8ca96..4a7593e422c9 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -54,7 +54,6 @@ typedef uint16_t l_ushort; typedef l_ulong l_uintptr_t; typedef l_long l_clock_t; typedef l_int l_daddr_t; -typedef l_ulong l_dev_t; typedef l_uint l_gid_t; typedef l_ushort l_gid16_t; typedef l_uint l_uid_t; diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index f26ff5c216d2..2d4e5541f2b5 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -63,7 +63,6 @@ typedef unsigned short l_ushort; typedef l_ulong l_uintptr_t; typedef l_long l_clock_t; typedef l_int l_daddr_t; -typedef l_ushort l_dev_t; typedef l_uint l_gid_t; typedef l_ushort l_gid16_t; typedef l_ulong l_ino_t; diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index f3c55ac0fd6b..423f1fb0acb8 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -49,7 +49,6 @@ typedef uint16_t l_ushort; typedef l_ulong l_uintptr_t; typedef l_long l_clock_t; typedef l_int l_daddr_t; -typedef l_ulong l_dev_t; typedef l_uint l_gid_t; typedef l_ushort l_gid16_t; /* XXX */ typedef l_uint l_uid_t; diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index e133c35010cf..4ad94bf11efd 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -28,6 +28,11 @@ #ifndef _LINUX_MI_H_ #define _LINUX_MI_H_ +/* + * Machine independent set of types for the Linux types. + */ +typedef uint32_t l_dev_t; + /* * Private Brandinfo flags */ diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index db4b2990b92d..826cb1bfffb0 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -55,7 +55,6 @@ typedef char *l_caddr_t; typedef l_ulong l_uintptr_t; typedef l_long l_clock_t; typedef l_int l_daddr_t; -typedef l_ushort l_dev_t; typedef l_uint l_gid_t; typedef l_ushort l_gid16_t; typedef l_ulong l_ino_t;