diff options
| author | Elliott Mitchell <ehem+freebsd@m5p.com> | 2022-09-08 16:16:03 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2023-06-09 18:14:59 +0000 |
| commit | 14df23cfeadc70b757c09277db6e1040713701a2 (patch) | |
| tree | 71c08e1c30d37437a2d99c3181837507921a9b6f | |
| parent | 6b5db9d3af0497e4538d6fd43df2596172867568 (diff) | |
| download | src-14df23cfeadc70b757c09277db6e1040713701a2.tar.gz src-14df23cfeadc70b757c09277db6e1040713701a2.zip | |
hwpmc: purge EOL release compatibility
(cherry picked from commit cb6abe87cf1c178ea1b9cd8a385e53459aef96e8)
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_logging.c | 6 | ||||
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_uncore.c | 4 | ||||
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_x86.c | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index b0dca3c15827..e0ff87619137 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -79,9 +79,6 @@ SYSCTL_DECL(_kern_hwpmc); */ static int pmclog_buffer_size = PMC_LOG_BUFFER_SIZE; -#if (__FreeBSD_version < 1100000) -TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "logbuffersize", &pmclog_buffer_size); -#endif SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN, &pmclog_buffer_size, 0, "size of log buffers in kilobytes"); @@ -90,9 +87,6 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN, */ static int pmc_nlogbuffers_pcpu = PMC_NLOGBUFFERS_PCPU; -#if (__FreeBSD_version < 1100000) -TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "nbuffers", &pmc_nlogbuffers_pcpu); -#endif SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers_pcpu, CTLFLAG_RDTUN, &pmc_nlogbuffers_pcpu, 0, "number of log buffers per cpu"); diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index 47d1e62e2698..7f61deedfd79 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -40,11 +40,7 @@ __FBSDID("$FreeBSD$"); #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/specialreg.h> diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 935ffefcf980..c30089accbef 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -42,11 +42,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/intr_machdep.h> -#if (__FreeBSD_version >= 1100000) #include <x86/apicvar.h> -#else -#include <machine/apicvar.h> -#endif #include <machine/pmc_mdep.h> #include <machine/md_var.h> |