From f87655ec7694aa29a3e4e8d85d544820cd0c1b72 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 24 Aug 2020 19:35:15 +0000 Subject: [PATCH] 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 --- sbin/devd/devd.conf.5 | 4 ++++ sys/kern/subr_bus.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 5eef19f8129..b04ad904fbd 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 6f538544ca3..dfd65c12c10 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); }