summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2011-05-29 12:29:28 +0000
committerclaudio <claudio@openbsd.org>2011-05-29 12:29:28 +0000
commitba655335aeaba5d50ca8fad73f4a56f8061f82ad (patch)
treee442d124156be5e06b43091ce72a20644c01fdd0
parentregen (diff)
downloadwireguard-openbsd-ba655335aeaba5d50ca8fad73f4a56f8061f82ad.tar.xz
wireguard-openbsd-ba655335aeaba5d50ca8fad73f4a56f8061f82ad.zip
Let this compile on kernels without acpicpu.
Problem found by Nathanael Rensen (nathanael at polymorpheus dot com)
-rw-r--r--sys/arch/amd64/amd64/k1x-pstate.c4
-rw-r--r--sys/arch/i386/i386/k1x-pstate.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/k1x-pstate.c b/sys/arch/amd64/amd64/k1x-pstate.c
index 9467bfaa1bf..d0c112f9e60 100644
--- a/sys/arch/amd64/amd64/k1x-pstate.c
+++ b/sys/arch/amd64/amd64/k1x-pstate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k1x-pstate.c,v 1.1 2011/05/23 09:52:24 claudio Exp $ */
+/* $OpenBSD: k1x-pstate.c,v 1.2 2011/05/29 12:29:28 claudio Exp $ */
/*
* Copyright (c) 2011 Bryan Steele <brynet@gmail.com>
*
@@ -172,7 +172,9 @@ k1x_acpi_init(struct k1x_cpu_state *cstate, u_int64_t msr)
void
k1x_init(struct cpu_info *ci)
{
+#if NACPICPU > 0
u_int64_t msr;
+#endif
u_int i;
struct k1x_cpu_state *cstate;
struct k1x_state *state;
diff --git a/sys/arch/i386/i386/k1x-pstate.c b/sys/arch/i386/i386/k1x-pstate.c
index 875c9a23d6c..784485fdd98 100644
--- a/sys/arch/i386/i386/k1x-pstate.c
+++ b/sys/arch/i386/i386/k1x-pstate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k1x-pstate.c,v 1.1 2011/05/23 09:54:20 claudio Exp $ */
+/* $OpenBSD: k1x-pstate.c,v 1.2 2011/05/29 12:29:28 claudio Exp $ */
/*
* Copyright (c) 2011 Bryan Steele <brynet@gmail.com>
*
@@ -172,7 +172,9 @@ k1x_acpi_init(struct k1x_cpu_state *cstate, u_int64_t msr)
void
k1x_init(struct cpu_info *ci)
{
+#if NACPICPU > 0
u_int64_t msr;
+#endif
u_int i;
struct k1x_cpu_state *cstate;
struct k1x_state *state;