diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-12-18 17:02:36 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-12-18 17:02:36 +0000 |
| commit | 45b70ca16bcf7ededb857bf6252836c4f24d0fff (patch) | |
| tree | dc8c455020ebece4caac3aa1fc38ba07d192adbb /sys | |
| parent | cfb1bc5a456f6e46dec7422472d2eed2e50d1c44 (diff) | |
perform cpu setperf at same position in sequence as acpi.c
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/apm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index f16fd6bcf3b..ff4454a8f5f 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.111 2014/12/18 17:00:19 deraadt Exp $ */ +/* $OpenBSD: apm.c,v 1.112 2014/12/18 17:02:35 deraadt Exp $ */ /*- * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved. @@ -279,9 +279,6 @@ apm_suspend(int state) splx(s); resume_randomness(); /* force RNG upper level reseed */ - /* restore hw.setperf */ - if (cpu_setperf != NULL) - cpu_setperf(perflevel); bufq_restart(); config_suspend_all(DVACT_WAKEUP); @@ -289,6 +286,10 @@ apm_suspend(int state) #if NWSDISPLAY > 0 wsdisplay_resume(); #endif /* NWSDISPLAY > 0 */ + + /* restore hw.setperf */ + if (cpu_setperf != NULL) + cpu_setperf(perflevel); } void |