summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2014-10-17 15:35:31 +0000
committerderaadt <deraadt@openbsd.org>2014-10-17 15:35:31 +0000
commit254baf682a5b778dc35e59ae994b72ad2c5b4706 (patch)
treee1935cbd22f47037fa41d4ab883457dc95885eb3
parentcpu_setperf and perflevel must remain exposed, otherwise a bunch of (diff)
downloadwireguard-openbsd-254baf682a5b778dc35e59ae994b72ad2c5b4706.tar.xz
wireguard-openbsd-254baf682a5b778dc35e59ae994b72ad2c5b4706.zip
revert previous. It isn't just i386 which cares about the setperf
hiding, it is a lot of other systems too.
-rw-r--r--sys/arch/i386/i386/apm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 0645fd1a688..fe915c35379 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apm.c,v 1.109 2014/10/17 03:56:00 deraadt Exp $ */
+/* $OpenBSD: apm.c,v 1.110 2014/10/17 15:35:31 deraadt Exp $ */
/*-
* Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -241,9 +241,7 @@ apm_perror(const char *str, struct apmregs *regs)
void
apm_suspend(int state)
{
-#ifndef SMALL_KERNEL
extern int perflevel;
-#endif
int s;
#if NWSDISPLAY > 0
@@ -278,11 +276,9 @@ apm_suspend(int state)
enable_intr();
splx(s);
-#ifndef SMALL_KERNEL
/* restore hw.setperf */
if (cpu_setperf != NULL)
cpu_setperf(perflevel);
-#endif
bufq_restart();
config_suspend_all(DVACT_WAKEUP);