From nobody Thu Jun 29 08:20:22 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 4QsBGG5H2Mz4knlK; Thu, 29 Jun 2023 08:20:22 +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 4QsBGG3b0Sz3tsN; Thu, 29 Jun 2023 08:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026822; 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=J6cDstRouRl1KrvStcEameLgyMkDcF4okWReC3Ss53M=; b=e7QWWRsPTQWAC307t8j9FntCQeoFGmf50BxuifgpKMVxcMHmgzOn3JNI+nUI5nlSKezM4c MyF+T2YdG7/jKEmGF2MvkjDZmMvQi0qHpZLP7al+lYYojevyF39DYC0n7lBa++GK5PPgxh lMtnw2w6FUYymzzwZSLe6f6fOmhq946HvuLr5kfmfL38sdFeaHcdbJPk0DYsBVkJPiLcnf xAZeKLyCF1zMDRoEItdng9IpNfeJy0ouaFkS69M6jwTaP/is87to2pb08FfbgUxglsDvgE UN+053PkOsvfk06ya46ap3XnA4fNHwXpVYpSSQlIyHcl9HVTP4FPKALy8oG3ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026822; 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=J6cDstRouRl1KrvStcEameLgyMkDcF4okWReC3Ss53M=; b=hfKpd1O4eORSRIT80TFgNknTvvYw+hPWtTxyYZ+de/2S6WjyeZkYQs9zFW8Nqy3oJQB3ms n7KWOfpWk+rLEeeCwaoU6ajeGXTPEETiTuW8K1n4FoVe2dcy5iN7DQX7Er4NwDRJden+4k YshxJYfWTqMoB3DhrROkbLFzAAAxgS5WGxvoW5ua/3X5TVBPIHG+N51zU32Ky5jN7bzJFd Wd99uhsJ5TlWhfYHxFUKSdsFbdxfAMr/fVdWsImTnFWYIoNVhnnVz3Q4p7q+iwZgctr69L Da1zrB334o/r/c3T3tkYRfcuOAXSVL7OTXzlUVr/3aUKOSGwYynlxMM+whCluw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026822; a=rsa-sha256; cv=none; b=X3B8RtwmdlNUzKnXLOle8L2rEK7JvLErCgg3OTpx0J0YwCh973g4vRuz/mMDoWssDEDVfA jp6CdUWeZxtyohdJ1iiNnfuvek57GswPiDUXOTJbHgOmZGPw3rIszedka78wqWG85g2tn3 8z2wQAdY9ELfgWl0SJDUS654oZZwhbLcmLfHisDEsByE3gJAWL73zfgVpGvtR7zS8I+bRF xue6Vahkeev4TWd2O9fGPOB6oFzAGj2ozZ4RJkD8d8kvVjLHE/XZYiC2bEnmk1Akbb/Bfx aMM2KGWpOE/GTwCtaOsIEtuPeWcBosw9r4iklqOqylvsu/0Nbk9b/xmfWaJ79g== 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 4QsBGG1qgVz17sW; Thu, 29 Jun 2023 08:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8KM84083373; Thu, 29 Jun 2023 08:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KMBg083372; Thu, 29 Jun 2023 08:20:22 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:22 GMT Message-Id: <202306290820.35T8KMBg083372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4d7a9535977f - stable/13 - linux(4): Move dev_t type declaration under /compat/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4d7a9535977fb450b97ec112d739d5563fbc166b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4d7a9535977fb450b97ec112d739d5563fbc166b commit 4d7a9535977fb450b97ec112d739d5563fbc166b Author: Dmitry Chagin AuthorDate: 2023-04-28 08:55:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:36 +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. (cherry picked from commit 19973638bee2205be2a7eb07bc154b8afb1e44a3) --- 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 81d9f48f6271..a5682c6a980d 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 02fcd320152d..9ad288e339df 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 a20b3c90a066..5a391c3543d3 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 055d8e3b9cf6..9061548399e4 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 2ccb2f92ef22..32f92d8c637b 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;