diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-12-18 17:02:35 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-12-18 17:02:35 +0000 |
| commit | 7f79ca7a9ccace59ee6d1b8047a1d38cca2d0585 (patch) | |
| tree | d308fd4b0947b10bef3a0556f8fa9188dfd24e0e /sys | |
| parent | suspend & resume RNG subsystem (diff) | |
| download | wireguard-openbsd-7f79ca7a9ccace59ee6d1b8047a1d38cca2d0585.tar.xz wireguard-openbsd-7f79ca7a9ccace59ee6d1b8047a1d38cca2d0585.zip | |
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 |