svn commit: r364725 - in head: sbin/devd sys/kern

[Warner Losh]

Author: imp
Date: Mon Aug 24 19:35:15 2020
New Revision: 364725
URL: https://svnweb.freebsd.org/changeset/base/364725

Log:
  Change the resume notification event from 'kern' to 'kernel'
  
  We have both a system of 'kern' and of 'kernel'. Prefer the latter and
  convert this notification to use 'kernel' instead of 'kern'. As a
  transition period, continue to also generate the 'kern' notification
  until sometime after FreeBSD 13 is branched.
  
  MFC After: 3 days

Modified:
  head/sbin/devd/devd.conf.5
  head/sys/kern/subr_bus.c

Modified: head/sbin/devd/devd.conf.5
==============================================================================
--- head/sbin/devd/devd.conf.5	Mon Aug 24 19:00:57 2020	(r364724)
+++ head/sbin/devd/devd.conf.5	Mon Aug 24 19:35:15 2020	(r364725)
@@ -465,6 +465,8 @@ provider size has changed.
 .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description"
 .It Li kern Ta Li power Ta Li resume Ta
 Notification that the system has woken from the suspended state.
+Note: this notification is deprecated and will be removed in
+.Fx 14.0 .
 .El
 .Pp
 .Pp
@@ -472,6 +474,8 @@ Notification that the system has woken from the suspen
 .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description"
 .It Li kernel Ta Li signal Ta Li coredump Ta
 Notification that a process has crashed and dumped core.
+.It Li kernel Ta Li power Ta Li resume Ta
+Notification that the system has woken from the suspended state.
 .El
 .Pp
 .Bl -column "System" "Subsystem" "1234567" -compact

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Mon Aug 24 19:00:57 2020	(r364724)
+++ head/sys/kern/subr_bus.c	Mon Aug 24 19:35:15 2020	(r364725)
@@ -4989,8 +4989,10 @@ root_resume(device_t dev)
 	int error;
 
 	error = bus_generic_resume(dev);
-	if (error == 0)
-		devctl_notify("kern", "power", "resume", NULL);
+	if (error == 0) {
+		devctl_notify("kern", "power", "resume", NULL); /* Deprecated gone in 14 */
+		devctl_notify("kernel", "power", "resume", NULL);
+	}
 	return (error);
 }