diff options
author | jkoshy <jkoshy@FreeBSD.org> | 2005-04-19 04:01:25 +0000 |
---|---|---|
committer | jkoshy <jkoshy@FreeBSD.org> | 2005-04-19 04:01:25 +0000 |
commit | dc3444cd91762fa913e417f7f7a7a0484872f54e (patch) | |
tree | 3175e06cfbec643ca7426d756f2362160f9309d4 /sys/conf | |
parent | 8c509864f2dd0cdcc6116de38bf9137583c4ab2f (diff) | |
download | FreeBSD-src-dc3444cd91762fa913e417f7f7a7a0484872f54e.zip FreeBSD-src-dc3444cd91762fa913e417f7f7a7a0484872f54e.tar.gz |
Bring a working snapshot of hwpmc(4), its associated libraries, userland utilities
and documentation into -CURRENT.
Bump FreeBSD_version.
Reviewed by: alc, jhb (kernel changes)
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/NOTES | 13 | ||||
-rw-r--r-- | sys/conf/files | 5 | ||||
-rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 2 | ||||
-rw-r--r-- | sys/conf/options | 3 |
5 files changed, 24 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3f2677d..2d5ad27 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -422,6 +422,19 @@ options COMPILING_LINT ##################################################################### +# PERFORMANCE MONITORING OPTIONS + +# +# The hwpmc driver that allows the use of in-CPU performance monitoring +# counters for performance monitoring. The base kernel needs to configured +# with the 'options' line, while the hwpmc device can be either compiled +# in or loaded as a loadable kernel module. +# +device hwpmc # Driver (also a loadable module) +options HWPMC_HOOKS # Other necessary kernel hooks + + +##################################################################### # NETWORKING OPTIONS # diff --git a/sys/conf/files b/sys/conf/files index ccf3ac7..a396d70 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1044,6 +1044,10 @@ gnu/ext2fs/ext2_subr.c optional ext2fs gnu/ext2fs/ext2_vfsops.c optional ext2fs gnu/ext2fs/ext2_vnops.c optional ext2fs # +# Support for hardware performance monitoring counters +# +hwpmc/hwpmc_mod.c optional hwpmc +# # isdn4bsd device drivers # i4b/driver/i4b_trace.c optional i4btrc @@ -1157,6 +1161,7 @@ kern/kern_mtxpool.c standard kern/kern_mutex.c standard kern/kern_ntptime.c standard kern/kern_physio.c standard +kern/kern_pmc.c standard kern/kern_poll.c optional device_polling kern/kern_proc.c standard kern/kern_prot.c standard diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 30da61b..f3c69f8 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -170,6 +170,7 @@ geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +hwpmc/hwpmc_amd.c optional hwpmc isa/atkbd_isa.c optional atkbd isa/atkbdc_isa.c optional atkbdc isa/psm.c optional psm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 9b3ce26..d46b2c3 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -216,6 +216,8 @@ geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard dev/acpica/acpi_if.m standard +hwpmc/hwpmc_amd.c optional hwpmc +hwpmc/hwpmc_intel.c optional hwpmc i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi i386/acpica/acpi_wakeup.c optional acpi diff --git a/sys/conf/options b/sys/conf/options index aac7fad..9be76d8 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -699,3 +699,6 @@ NI4BISPPP opt_i4b.h # VFS options LOOKUP_SHARED opt_vfs.h + +# HWPMC options +HWPMC_HOOKS opt_global.h |