diff options
| author | rrs <rrs@FreeBSD.org> | 2015-03-24 20:00:11 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2015-03-24 20:00:11 +0000 |
| commit | 0444d8258d3c6c2219b8aadd39daf2fe9473512c (patch) | |
| tree | 4d16eb1cb375dcd059efa00e91a45c0fbf17563a /sys/dev/hwpmc/hwpmc_logging.c | |
| parent | f5cf31bac5259172697ccde44e661519990bc4b4 (diff) | |
| download | FreeBSD-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/dev/hwpmc/hwpmc_logging.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_logging.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index c9b8aea..4d14011 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -37,7 +37,11 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#if (__FreeBSD_version >= 1100000) #include <sys/capsicum.h> +#else +#include <sys/capability.h> +#endif #include <sys/file.h> #include <sys/kernel.h> #include <sys/kthread.h> @@ -66,8 +70,7 @@ SYSCTL_DECL(_kern_hwpmc); */ static int pmclog_buffer_size = PMC_LOG_BUFFER_SIZE; -TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "logbuffersize", &pmclog_buffer_size); -SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_TUN|CTLFLAG_RD, +SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN, &pmclog_buffer_size, 0, "size of log buffers in kilobytes"); /* @@ -75,8 +78,7 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_TUN|CTLFLAG_RD, */ static int pmc_nlogbuffers = PMC_NLOGBUFFERS; -TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "nbuffers", &pmc_nlogbuffers); -SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers, CTLFLAG_TUN|CTLFLAG_RD, +SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers, CTLFLAG_RDTUN, &pmc_nlogbuffers, 0, "number of global log buffers"); /* @@ -571,7 +573,6 @@ pmclog_configure_log(struct pmc_mdep *md, struct pmc_owner *po, int logfd) int error; struct proc *p; cap_rights_t rights; - /* * As long as it is possible to get a LOR between pmc_sx lock and * proctree/allproc sx locks used for adding a new process, assure |
