summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf/GENERIC
diff options
context:
space:
mode:
authorrrs <rrs@FreeBSD.org>2015-03-24 20:00:11 +0000
committerrrs <rrs@FreeBSD.org>2015-03-24 20:00:11 +0000
commit0444d8258d3c6c2219b8aadd39daf2fe9473512c (patch)
tree4d16eb1cb375dcd059efa00e91a45c0fbf17563a /sys/amd64/conf/GENERIC
parentf5cf31bac5259172697ccde44e661519990bc4b4 (diff)
downloadFreeBSD-src-0444d8258d3c6c2219b8aadd39daf2fe9473512c.zip
FreeBSD-src-0444d8258d3c6c2219b8aadd39daf2fe9473512c.tar.gz
MFC of r277177 and r279894 with the fixes for the PMC for Haswell.
Sponsored by: Netflix Inc.
Diffstat (limited to 'sys/amd64/conf/GENERIC')
-rw-r--r--sys/amd64/conf/GENERIC1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 03a0f9f..4a2df33 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -84,6 +84,7 @@ options SMP # Symmetric MultiProcessor Kernel
device cpufreq
# Bus support.
+device hwpmc
device acpi
options ACPI_DMAR
device pci
OpenPOWER on IntegriCloud