Remove traces of ACPI_QUIRK_VMWARE, should be no longer needed.

Reported-by: swildner

diff --git a/nrelease/gui/root/DFLYLIVE b/nrelease/gui/root/DFLYLIVE
index 8619cf4..9ac555d 100644 (file)
--- a/nrelease/gui/root/DFLYLIVE
+++ b/nrelease/gui/root/DFLYLIVE
@@ -85,9 +85,6 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
-# ACPI options
-#options       ACPI_QUIRK_VMWARE       # VMware's ACPI-fast24 timer is broken
-
 device         isa
 device         eisa
 device         pci

diff --git a/nrelease/gui/root/DFLYLIVE-SMP b/nrelease/gui/root/DFLYLIVE-SMP
index 40909c7..1a275de 100644 (file)
--- a/nrelease/gui/root/DFLYLIVE-SMP
+++ b/nrelease/gui/root/DFLYLIVE-SMP
@@ -85,9 +85,6 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
-# ACPI options
-#options       ACPI_QUIRK_VMWARE       # VMware's ACPI-fast24 timer is broken
-
 device         isa
 device         eisa
 device         pci

diff --git a/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC b/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
index ed249bb..4e77566 100644 (file)
--- a/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
+++ b/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
@@ -85,9 +85,6 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
-# ACPI options
-#options       ACPI_QUIRK_VMWARE       # VMware's ACPI-fast24 timer is broken
-
 device         isa
 device         eisa
 device         pci

diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 88665ed..97bf78c 100644 (file)
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -35,7 +35,6 @@
 .Sh SYNOPSIS
 .Cd "device acpi"
 .Pp
-.Cd "options ACPI_QUIRK_VMWARE"
 .Cd "options ACPI_DEBUG"
 .Sh DESCRIPTION
 The
@@ -48,15 +47,6 @@ other features.
 ACPI core support is provided by the ACPI CA reference implementation
 from Intel.
 .Pp
-It was observed that when running
-.Dx
-as a guest in VMware 5.5.1 under SMP conditions, VMware's ACPI-fast24
-timer runs roughly 65 times too fast.
-The
-.Dv ACPI_QUIRK_VMWARE
-option can be specified in the kernel configuration file in order to
-fix this problem.
-.Pp
 Note that the
 .Nm
 driver is automatically loaded by the

diff --git a/sys/conf/options b/sys/conf/options
index 61c8bbd..a78ee65 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -80,7 +80,6 @@ TWA_FLASH_FIRMWARE    opt_twa.h
 #options for ACPI support
 ACPI_DEBUG             opt_acpi.h
 ACPI_NO_SEMAPHORES     opt_acpi.h
-ACPI_QUIRK_VMWARE      opt_acpi.h
 ACPI_ENABLE_PCI                opt_acpi.h
 
 # Miscellaneous options.

diff --git a/sys/config/GENERIC b/sys/config/GENERIC
index 0ae1588..a3db2ab 100644 (file)
--- a/sys/config/GENERIC
+++ b/sys/config/GENERIC
@@ -66,9 +66,6 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
-# ACPI options
-#options       ACPI_QUIRK_VMWARE       # VMware's ACPI-fast24 timer is broken
-
 device         isa
 device         eisa
 device         pci

diff --git a/sys/config/JG64 b/sys/config/JG64
index 0d71ba6..2cfee46 100644 (file)
--- a/sys/config/JG64
+++ b/sys/config/JG64
@@ -66,9 +66,6 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
-# ACPI options
-#options       ACPI_QUIRK_VMWARE       # VMware's ACPI-fast24 timer is broken
-
 device         isa
 ##device               eisa
 device         pci

diff --git a/sys/config/LINT b/sys/config/LINT
index f3b8104..b01f25d 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2724,7 +2724,6 @@ options           DEBUG_PCTRACK
 
 options        ACPI_DEBUG
 #options       ACPI_NO_SEMAPHORES
-options        ACPI_QUIRK_VMWARE
 options        AHC_DUMP_EEPROM
 #options       BKTR_ALLOC_PAGES=xxx
 options        CAM_DEBUG_DELAY

diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index 0558cf0..cbe61eb 100644 (file)
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -58,9 +58,6 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
-# ACPI options
-#options       ACPI_QUIRK_VMWARE       # VMware's ACPI-fast24 timer is broken
-
 device         isa
 device         pci