diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-08 21:47:52 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-08 21:47:52 +0000 |
| commit | 4a7a1f17c7d6f8e79f29d4fde2ba5faf09b7f5a8 (patch) | |
| tree | fdc5670bf4d0a8cd810fe846698cb565f1f51cb9 /sys/arch/sgi | |
| parent | c7f240fd53223122e6fe8cee52bb76b460263763 (diff) | |
Revamp the sequences for suspend/hibernate -> resume so that the code
paths are reflexive. It is now possible to fail part-way through a
suspend sequence, and recover along the resume code path.
Split DVACT_SUSPEND by adding a new DVACT_POWERDOWN method is used
after hibernate (and suspend too) to finish the job. Some drivers
must be converted at the same time to use this instead of shutdown hooks
(the others will follow at a later time)
ok kettenis mlarkin
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/sgi/machdep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c index bb0d256c724..fa106c14917 100644 --- a/sys/arch/sgi/sgi/machdep.c +++ b/sys/arch/sgi/sgi/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.131 2012/10/03 11:18:23 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.132 2012/10/08 21:47:50 deraadt Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -867,6 +867,7 @@ boot(int howto) haltsys: doshutdownhooks(); + config_suspend(TAILQ_FIRST(&alldevs), DVACT_POWERDOWN); if (howto & RB_HALT) { if (howto & RB_POWERDOWN) |