From nobody Fri Jul 19 15:40:18 2024 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 4WQYll1wGzz5Rr9r; Fri, 19 Jul 2024 15:40:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQYll09Tnz4sYm; Fri, 19 Jul 2024 15:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403619; 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=8tVv6thUbq+kOq5I+oAfqWJTzJAU+y9scHKqIY1bXO8=; b=BIIhj5rwj1l4cn7xdGV/XCk1xG77bZyzxxwZaLivQKyFK0IKB/u9sR5mcUtcKQMcAXtKPd 7eCeaTKTOCbM0DylIPRDTvbHnhUl69oc3D1CEd429HqMUMCzntImhcWO/oGHih4NGLim03 fv/VKwrnPWTNehoR2/006KJYtHGZLynxVlevQMnO4RJyxJJ/XcmhOHMh+jYcKcxFH/ckv1 yUUwuEsRxnrHTpSKxdbK3PMOnp7qB4BG6xoi46E38+SzGp8I6rtxZLazrwm7cJXUt7CSam 7PIFLWWGcPFElYamamXa6fgkkhEYUHG63uIKOyUwZIYHJQwAhgCBYC8lDBua9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721403619; a=rsa-sha256; cv=none; b=I65TzDJetMtKLmWYK88CMLcmL4DvUcohyWHSI1Z8mR7WF8vBftIvhVB/8HezyD+WADEWR+ Uy4/3PXxFt+CEaDKMIMQcZ7Yu6BKCUPmS6hINC7i+mCRQc0UT82t1uhvNwDafld5Q1zr/o 8T/PfEyJjJ1fYT3g5jg+4zxbh/A/m2SWXl8zsth8E2d4+E8k7iJcqS8yAFwjsCoLk0Oq9l VWkoybglVZ/VGDQkmUpeRtRiAGwUnry0TSCxOdEgbmfQOMaoXNP7RcwyEyFEF9+im/OAch HUA6cV96r2WL6Oh9y1tVHJx63yhIlNy4vTeJNzPiT1WXnrCeySPKwfU/YjzQOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403619; 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=8tVv6thUbq+kOq5I+oAfqWJTzJAU+y9scHKqIY1bXO8=; b=xbO3JW1LR55fiRiTX3xvsO2lG5OHzSWqX3ctCUd2eSPLZdT8MKKf8ONZY8iJtWteYW0QWG 1gwcr0rI0Ww+MXjPKocDyxI4H91C+iRozZd+Zur2nO0HytKTtJ2lsohp2FZ+mg5eFpcyDP 7AcHTteaMi0KChk+U1fD/h4gRO8J2xNjIlsW64XIgp7W4Tv13ymLia4nDyEahKyrrKVd/k E0ZqUD5+BurCl+s2PN1lTVc88xt3BssvhzntMAs/M7YXqneBKhMSnqZsjJb7BK/iNCUKml zTwXFzuRuDKyzTi65yNkIx51sNivy1tUTu3LkAhuqTWPyBysB1YtTu50LZCDtA== 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 4WQYlk6v9tzd8Q; Fri, 19 Jul 2024 15:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46JFeIn0082724; Fri, 19 Jul 2024 15:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JFeIql082721; Fri, 19 Jul 2024 15:40:18 GMT (envelope-from git) Date: Fri, 19 Jul 2024 15:40:18 GMT Message-Id: <202407191540.46JFeIql082721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 24687a65dd7f - stable/14 - sys: Enable NVMe drivers on all architectures 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24687a65dd7f7eb4042f783b9d0f5af4f969f13c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=24687a65dd7f7eb4042f783b9d0f5af4f969f13c commit 24687a65dd7f7eb4042f783b9d0f5af4f969f13c Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-07-18 17:19:18 +0000 sys: Enable NVMe drivers on all architectures The NVMe drivers are portable and are already included statically in GENERIC on other architectures such as aarch64 and riscv64. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44690 (cherry picked from commit 16e846fa1ed3c97419b55b292f77b0f4209f0875) --- share/man/man4/Makefile | 11 ++--------- sys/modules/Makefile | 8 ++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index aa55108d8b4e..612b063de3de 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -408,9 +408,9 @@ MAN= aac.4 \ ${_if_ntb.4} \ null.4 \ numa.4 \ - ${_nvd.4} \ + nvd.4 \ ${_nvdimm.4} \ - ${_nvme.4} \ + nvme.4 \ ${_nvram.4} \ oce.4 \ ocs_fc.4\ @@ -843,8 +843,6 @@ _ntb_hw_amd.4= ntb_hw_amd.4 _ntb_hw_intel.4= ntb_hw_intel.4 _ntb_hw_plx.4= ntb_hw_plx.4 _ntb_transport.4=ntb_transport.4 -_nvd.4= nvd.4 -_nvme.4= nvme.4 _nvram.4= nvram.4 _padlock.4= padlock.4 _pchtherm.4= pchtherm.4 @@ -892,11 +890,6 @@ _vmm.4= vmm.4 .endif .endif -.if ${MACHINE_CPUARCH} == "powerpc" -_nvd.4= nvd.4 -_nvme.4= nvme.4 -.endif - .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "aarch64" _gve.4= gve.4 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 56a28b4b71ec..674ae1a86bc5 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -291,9 +291,9 @@ SUBDIR= \ nmdm \ nullfs \ ${_ntb} \ - ${_nvd} \ + nvd \ ${_nvdimm} \ - ${_nvme} \ + nvme \ ${_nvram} \ oce \ ${_ocs_fc} \ @@ -798,8 +798,6 @@ _iwmfw= iwmfw _iwnfw= iwnfw .endif _nfe= nfe -_nvd= nvd -_nvme= nvme _nvram= nvram .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock @@ -881,8 +879,6 @@ _cfi= cfi _cpufreq= cpufreq _exca= exca _ffec= ffec -_nvd= nvd -_nvme= nvme .endif .if ${MACHINE_ARCH:Mpowerpc64*} != ""