summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarco <marco@openbsd.org>2008-02-05 22:00:54 +0000
committermarco <marco@openbsd.org>2008-02-05 22:00:54 +0000
commit18739e6230d6bbf7f834c87e9871252967850f8c (patch)
treec32265c45e436ab5306c349b9c9cfd9d70f93422
parentWhen server sends CheckedIn use the supplied option and tag -- not the (diff)
downloadwireguard-openbsd-18739e6230d6bbf7f834c87e9871252967850f8c.tar.xz
wireguard-openbsd-18739e6230d6bbf7f834c87e9871252967850f8c.zip
ACPI 3.0 seems to work just fine so lets enable it.
Idea from fulvio ciriaco <oivulf@gmail.com>
-rw-r--r--sys/arch/amd64/amd64/acpi_machdep.c4
-rw-r--r--sys/arch/i386/i386/acpi_machdep.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c
index e5eb67b06b1..26d7911692a 100644
--- a/sys/arch/amd64/amd64/acpi_machdep.c
+++ b/sys/arch/amd64/amd64/acpi_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_machdep.c,v 1.11 2007/12/05 19:17:13 deraadt Exp $ */
+/* $OpenBSD: acpi_machdep.c,v 1.12 2008/02/05 22:00:54 marco Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -90,7 +90,7 @@ acpi_scan(struct acpi_mem_map *handle, paddr_t pa, size_t len)
if (rsdp->revision == 0 &&
acpi_checksum(ptr, sizeof(struct acpi_rsdp1)) == 0)
return (ptr);
- else if (rsdp->revision == 2 &&
+ else if (rsdp->revision >= 2 && rsdp->revision <= 3 &&
acpi_checksum(ptr, sizeof(struct acpi_rsdp)) == 0)
return (ptr);
}
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c
index c25d68b68fd..615c5739b0d 100644
--- a/sys/arch/i386/i386/acpi_machdep.c
+++ b/sys/arch/i386/i386/acpi_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_machdep.c,v 1.11 2007/12/05 19:17:13 deraadt Exp $ */
+/* $OpenBSD: acpi_machdep.c,v 1.12 2008/02/05 22:00:54 marco Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -100,7 +100,7 @@ acpi_scan(struct acpi_mem_map *handle, paddr_t pa, size_t len)
if (rsdp->revision == 0 &&
acpi_checksum(ptr, sizeof(struct acpi_rsdp1)) == 0)
return (ptr);
- else if (rsdp->revision == 2 &&
+ else if (rsdp->revision >= 2 && rsdp->revision <= 3 &&
acpi_checksum(ptr, sizeof(struct acpi_rsdp)) == 0)
return (ptr);
}