summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2020-12-27 23:05:37 +0000
committerderaadt <deraadt@openbsd.org>2020-12-27 23:05:37 +0000
commit36922d3c4899fb9b17bbb85b88a89c7bedcf9ac4 (patch)
tree6f36527295e3d5e6b82cdfbecb10a9888b0963fe
parentFix "any" and "dynamic" keywords for flows and add proper IPv6 support. (diff)
downloadwireguard-openbsd-36922d3c4899fb9b17bbb85b88a89c7bedcf9ac4.tar.xz
wireguard-openbsd-36922d3c4899fb9b17bbb85b88a89c7bedcf9ac4.zip
Enable acpihpet on install media, because otherwise clock initialization
is just too different from GENERIC or GENERIC.MP pointed out by jsg
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 3852c3855e8..a2a3e70b7b0 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.81 2020/10/16 04:09:25 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.82 2020/12/27 23:05:37 deraadt Exp $
machine amd64
maxusers 4
@@ -23,7 +23,7 @@ bios0 at mainbus?
acpi0 at bios?
#acpitimer* at acpi?
-#acpihpet* at acpi?
+acpihpet* at acpi?
#acpiac* at acpi?
#acpibat* at acpi?
#acpibtn* at acpi?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 91022751e7b..66c6536f7de 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.189 2020/05/14 13:07:11 kettenis Exp $
+# $OpenBSD: RAMDISK_CD,v 1.190 2020/12/27 23:05:37 deraadt Exp $
machine amd64
maxusers 4
@@ -30,7 +30,7 @@ bios0 at mainbus?
acpi0 at bios?
#acpitimer* at acpi?
-#acpihpet* at acpi?
+acpihpet* at acpi?
#acpiac* at acpi?
#acpibat* at acpi?
#acpibtn* at acpi?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 6e055619aa9..ce19120dd1d 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.199 2020/12/09 18:11:18 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.200 2020/12/27 23:05:38 deraadt Exp $
machine i386
maxusers 4
@@ -23,7 +23,7 @@ mainbus0 at root
acpi0 at bios?
#acpitimer* at acpi?
-#acpihpet* at acpi?
+acpihpet* at acpi?
#acpiac* at acpi?
#acpibat* at acpi?
#acpibtn* at acpi?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 4fda04c1f57..48bcd82245a 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.245 2020/10/16 04:19:06 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.246 2020/12/27 23:05:38 deraadt Exp $
machine i386
maxusers 4
@@ -31,7 +31,7 @@ pvbus0 at mainbus0 # Paravirtual device bus
acpi0 at bios?
#acpitimer* at acpi?
-#acpihpet* at acpi?
+acpihpet* at acpi?
#acpiac* at acpi?
#acpibat* at acpi?
#acpibtn* at acpi?