From dd09d739e5355dc890224ba74157658a0330cb02 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 3 Nov 2011 21:21:56 +0100
Subject: [PATCH 16/18] hwpmc: Hook the whole thing into the build.

---
 etc/mtree/BSD.include.dist            |    2 ++
 etc/mtree/BSD.usr.dist                |    2 ++
 gnu/usr.bin/groff/tmac/mdoc.local     |    2 ++
 include/Makefile                      |    2 +-
 lib/Makefile                          |    3 ++-
 lib/libelf/elf.3                      |    2 +-
 lib/libelf/elf_begin.3                |    2 +-
 lib/libelf/elf_cntl.3                 |    2 +-
 lib/libelf/elf_end.3                  |    2 +-
 lib/libelf/elf_errmsg.3               |    2 +-
 lib/libelf/elf_fill.3                 |    2 +-
 lib/libelf/elf_flagdata.3             |    2 +-
 lib/libelf/elf_getarhdr.3             |    2 +-
 lib/libelf/elf_getarsym.3             |    2 +-
 lib/libelf/elf_getbase.3              |    2 +-
 lib/libelf/elf_getdata.3              |    2 +-
 lib/libelf/elf_getident.3             |    2 +-
 lib/libelf/elf_getphdrnum.3           |    2 +-
 lib/libelf/elf_getphnum.3             |    2 +-
 lib/libelf/elf_getscn.3               |    2 +-
 lib/libelf/elf_getshdrnum.3           |    2 +-
 lib/libelf/elf_getshdrstrndx.3        |    2 +-
 lib/libelf/elf_getshnum.3             |    2 +-
 lib/libelf/elf_getshstrndx.3          |    2 +-
 lib/libelf/elf_hash.3                 |    2 +-
 lib/libelf/elf_kind.3                 |    2 +-
 lib/libelf/elf_memory.3               |    2 +-
 lib/libelf/elf_next.3                 |    2 +-
 lib/libelf/elf_rand.3                 |    2 +-
 lib/libelf/elf_rawfile.3              |    2 +-
 lib/libelf/elf_strptr.3               |    2 +-
 lib/libelf/elf_update.3               |    2 +-
 lib/libelf/elf_version.3              |    2 +-
 lib/libelf/gelf.3                     |    2 +-
 lib/libelf/gelf_checksum.3            |    2 +-
 lib/libelf/gelf_fsize.3               |    2 +-
 lib/libelf/gelf_getcap.3              |    2 +-
 lib/libelf/gelf_getclass.3            |    2 +-
 lib/libelf/gelf_getdyn.3              |    2 +-
 lib/libelf/gelf_getehdr.3             |    2 +-
 lib/libelf/gelf_getmove.3             |    2 +-
 lib/libelf/gelf_getphdr.3             |    2 +-
 lib/libelf/gelf_getrel.3              |    2 +-
 lib/libelf/gelf_getrela.3             |    2 +-
 lib/libelf/gelf_getshdr.3             |    2 +-
 lib/libelf/gelf_getsym.3              |    2 +-
 lib/libelf/gelf_getsyminfo.3          |    2 +-
 lib/libelf/gelf_getsymshndx.3         |    2 +-
 lib/libelf/gelf_newehdr.3             |    2 +-
 lib/libelf/gelf_newphdr.3             |    2 +-
 lib/libelf/gelf_update_ehdr.3         |    2 +-
 lib/libelf/gelf_xlatetof.3            |    2 +-
 lib/libpmc/pmc.3                      |    2 +-
 lib/libpmc/pmc.atom.3                 |    2 +-
 lib/libpmc/pmc.core.3                 |    2 +-
 lib/libpmc/pmc.core2.3                |    2 +-
 lib/libpmc/pmc.corei7.3               |    2 +-
 lib/libpmc/pmc.corei7uc.3             |    2 +-
 lib/libpmc/pmc.iaf.3                  |    2 +-
 lib/libpmc/pmc.k7.3                   |    2 +-
 lib/libpmc/pmc.k8.3                   |    2 +-
 lib/libpmc/pmc.p4.3                   |    2 +-
 lib/libpmc/pmc.p5.3                   |    2 +-
 lib/libpmc/pmc.p6.3                   |    2 +-
 lib/libpmc/pmc.tsc.3                  |    2 +-
 lib/libpmc/pmc.ucf.3                  |    2 +-
 lib/libpmc/pmc.westmere.3             |    2 +-
 lib/libpmc/pmc.westmereuc.3           |    2 +-
 lib/libpmc/pmc_allocate.3             |    2 +-
 lib/libpmc/pmc_attach.3               |    2 +-
 lib/libpmc/pmc_capabilities.3         |    2 +-
 lib/libpmc/pmc_configure_logfile.3    |    2 +-
 lib/libpmc/pmc_disable.3              |    2 +-
 lib/libpmc/pmc_event_names_of_class.3 |    2 +-
 lib/libpmc/pmc_get_driver_stats.3     |    2 +-
 lib/libpmc/pmc_get_msr.3              |    2 +-
 lib/libpmc/pmc_init.3                 |    2 +-
 lib/libpmc/pmc_name_of_capability.3   |    2 +-
 lib/libpmc/pmc_read.3                 |    2 +-
 lib/libpmc/pmc_set.3                  |    2 +-
 lib/libpmc/pmc_start.3                |    2 +-
 lib/libpmc/pmclog.3                   |    2 +-
 share/man/man4/Makefile               |    1 +
 share/man/man4/hwpmc.4                |    2 +-
 share/mk/bsd.libnames.mk              |    2 ++
 sys/conf/files                        |    3 +++
 sys/conf/options                      |    3 +++
 sys/config/LINT                       |   16 ++++++++++++++++
 sys/config/LINT64                     |   16 ++++++++++++++++
 sys/dev/misc/Makefile                 |    2 +-
 sys/kern/kern_clock.c                 |    1 +
 sys/kern/kern_exec.c                  |    2 ++
 sys/kern/kern_exit.c                  |    1 +
 sys/kern/kern_linker.c                |    1 +
 sys/kern/kern_pmc.c                   |    1 -
 sys/kern/lwkt_thread.c                |    2 ++
 sys/platform/pc32/apic/lapic.c        |    2 ++
 sys/platform/pc32/conf/files          |    9 +++++++++
 sys/platform/pc32/i386/exception.s    |    2 ++
 sys/platform/pc32/i386/genassym.c     |    2 ++
 sys/platform/pc32/i386/trap.c         |    1 +
 sys/platform/pc64/apic/lapic.c        |    2 ++
 sys/platform/pc64/conf/files          |    7 +++++++
 sys/platform/pc64/x86_64/exception.S  |    1 +
 sys/platform/pc64/x86_64/genassym.c   |    2 ++
 sys/platform/pc64/x86_64/trap.c       |    1 +
 sys/vm/vm_mmap.c                      |    2 ++
 usr.sbin/Makefile                     |    3 +++
 usr.sbin/pmcannotate/pmcannotate.8    |    2 +-
 usr.sbin/pmccontrol/pmccontrol.8      |    2 +-
 usr.sbin/pmcstat/pmcstat.8            |    2 +-
 111 files changed, 173 insertions(+), 85 deletions(-)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index d77caf0..3ef0820 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -69,6 +69,8 @@
             ..
         ..
         misc
+            hwpmc
+            ..
             lpt
             ..
             ppi
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 2c6f222..3c675d1 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -141,6 +141,8 @@
             ..
             find_interface
             ..
+            hwpmc
+            ..
             ipfw
             ..
             isdn
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index e738afe..678a64b 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -44,6 +44,7 @@
 .ds doc-str-Lb-libdevinfo       Device and Resource Information Utility Library (libdevinfo, \-ldevinfo)
 .ds doc-str-Lb-libdevstat       Device Statistics Library (libdevstat, \-ldevstat)
 .ds doc-str-Lb-libdm            Device Mapper Library (libdm, \-ldm)
+.ds doc-str-Lb-libelf           ELF Parsing Library (libelf, \-lelf)
 .ds doc-str-Lb-libfetch         File Transfer Library (libfetch, \-lfetch)
 .ds doc-str-Lb-libfsid          Filesystem Identification Library (libfsid, \-lfsid)
 .ds doc-str-Lb-libftpio         FTP Connection Management Library (libftpio, \-lftpio)
@@ -54,6 +55,7 @@
 .ds doc-str-Lb-libkinfo         Kernel Information Access Library (libkinfo, \-lkinfo)
 .ds doc-str-Lb-libmd            Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
 .ds doc-str-Lb-libnetgraph      Netgraph User Library (libnetgraph, \-lnetgraph)
+.ds doc-str-Lb-libpmc           Performance Monitoring Counters Interface Library (libpmc, \-lpmc)
 .ds doc-str-Lb-libposix1e       POSIX.1e Security API Library (libposix1e, \-lposix1e)
 .ds doc-str-Lb-libprop          Property Container Object Library (libprop, \-lprop)
 .ds doc-str-Lb-libradius        RADIUS Client Library (libradius, \-lradius)
diff --git a/include/Makefile b/include/Makefile
index 2caf19d..98368fd 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -75,7 +75,7 @@ LSUBDIRS=	bus/cam bus/cam/scsi \
 	vfs/isofs/cd9660 net/i4b/include \
 	dev/disk/mpt/mpilib \
 	dev/disk/dm \
-	dev/misc/lpt dev/misc/ppi \
+	dev/misc/hwpmc dev/misc/lpt dev/misc/ppi \
 	dev/netif/wi \
 	dev/raid/ciss dev/raid/mfi \
 	dev/video/bktr dev/video/meteor libprop
diff --git a/lib/Makefile b/lib/Makefile
index 42c8b35..8e71091 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/lib/Makefile,v 1.107.2.16 2002/10/10 19:24:35 kbyanc Exp $
-# $DragonFly: src/lib/Makefile,v 1.35 2008/09/30 12:20:29 hasso Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -48,6 +47,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libdevstat \
 	libdm \
 	libedit \
+	libelf \
 	libevtr \
 	libexpat \
 	libfetch \
@@ -70,6 +70,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libopie \
 	libpam \
 	libpcap \
+	libpmc \
 	libposix1e \
 	libprop \
 	librpcsvc \
diff --git a/lib/libelf/elf.3 b/lib/libelf/elf.3
index 9449633..b045d2a 100644
--- a/lib/libelf/elf.3
+++ b/lib/libelf/elf.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf.3,v 1.10 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd October 21, 2007
+.Dd November 3, 2011
 .Dt ELF 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_begin.3 b/lib/libelf/elf_begin.3
index 6c7ab69..fda23e8 100644
--- a/lib/libelf/elf_begin.3
+++ b/lib/libelf/elf_begin.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_begin.3,v 1.7 2010/10/08 12:40:16 uqs Exp $
 .\"
-.Dd June 20, 2010
+.Dd November 3, 2011
 .Dt ELF_BEGIN 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_cntl.3 b/lib/libelf/elf_cntl.3
index 5c11eb3..bd6181b 100644
--- a/lib/libelf/elf_cntl.3
+++ b/lib/libelf/elf_cntl.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_cntl.3,v 1.4 2011/03/02 21:59:53 uqs Exp $
 .\"
-.Dd August 9, 2006
+.Dd November 3, 2011
 .Dt ELF_CNTL 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_end.3 b/lib/libelf/elf_end.3
index f97307f..7e09c14 100644
--- a/lib/libelf/elf_end.3
+++ b/lib/libelf/elf_end.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_end.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 29, 2006
+.Dd November 3, 2011
 .Dt ELF_END 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_errmsg.3 b/lib/libelf/elf_errmsg.3
index 517fe87..853f6da 100644
--- a/lib/libelf/elf_errmsg.3
+++ b/lib/libelf/elf_errmsg.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_errmsg.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 11, 2006
+.Dd November 3, 2011
 .Dt ELF_ERRMSG 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_fill.3 b/lib/libelf/elf_fill.3
index 46778d4..e674e8a 100644
--- a/lib/libelf/elf_fill.3
+++ b/lib/libelf/elf_fill.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_fill.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 11, 2006
+.Dd November 3, 2011
 .Dt ELF_FILL 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_flagdata.3 b/lib/libelf/elf_flagdata.3
index d02706c..577e0cc 100644
--- a/lib/libelf/elf_flagdata.3
+++ b/lib/libelf/elf_flagdata.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 22, 2007
+.Dd November 3, 2011
 .Dt ELF_FLAGDATA 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getarhdr.3 b/lib/libelf/elf_getarhdr.3
index 5035e51..4093ce9 100644
--- a/lib/libelf/elf_getarhdr.3
+++ b/lib/libelf/elf_getarhdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getarhdr.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 15, 2006
+.Dd November 3, 2011
 .Dt ELF_GETARHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getarsym.3 b/lib/libelf/elf_getarsym.3
index af24be4..e22e3ac 100644
--- a/lib/libelf/elf_getarsym.3
+++ b/lib/libelf/elf_getarsym.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getarsym.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 15, 2006
+.Dd November 3, 2011
 .Dt ELF_GETARSYM 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getbase.3 b/lib/libelf/elf_getbase.3
index 57688ce..2481307 100644
--- a/lib/libelf/elf_getbase.3
+++ b/lib/libelf/elf_getbase.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getbase.3,v 1.4 2010/06/13 10:58:50 kaiw Exp $
 .\"
-.Dd June 6, 2010
+.Dd November 3, 2011
 .Dt ELF_GETBASE 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getdata.3 b/lib/libelf/elf_getdata.3
index c8ef23b..cdd56b6 100644
--- a/lib/libelf/elf_getdata.3
+++ b/lib/libelf/elf_getdata.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getdata.3,v 1.6 2011/05/07 11:29:48 kaiw Exp $
 .\"
-.Dd January 26, 2011
+.Dd November 3, 2011
 .Dt ELF_GETDATA 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getident.3 b/lib/libelf/elf_getident.3
index 51520da..f79920c 100644
--- a/lib/libelf/elf_getident.3
+++ b/lib/libelf/elf_getident.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getident.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd July 3, 2006
+.Dd November 3, 2011
 .Dt ELF_GETIDENT 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getphdrnum.3 b/lib/libelf/elf_getphdrnum.3
index 6b09ec3..f136b31 100644
--- a/lib/libelf/elf_getphdrnum.3
+++ b/lib/libelf/elf_getphdrnum.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getphdrnum.3,v 1.1 2010/07/21 12:14:50 kaiw Exp $
 .\"
-.Dd August 5, 2009
+.Dd November 3, 2011
 .Os
 .Dt ELF_GETPHDRNUM 3
 .Sh NAME
diff --git a/lib/libelf/elf_getphnum.3 b/lib/libelf/elf_getphnum.3
index 280b79f..687f96e 100644
--- a/lib/libelf/elf_getphnum.3
+++ b/lib/libelf/elf_getphnum.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getphnum.3,v 1.3 2010/07/21 12:14:50 kaiw Exp $
 .\"
-.Dd August 5, 2009
+.Dd November 3, 2011
 .Dt ELF_GETPHNUM 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getscn.3 b/lib/libelf/elf_getscn.3
index 3bc0091..6084efb 100644
--- a/lib/libelf/elf_getscn.3
+++ b/lib/libelf/elf_getscn.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 22, 2007
+.Dd November 3, 2011
 .Dt ELF_GETSCN 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getshdrnum.3 b/lib/libelf/elf_getshdrnum.3
index b37cc37..9e25d71 100644
--- a/lib/libelf/elf_getshdrnum.3
+++ b/lib/libelf/elf_getshdrnum.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getshdrnum.3,v 1.1 2010/07/21 12:14:50 kaiw Exp $
 .\"
-.Dd August 4, 2009
+.Dd November 3, 2011
 .Os
 .Dt ELF_GETSHDRNUM 3
 .Sh NAME
diff --git a/lib/libelf/elf_getshdrstrndx.3 b/lib/libelf/elf_getshdrstrndx.3
index 7cc5edd..55ff583 100644
--- a/lib/libelf/elf_getshdrstrndx.3
+++ b/lib/libelf/elf_getshdrstrndx.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getshdrstrndx.3,v 1.1 2010/07/21 12:14:50 kaiw Exp $
 .\"
-.Dd August 5, 2009
+.Dd November 3, 2011
 .Os
 .Dt ELF_GETSHDRSTRNDX 3
 .Sh NAME
diff --git a/lib/libelf/elf_getshnum.3 b/lib/libelf/elf_getshnum.3
index afd8896..82fcb3f 100644
--- a/lib/libelf/elf_getshnum.3
+++ b/lib/libelf/elf_getshnum.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.5 2010/07/21 12:14:50 kaiw Exp $
 .\"
-.Dd August 5, 2009
+.Dd November 3, 2011
 .Dt ELF_GETSHNUM 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_getshstrndx.3 b/lib/libelf/elf_getshstrndx.3
index 2d6645b..b401555 100644
--- a/lib/libelf/elf_getshstrndx.3
+++ b/lib/libelf/elf_getshstrndx.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_getshstrndx.3,v 1.4 2010/07/21 12:14:50 kaiw Exp $
 .\"
-.Dd August 5, 2009
+.Dd November 3, 2011
 .Dt ELF_GETSHSTRNDX 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_hash.3 b/lib/libelf/elf_hash.3
index 2ee0217..c0d117e 100644
--- a/lib/libelf/elf_hash.3
+++ b/lib/libelf/elf_hash.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_hash.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 15, 2006
+.Dd November 3, 2011
 .Dt ELF_HASH 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_kind.3 b/lib/libelf/elf_kind.3
index 2adf998..06d997d 100644
--- a/lib/libelf/elf_kind.3
+++ b/lib/libelf/elf_kind.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_kind.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 1, 2006
+.Dd November 3, 2011
 .Dt ELF_KIND 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_memory.3 b/lib/libelf/elf_memory.3
index bde4757..a7e7966 100644
--- a/lib/libelf/elf_memory.3
+++ b/lib/libelf/elf_memory.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_memory.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 28, 2006
+.Dd November 3, 2011
 .Dt ELF_MEMORY 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_next.3 b/lib/libelf/elf_next.3
index ec22690..b7d27bf 100644
--- a/lib/libelf/elf_next.3
+++ b/lib/libelf/elf_next.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_next.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 17, 2006
+.Dd November 3, 2011
 .Dt ELF_NEXT 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_rand.3 b/lib/libelf/elf_rand.3
index 9e44448..0df5899 100644
--- a/lib/libelf/elf_rand.3
+++ b/lib/libelf/elf_rand.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_rand.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 17, 2006
+.Dd November 3, 2011
 .Dt ELF_RAND 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_rawfile.3 b/lib/libelf/elf_rawfile.3
index 5966798..08a2b38 100644
--- a/lib/libelf/elf_rawfile.3
+++ b/lib/libelf/elf_rawfile.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_rawfile.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd July 3, 2006
+.Dd November 3, 2011
 .Dt ELF_RAWFILE 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_strptr.3 b/lib/libelf/elf_strptr.3
index 0904720..6fc8f53 100644
--- a/lib/libelf/elf_strptr.3
+++ b/lib/libelf/elf_strptr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_strptr.3,v 1.5 2010/08/03 17:40:09 joel Exp $
 .\"
-.Dd December 16, 2006
+.Dd November 3, 2011
 .Dt ELF_STRPTR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_update.3 b/lib/libelf/elf_update.3
index 3f24b99..459f1ee 100644
--- a/lib/libelf/elf_update.3
+++ b/lib/libelf/elf_update.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.7 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd March 19, 2008
+.Dd November 3, 2011
 .Dt ELF_UPDATE 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/elf_version.3 b/lib/libelf/elf_version.3
index 61ab560..4d3cd33 100644
--- a/lib/libelf/elf_version.3
+++ b/lib/libelf/elf_version.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/elf_version.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 1, 2006
+.Dd November 3, 2011
 .Dt ELF_VERSION 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf.3 b/lib/libelf/gelf.3
index 66a8dda..07392c1 100644
--- a/lib/libelf/gelf.3
+++ b/lib/libelf/gelf.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd September 1, 2006
+.Dd November 3, 2011
 .Dt GELF 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_checksum.3 b/lib/libelf/gelf_checksum.3
index 0f7ab92..949d650 100644
--- a/lib/libelf/gelf_checksum.3
+++ b/lib/libelf/gelf_checksum.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_checksum.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_CHECKSUM 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_fsize.3 b/lib/libelf/gelf_fsize.3
index 0a4fe16..58dd50f 100644
--- a/lib/libelf/gelf_fsize.3
+++ b/lib/libelf/gelf_fsize.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_fsize.3,v 1.6 2010/07/21 10:39:29 kaiw Exp $
 .\"
-.Dd February 5, 2008
+.Dd November 3, 2011
 .Dt GELF_FSIZE 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getcap.3 b/lib/libelf/gelf_getcap.3
index d6185d6..c3de9da 100644
--- a/lib/libelf/gelf_getcap.3
+++ b/lib/libelf/gelf_getcap.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getcap.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETCAP 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getclass.3 b/lib/libelf/gelf_getclass.3
index 20920cd..751390e 100644
--- a/lib/libelf/gelf_getclass.3
+++ b/lib/libelf/gelf_getclass.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getclass.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd July 3, 2006
+.Dd November 3, 2011
 .Dt GELF_GETCLASS 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getdyn.3 b/lib/libelf/gelf_getdyn.3
index b5b719a..4ecbb39 100644
--- a/lib/libelf/gelf_getdyn.3
+++ b/lib/libelf/gelf_getdyn.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getdyn.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETDYN 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getehdr.3 b/lib/libelf/gelf_getehdr.3
index ca32a7f..fa1eadc 100644
--- a/lib/libelf/gelf_getehdr.3
+++ b/lib/libelf/gelf_getehdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getehdr.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd December 16, 2006
+.Dd November 3, 2011
 .Dt GELF_GETEHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getmove.3 b/lib/libelf/gelf_getmove.3
index ad4fefb..983d845 100644
--- a/lib/libelf/gelf_getmove.3
+++ b/lib/libelf/gelf_getmove.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getmove.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETMOVE 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getphdr.3 b/lib/libelf/gelf_getphdr.3
index 149387a..e3e1830 100644
--- a/lib/libelf/gelf_getphdr.3
+++ b/lib/libelf/gelf_getphdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 21, 2007
+.Dd November 3, 2011
 .Dt GELF_GETPHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getrel.3 b/lib/libelf/gelf_getrel.3
index 0e365e9..517b0c0 100644
--- a/lib/libelf/gelf_getrel.3
+++ b/lib/libelf/gelf_getrel.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getrel.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETREL 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getrela.3 b/lib/libelf/gelf_getrela.3
index f1c2b9c..ad81df0 100644
--- a/lib/libelf/gelf_getrela.3
+++ b/lib/libelf/gelf_getrela.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getrela.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETRELA 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getshdr.3 b/lib/libelf/gelf_getshdr.3
index 82250e6..d924ad6 100644
--- a/lib/libelf/gelf_getshdr.3
+++ b/lib/libelf/gelf_getshdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getshdr.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 27, 2006
+.Dd November 3, 2011
 .Dt GELF_GETSHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getsym.3 b/lib/libelf/gelf_getsym.3
index 5a725e2..2c82bfa 100644
--- a/lib/libelf/gelf_getsym.3
+++ b/lib/libelf/gelf_getsym.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getsym.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETSYM 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getsyminfo.3 b/lib/libelf/gelf_getsyminfo.3
index 904d42c..54d67da 100644
--- a/lib/libelf/gelf_getsyminfo.3
+++ b/lib/libelf/gelf_getsyminfo.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getsyminfo.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 29, 2006
+.Dd November 3, 2011
 .Dt GELF_GETSYMINFO 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_getsymshndx.3 b/lib/libelf/gelf_getsymshndx.3
index ab62892..9c9ff0e 100644
--- a/lib/libelf/gelf_getsymshndx.3
+++ b/lib/libelf/gelf_getsymshndx.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_getsymshndx.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 5, 2006
+.Dd November 3, 2011
 .Dt GELF_GETSYMSHNDX 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_newehdr.3 b/lib/libelf/gelf_newehdr.3
index a9886a4..a00d0ea 100644
--- a/lib/libelf/gelf_newehdr.3
+++ b/lib/libelf/gelf_newehdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 22, 2007
+.Dd November 3, 2011
 .Dt GELF_NEWEHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_newphdr.3 b/lib/libelf/gelf_newphdr.3
index 1235193..bf7e8da 100644
--- a/lib/libelf/gelf_newphdr.3
+++ b/lib/libelf/gelf_newphdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 22, 2007
+.Dd November 3, 2011
 .Dt GELF_NEWPHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_update_ehdr.3 b/lib/libelf/gelf_update_ehdr.3
index e653d0f..8724f5a 100644
--- a/lib/libelf/gelf_update_ehdr.3
+++ b/lib/libelf/gelf_update_ehdr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_update_ehdr.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd August 27, 2006
+.Dd November 3, 2011
 .Dt GELF_UPDATE_EHDR 3
 .Os
 .Sh NAME
diff --git a/lib/libelf/gelf_xlatetof.3 b/lib/libelf/gelf_xlatetof.3
index 1d1e51f..e4fd32a 100644
--- a/lib/libelf/gelf_xlatetof.3
+++ b/lib/libelf/gelf_xlatetof.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libelf/gelf_xlatetof.3,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd July 24, 2006
+.Dd November 3, 2011
 .Dt GELF_XLATETOF 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index 17e04da..af6dd71 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.30 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd November 24, 2008
+.Dd November 3, 2011
 .Dt PMC 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3
index 1d836ed..374d1ba 100644
--- a/lib/libpmc/pmc.atom.3
+++ b/lib/libpmc/pmc.atom.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.atom.3,v 1.9 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 12, 2008
+.Dd November 3, 2011
 .Dt PMC.ATOM 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3
index 68528b5..4204472 100644
--- a/lib/libpmc/pmc.core.3
+++ b/lib/libpmc/pmc.core.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.core.3,v 1.10 2010/05/27 13:56:33 uqs Exp $
 .\"
-.Dd November 12, 2008
+.Dd November 3, 2011
 .Dt PMC.CORE 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3
index a6a5900..1cfe3f2 100644
--- a/lib/libpmc/pmc.core2.3
+++ b/lib/libpmc/pmc.core2.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.core2.3,v 1.9 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd June 8, 2009
+.Dd November 3, 2011
 .Dt PMC.CORE2 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3
index 5873643..bab28fe 100644
--- a/lib/libpmc/pmc.corei7.3
+++ b/lib/libpmc/pmc.corei7.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.corei7.3,v 1.6 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd March 24, 2010
+.Dd November 3, 2011
 .Dt PMC.COREI7 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3
index 56c908f..9f4cd37 100644
--- a/lib/libpmc/pmc.corei7uc.3
+++ b/lib/libpmc/pmc.corei7uc.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.corei7uc.3,v 1.4 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd March 24, 2010
+.Dd November 3, 2011
 .Dt PMC.COREI7UC 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3
index b214a55..06125e4 100644
--- a/lib/libpmc/pmc.iaf.3
+++ b/lib/libpmc/pmc.iaf.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.iaf.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 14, 2008
+.Dd November 3, 2011
 .Dt PMC.IAF 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.k7.3 b/lib/libpmc/pmc.k7.3
index 56e8cbb..4261dae 100644
--- a/lib/libpmc/pmc.k7.3
+++ b/lib/libpmc/pmc.k7.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.k7.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 4, 2008
+.Dd November 3, 2011
 .Dt PMC.K7 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.k8.3
index 793cb63..46e7e15 100644
--- a/lib/libpmc/pmc.k8.3
+++ b/lib/libpmc/pmc.k8.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.k8.3,v 1.6 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 4, 2008
+.Dd November 3, 2011
 .Dt PMC.K8 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.p4.3 b/lib/libpmc/pmc.p4.3
index bb8ecf0..d7798cc 100644
--- a/lib/libpmc/pmc.p4.3
+++ b/lib/libpmc/pmc.p4.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.p4.3,v 1.5 2010/10/08 12:40:16 uqs Exp $
 .\"
-.Dd October 4, 2008
+.Dd November 3, 2011
 .Dt PMC.P4 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.p5.3 b/lib/libpmc/pmc.p5.3
index b8f9c40..06149fe 100644
--- a/lib/libpmc/pmc.p5.3
+++ b/lib/libpmc/pmc.p5.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.p5.3,v 1.7 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 4, 2008
+.Dd November 3, 2011
 .Dt PMC 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.p6.3 b/lib/libpmc/pmc.p6.3
index bb6311f..52c7489 100644
--- a/lib/libpmc/pmc.p6.3
+++ b/lib/libpmc/pmc.p6.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.p6.3,v 1.7 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 4, 2008
+.Dd November 3, 2011
 .Dt PMC.P6 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3
index d14847b..7977891 100644
--- a/lib/libpmc/pmc.tsc.3
+++ b/lib/libpmc/pmc.tsc.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.tsc.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd October 4, 2008
+.Dd November 3, 2011
 .Dt PMC.TSC 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3
index 14d6721..9dea0e8 100644
--- a/lib/libpmc/pmc.ucf.3
+++ b/lib/libpmc/pmc.ucf.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.ucf.3,v 1.3 2010/06/02 10:20:23 uqs Exp $
 .\"
-.Dd March 30, 2010
+.Dd November 3, 2011
 .Dt PMC.UCF 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3
index d2fca93..1491b8b 100644
--- a/lib/libpmc/pmc.westmere.3
+++ b/lib/libpmc/pmc.westmere.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.westmere.3,v 1.6 2010/10/04 14:32:14 gnn Exp $
 .\"
-.Dd March 24, 2010
+.Dd November 3, 2011
 .Dt PMC.WESTMERE 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3
index 906f024..a251984 100644
--- a/lib/libpmc/pmc.westmereuc.3
+++ b/lib/libpmc/pmc.westmereuc.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc.westmereuc.3,v 1.6 2010/10/04 14:32:14 gnn Exp $
 .\"
-.Dd March 24, 2010
+.Dd November 3, 2011
 .Dt PMC.WESTMEREUC 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_allocate.3 b/lib/libpmc/pmc_allocate.3
index cd9c22a..735c8fc 100644
--- a/lib/libpmc/pmc_allocate.3
+++ b/lib/libpmc/pmc_allocate.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_allocate.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd September 22, 2008
+.Dd November 3, 2011
 .Dt PMC_ALLOCATE 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_attach.3 b/lib/libpmc/pmc_attach.3
index 625d854..1b87841 100644
--- a/lib/libpmc/pmc_attach.3
+++ b/lib/libpmc/pmc_attach.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 25, 2007
+.Dd November 3, 2011
 .Dt PMC_ATTACH 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_capabilities.3 b/lib/libpmc/pmc_capabilities.3
index 6857008..fbf76af 100644
--- a/lib/libpmc/pmc_capabilities.3
+++ b/lib/libpmc/pmc_capabilities.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_capabilities.3,v 1.5 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd September 22, 2008
+.Dd November 3, 2011
 .Dt PMC_CAPABILITIES 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_configure_logfile.3 b/lib/libpmc/pmc_configure_logfile.3
index f2572cf..31fecf6 100644
--- a/lib/libpmc/pmc_configure_logfile.3
+++ b/lib/libpmc/pmc_configure_logfile.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_configure_logfile.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 24, 2007
+.Dd November 3, 2011
 .Dt PMC_CONFIGURE_LOGFILE 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_disable.3 b/lib/libpmc/pmc_disable.3
index 6ca45ec..c7eb233 100644
--- a/lib/libpmc/pmc_disable.3
+++ b/lib/libpmc/pmc_disable.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_disable.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd September 22, 2008
+.Dd November 3, 2011
 .Dt PMC_ENABLE 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_event_names_of_class.3 b/lib/libpmc/pmc_event_names_of_class.3
index 8ead207..1f9e72a 100644
--- a/lib/libpmc/pmc_event_names_of_class.3
+++ b/lib/libpmc/pmc_event_names_of_class.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_event_names_of_class.3,v 1.3 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd November 23, 2007
+.Dd November 3, 2011
 .Dt PMC_EVENT_NAMES_OF_CLASS 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_get_driver_stats.3 b/lib/libpmc/pmc_get_driver_stats.3
index f3e0062..cfc48d2 100644
--- a/lib/libpmc/pmc_get_driver_stats.3
+++ b/lib/libpmc/pmc_get_driver_stats.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_get_driver_stats.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 25, 2007
+.Dd November 3, 2011
 .Dt PMC_GET_DRIVER_STATS 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_get_msr.3 b/lib/libpmc/pmc_get_msr.3
index f63e706..e2d8722 100644
--- a/lib/libpmc/pmc_get_msr.3
+++ b/lib/libpmc/pmc_get_msr.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_get_msr.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 25, 2007
+.Dd November 3, 2011
 .Dt PMC_GET_MSR 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_init.3 b/lib/libpmc/pmc_init.3
index 45a7997..8441ae8 100644
--- a/lib/libpmc/pmc_init.3
+++ b/lib/libpmc/pmc_init.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_init.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 24, 2007
+.Dd November 3, 2011
 .Dt PMC_INIT 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_name_of_capability.3 b/lib/libpmc/pmc_name_of_capability.3
index 54d02f2..c1b0579 100644
--- a/lib/libpmc/pmc_name_of_capability.3
+++ b/lib/libpmc/pmc_name_of_capability.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_name_of_capability.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 24, 2007
+.Dd November 3, 2011
 .Dt PMC_NAME_OF_CAPABILITY 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_read.3 b/lib/libpmc/pmc_read.3
index a295c56..4a4f472 100644
--- a/lib/libpmc/pmc_read.3
+++ b/lib/libpmc/pmc_read.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_read.3,v 1.4 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd November 25, 2007
+.Dd November 3, 2011
 .Dt PMC_READ 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_set.3 b/lib/libpmc/pmc_set.3
index 2c472ee..8343bec 100644
--- a/lib/libpmc/pmc_set.3
+++ b/lib/libpmc/pmc_set.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_set.3,v 1.2 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 25, 2007
+.Dd November 3, 2011
 .Dt PMC_SET 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmc_start.3 b/lib/libpmc/pmc_start.3
index 8ae7fdb..5c069c9 100644
--- a/lib/libpmc/pmc_start.3
+++ b/lib/libpmc/pmc_start.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmc_start.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd September 22, 2008
+.Dd November 3, 2011
 .Dt PMC_START 3
 .Os
 .Sh NAME
diff --git a/lib/libpmc/pmclog.3 b/lib/libpmc/pmclog.3
index fa40a02..dba3e89 100644
--- a/lib/libpmc/pmclog.3
+++ b/lib/libpmc/pmclog.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/lib/libpmc/pmclog.3,v 1.7 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd March 26, 2006
+.Dd November 3, 2011
 .Dt PMCLOG 3
 .Os
 .Sh NAME
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 50dd4e6..76433a8 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -100,6 +100,7 @@ MAN=	aac.4 \
 	hifn.4 \
 	hptiop.4 \
 	hptmv.4 \
+	hwpmc.4 \
 	ichsmb.4 \
 	icmp.4 \
 	icmp6.4 \
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index d81271c..eea7a65 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/hwpmc.4,v 1.25 2010/08/16 15:18:30 joel Exp $
 .\"
-.Dd June 26, 2011
+.Dd November 3, 2011
 .Dt HWPMC 4
 .Os
 .Sh NAME
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index b6af13a..40aa83d 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -31,6 +31,7 @@ LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevstat.a
 LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a
 LIBDM?=		${DESTDIR}${LIBDIR}/libdm.a
 LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
+LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
 LIBEVTR?=	${DESTDIR}${LIBDIR}/libevtr.a
 LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
 LIBFL?=		"don't use LIBFL, use LIBL"
@@ -75,6 +76,7 @@ MINUSLPAM+=	-lradius -ltacplus -lopie -lcrypt -lmd -lutil
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
+LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPOSIX1E?=	${DESTDIR}${LIBDIR}/libposix1e.a
 LIBPROP?=	${DESTDIR}${LIBDIR}/libprop.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
diff --git a/sys/conf/files b/sys/conf/files
index f0e2502..abd2762 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -374,6 +374,8 @@ dev/raid/hptmv/mv.c		optional hptmv
 dev/raid/hptmv/gui_lib.c	optional hptmv
 dev/raid/hptmv/hptproc.c	optional hptmv
 dev/raid/hptmv/ioctl.c		optional hptmv
+dev/misc/hwpmc/hwpmc_logging.c	optional hwpmc
+dev/misc/hwpmc/hwpmc_mod.c	optional hwpmc
 dev/powermng/ichsmb/ichsmb.c	optional ichsmb
 dev/powermng/ichsmb/ichsmb_pci.c	optional ichsmb pci
 dev/powermng/coretemp/coretemp.c	optional coretemp
@@ -895,6 +897,7 @@ kern/kern_mib.c		standard
 kern/kern_ntptime.c	standard
 kern/kern_objcache.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/options b/sys/conf/options
index ca1eb98..871635b 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -632,6 +632,9 @@ DCONS_POLL_HZ		opt_dcons.h
 DCONS_FORCE_CONSOLE	opt_dcons.h
 DCONS_FORCE_GDB		opt_dcons.h
 
+# HWPMC options
+HWPMC_HOOKS
+
 # deprecated drivers and options
 I_WANT_DEPRECATED_STUFF	opt_deprecated.h
 
diff --git a/sys/config/LINT b/sys/config/LINT
index c0b43de..601becc 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -394,6 +394,22 @@ options 	INTRO_USERCONFIG	#imply -c and show intro screen
 options 	VISUAL_USERCONFIG	#visual boot -c editor
 
 #####################################################################
+# PERFORMANCE MONITORING OPTIONS
+
+#
+# The hwpmc driver that allows the use of in-CPU performance monitoring
+# counters for performance monitoring.  The base kernel needs to be configured
+# with the 'options' line, while the hwpmc device can be either compiled
+# in or loaded as a loadable kernel module.
+#
+# Additional configuration options may be required on specific architectures,
+# please see hwpmc(4).
+
+device		hwpmc			# Driver (also a loadable module)
+options 	HWPMC_HOOKS		# Other necessary kernel hooks
+
+
+#####################################################################
 # NETWORKING OPTIONS
 
 #
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 6413267..bb54c4a 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -253,6 +253,22 @@ options 	COMPILING_LINT
 options 	UCONSOLE
 
 #####################################################################
+# PERFORMANCE MONITORING OPTIONS
+
+#
+# The hwpmc driver that allows the use of in-CPU performance monitoring
+# counters for performance monitoring.  The base kernel needs to be configured
+# with the 'options' line, while the hwpmc device can be either compiled
+# in or loaded as a loadable kernel module.
+#
+# Additional configuration options may be required on specific architectures,
+# please see hwpmc(4).
+
+device		hwpmc			# Driver (also a loadable module)
+options 	HWPMC_HOOKS		# Other necessary kernel hooks
+
+
+#####################################################################
 # NETWORKING OPTIONS
 
 #
diff --git a/sys/dev/misc/Makefile b/sys/dev/misc/Makefile
index 0231df0..555731a 100644
--- a/sys/dev/misc/Makefile
+++ b/sys/dev/misc/Makefile
@@ -1,3 +1,3 @@
-SUBDIR=cmx dcons ecc joy kbdmux lpbb pcfclock nmdm syscons snp tbridge
+SUBDIR=	cmx dcons ecc hwpmc joy kbdmux lpbb pcfclock nmdm syscons snp tbridge
 
 .include <bsd.subdir.mk>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 67b0e7e..3e86d94 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -76,6 +76,7 @@
 #include "opt_polling.h"
 #include "opt_ifpoll.h"
 #include "opt_pctrack.h"
+#include "opt_hwpmc_hooks.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 7c539bf..70dd34e 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -26,6 +26,8 @@
  * $FreeBSD: src/sys/kern/kern_exec.c,v 1.107.2.15 2002/07/30 15:40:46 nectar Exp $
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index c3dd688..b4875b6 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -40,6 +40,7 @@
  */
 
 #include "opt_compat.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 344bcb1..c621375 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -27,6 +27,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_hwpmc_hooks.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_pmc.c b/sys/kern/kern_pmc.c
index e623029..b021a47 100644
--- a/sys/kern/kern_pmc.c
+++ b/sys/kern/kern_pmc.c
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 
 #ifdef	HWPMC_HOOKS
-FEATURE(hwpmc_hooks, "Kernel support for HW PMC");
 #define	PMC_KERNEL_VERSION	PMC_VERSION
 #else
 #define	PMC_KERNEL_VERSION	0
diff --git a/sys/kern/lwkt_thread.c b/sys/kern/lwkt_thread.c
index 71e3f94..24ff936 100644
--- a/sys/kern/lwkt_thread.c
+++ b/sys/kern/lwkt_thread.c
@@ -39,6 +39,8 @@
  * scheduling is queued via (async) IPIs.
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/platform/pc32/apic/lapic.c b/sys/platform/pc32/apic/lapic.c
index 0d1849f..047e5b4 100644
--- a/sys/platform/pc32/apic/lapic.c
+++ b/sys/platform/pc32/apic/lapic.c
@@ -25,6 +25,8 @@
  * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files
index 4a2e3bc..e1a4ea9 100644
--- a/sys/platform/pc32/conf/files
+++ b/sys/platform/pc32/conf/files
@@ -132,6 +132,15 @@ dev/netif/ndis/if_ndis_pccard.c		optional 	ndis pccard
 dev/netif/ndis/if_ndis_pci.c		optional 	ndis cardbus
 dev/netif/ndis/if_ndis_pci.c		optional 	ndis pci
 dev/netif/ndis/if_ndis_usb.c		optional 	ndis usb
+dev/misc/hwpmc/hwpmc_amd.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_intel.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_core.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_uncore.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_pentium.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_piv.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_ppro.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_tsc.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_x86.c		optional	hwpmc
 dev/misc/kbd/atkbd.c			optional	atkbd
 dev/misc/kbd/atkbdc.c			optional	atkbdc
 dev/misc/kbd/kbd.c			optional	atkbd
diff --git a/sys/platform/pc32/i386/exception.s b/sys/platform/pc32/i386/exception.s
index a78d2ae..15f7ac1 100644
--- a/sys/platform/pc32/i386/exception.s
+++ b/sys/platform/pc32/i386/exception.s
@@ -35,6 +35,8 @@
 
 #include "use_npx.h"
 
+#include "opt_hwpmc_hooks.h"
+
 #include <machine/asmacros.h>
 #include <machine/segments.h>
 #include <machine/lock.h>
diff --git a/sys/platform/pc32/i386/genassym.c b/sys/platform/pc32/i386/genassym.c
index 77f955e..1ba1d61 100644
--- a/sys/platform/pc32/i386/genassym.c
+++ b/sys/platform/pc32/i386/genassym.c
@@ -37,6 +37,8 @@
  * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/assym.h>
diff --git a/sys/platform/pc32/i386/trap.c b/sys/platform/pc32/i386/trap.c
index 61fe0b6..cbd56b3 100644
--- a/sys/platform/pc32/i386/trap.c
+++ b/sys/platform/pc32/i386/trap.c
@@ -47,6 +47,7 @@
 
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 #include "opt_clock.h"
 #include "opt_trap.h"
diff --git a/sys/platform/pc64/apic/lapic.c b/sys/platform/pc64/apic/lapic.c
index 493a0f0..acc31a0 100644
--- a/sys/platform/pc64/apic/lapic.c
+++ b/sys/platform/pc64/apic/lapic.c
@@ -25,6 +25,8 @@
  * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files
index fbccd6c..dba94e8 100644
--- a/sys/platform/pc64/conf/files
+++ b/sys/platform/pc64/conf/files
@@ -109,6 +109,13 @@ dev/netif/ndis/if_ndis_pccard.c		optional	ndis pccard
 dev/netif/ndis/if_ndis_pci.c		optional	ndis cardbus
 dev/netif/ndis/if_ndis_pci.c		optional	ndis pci
 dev/netif/ndis/if_ndis_usb.c		optional	ndis usb
+dev/misc/hwpmc/hwpmc_amd.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_intel.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_core.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_uncore.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_piv.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_tsc.c		optional	hwpmc
+dev/misc/hwpmc/hwpmc_x86.c		optional	hwpmc
 dev/misc/kbd/atkbd.c			optional	atkbd
 dev/misc/kbd/atkbdc.c			optional	atkbdc
 dev/misc/kbd/kbd.c			optional	atkbd
diff --git a/sys/platform/pc64/x86_64/exception.S b/sys/platform/pc64/x86_64/exception.S
index 91ac0bd..76ec9ca 100644
--- a/sys/platform/pc64/x86_64/exception.S
+++ b/sys/platform/pc64/x86_64/exception.S
@@ -38,6 +38,7 @@
 #include "opt_atpic.h"
 #endif
 #include "opt_compat.h"
+#include "opt_hwpmc_hooks.h"
 
 #include <machine/asmacros.h>
 #include <machine/psl.h>
diff --git a/sys/platform/pc64/x86_64/genassym.c b/sys/platform/pc64/x86_64/genassym.c
index 7c16ea6..1923b64 100644
--- a/sys/platform/pc64/x86_64/genassym.c
+++ b/sys/platform/pc64/x86_64/genassym.c
@@ -38,6 +38,8 @@
  * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/assym.h>
diff --git a/sys/platform/pc64/x86_64/trap.c b/sys/platform/pc64/x86_64/trap.c
index 9863a5d..9e5e1d9 100644
--- a/sys/platform/pc64/x86_64/trap.c
+++ b/sys/platform/pc64/x86_64/trap.c
@@ -47,6 +47,7 @@
 #include "use_isa.h"
 
 #include "opt_ddb.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
 
 #include <machine/frame.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index c5a2695..b3b31d5 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -43,6 +43,8 @@
  * Mapped file (mmap) interface to VM
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 9ecfdf7..239855c 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -77,6 +77,9 @@ SUBDIR= 802_11 \
 	periodic \
 	pfctl \
 	pflogd \
+	pmcannotate \
+	pmccontrol \
+	pmcstat \
 	pnpinfo \
 	powerd \
 	ppp \
diff --git a/usr.sbin/pmcannotate/pmcannotate.8 b/usr.sbin/pmcannotate/pmcannotate.8
index 3f7faa4..18de9dd 100644
--- a/usr.sbin/pmcannotate/pmcannotate.8
+++ b/usr.sbin/pmcannotate/pmcannotate.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/pmcannotate/pmcannotate.8,v 1.3 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 20, 2008
+.Dd November 3, 2011
 .Dt PMCANNOTATE 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/pmccontrol/pmccontrol.8 b/usr.sbin/pmccontrol/pmccontrol.8
index c163205..c1ed603 100644
--- a/usr.sbin/pmccontrol/pmccontrol.8
+++ b/usr.sbin/pmccontrol/pmccontrol.8
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/pmccontrol/pmccontrol.8,v 1.4 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd November 9, 2008
+.Dd November 3, 2011
 .Dt PMCCONTROL 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8
index 5e323a6..19ce1d0 100644
--- a/usr.sbin/pmcstat/pmcstat.8
+++ b/usr.sbin/pmcstat/pmcstat.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/pmcstat/pmcstat.8,v 1.20 2010/04/14 19:08:06 uqs Exp $
 .\"
-.Dd September 19, 2008
+.Dd November 3, 2011
 .Dt PMCSTAT 8
 .Os
 .Sh NAME
-- 
1.7.0.5

