git: 88cf6df20468 - stable/12 - nvme: Remove compat code for older kernels

Warner Losh imp at FreeBSD.org
Sat Jul 31 00:21:25 UTC 2021


The branch stable/12 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=88cf6df204683da0e71ac7f5de062686ad8445b7

commit 88cf6df204683da0e71ac7f5de062686ad8445b7
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2020-10-24 01:59:01 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-31 00:02:52 +0000

    nvme: Remove compat code for older kernels
    
    Remove code that supported pre-2011 kernels. CTLTYPE_S64 was defined
    in rev 217616. All supported branches have it, so remove its compat
    definition as OBE.
    
    (cherry picked from commit 0fc1d2088169456d469b53ecbe7832349917c29d)
---
 sys/dev/nvme/nvme_sysctl.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c
index fc67f2c87fd5..327c3ddbfc99 100644
--- a/sys/dev/nvme/nvme_sysctl.c
+++ b/sys/dev/nvme/nvme_sysctl.c
@@ -51,16 +51,6 @@ SYSCTL_BOOL(_hw_nvme, OID_AUTO, verbose_cmd_dump, CTLFLAG_RWTUN,
     &nvme_verbose_cmd_dump, 0,
     "enable verbose command printting when a command fails");
 
-/*
- * CTLTYPE_S64 and sysctl_handle_64 were added in r217616.  Define these
- *  explicitly here for older kernels that don't include the r217616
- *  changeset.
- */
-#ifndef CTLTYPE_S64
-#define CTLTYPE_S64		CTLTYPE_QUAD
-#define sysctl_handle_64	sysctl_handle_quad
-#endif
-
 static void
 nvme_dump_queue(struct nvme_qpair *qpair)
 {


More information about the dev-commits-src-branches mailing list