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_piv.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_piv.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_piv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c index 7e3cb48..ff47cb8 100644 --- a/sys/dev/hwpmc/hwpmc_piv.c +++ b/sys/dev/hwpmc/hwpmc_piv.c @@ -39,9 +39,12 @@ __FBSDID("$FreeBSD$"); #include <sys/pmckern.h> #include <sys/smp.h> #include <sys/systm.h> - #include <machine/intr_machdep.h> +#if (__FreeBSD_version >= 1100000) +#include <x86/apicvar.h> +#else #include <machine/apicvar.h> +#endif #include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/cputypes.h> |
