summaryrefslogtreecommitdiff
path: root/sys/kern/subr_autoconf.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-31 17:13:49 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-31 17:13:49 +0000
commit9da4ff9be0005fda5ba6d021ccff292caaca62f6 (patch)
treeb3bdf7cd5c66003daeb0f71ac899d004c887677e /sys/kern/subr_autoconf.c
parentf4451ac9824b3e8c645bc2be6cfca6659bf11fcc (diff)
Add DVACT_QUIECE support. This is called before splhigh() and before
DVACT_SUSPEND, therefore DVACT_QUIECE can do standard sleeping operations to get ready. Discussed quite a while back with kettenis and jakemsr, oga suddenly needed it as well and wrote half of it, so it was time to finish it. proofread by miod.
Diffstat (limited to 'sys/kern/subr_autoconf.c')
-rw-r--r--sys/kern/subr_autoconf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 70d2eb9291e..f342094dd37 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_autoconf.c,v 1.61 2010/06/30 22:05:44 deraadt Exp $ */
+/* $OpenBSD: subr_autoconf.c,v 1.62 2010/08/31 17:13:48 deraadt Exp $ */
/* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */
/*
@@ -778,13 +778,14 @@ config_activate_children(struct device *parent, int act)
case DVACT_ACTIVATE:
rv = config_activate(d);
break;
- case DVACT_DEACTIVATE:
- rv = config_deactivate(d);
- break;
case DVACT_SUSPEND:
case DVACT_RESUME:
+ case DVACT_QUIESCE:
rv = config_suspend(d, act);
break;
+ case DVACT_DEACTIVATE:
+ rv = config_deactivate(d);
+ break;
}
if (rv == 0)
continue;