svn commit: r355012 - in head: share/man/man4 sys/dev/trm

[Scott Long]

Author: scottl
Date: Fri Nov 22 18:50:53 2019
New Revision: 355012
URL: https://svnweb.freebsd.org/changeset/base/355012

Log:
  Schedule the trm(4) driver for removal.  It relies on Giant and thus has
  required compat shims in CAM for 12 years.
  
  Relnotes:	yes

Modified:
  head/share/man/man4/trm.4
  head/sys/dev/trm/trm.c

Modified: head/share/man/man4/trm.4
==============================================================================
--- head/share/man/man4/trm.4	Fri Nov 22 18:41:09 2019	(r355011)
+++ head/share/man/man4/trm.4	Fri Nov 22 18:50:53 2019	(r355012)
@@ -48,6 +48,9 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 trm_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DESCRIPTION
 The
 .Nm

Modified: head/sys/dev/trm/trm.c
==============================================================================
--- head/sys/dev/trm/trm.c	Fri Nov 22 18:41:09 2019	(r355011)
+++ head/sys/dev/trm/trm.c	Fri Nov 22 18:50:53 2019	(r355012)
@@ -3376,7 +3376,9 @@ trm_attach(device_t dev)
 	PACB	pACB = 0;
 	int	rid = 0;
 	int unit = device_get_unit(dev);
-	
+
+	gone_in(13, "Giant locked CAM drivers");
+
 	device_id = pci_get_devid(dev);
 	/*
 	 * These cards do not allow memory mapped accesses