aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2020-08-24 19:35:15 +0000
committerWarner Losh <imp@FreeBSD.org>2020-08-24 19:35:15 +0000
commitf87655ec7694aa29a3e4e8d85d544820cd0c1b72 (patch)
tree5f0645cb111398ae9f3f58358de67c537819c7ac
parentf9cdb0775e605ec0e44cedae9aae0b39bca742f8 (diff)
downloadsrc-f87655ec7694aa29a3e4e8d85d544820cd0c1b72.tar.gz
src-f87655ec7694aa29a3e4e8d85d544820cd0c1b72.zip
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
Notes
Notes: svn path=/head/; revision=364725
-rw-r--r--sbin/devd/devd.conf.54
-rw-r--r--sys/kern/subr_bus.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index 5eef19f8129d..b04ad904fbd2 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -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 suspended state.
.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
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 6f538544ca31..dfd65c12c103 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -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);
}