Author: mmacy Date: Fri Oct 26 06:12:56 2018 New Revision: 339769 URL: https://svnweb.freebsd.org/changeset/base/339769
Log: fix i386 breakage caused by r339767 Modified: stable/11/sys/dev/hwpmc/hwpmc_amd.c stable/11/sys/i386/include/pmc_mdep.h Modified: stable/11/sys/dev/hwpmc/hwpmc_amd.c ============================================================================== --- stable/11/sys/dev/hwpmc/hwpmc_amd.c Fri Oct 26 05:25:22 2018 (r339768) +++ stable/11/sys/dev/hwpmc/hwpmc_amd.c Fri Oct 26 06:12:56 2018 (r339769) @@ -130,11 +130,7 @@ static struct amd_descr amd_pmcdesc[AMD_NPMCS] = struct amd_event_code_map { enum pmc_event pe_ev; /* enum value */ -#if defined(__i386__) - uint8_t pe_code; /* encoded event mask */ -#elif defined(__amd64__) uint16_t pe_code; /* encoded event mask */ -#endif uint8_t pe_mask; /* bits allowed in unit mask */ }; @@ -532,7 +528,6 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, { int i; uint32_t allowed_unitmask, caps, unitmask; - uint16_t eventval, extevent; enum pmc_event pe; const struct pmc_descr *pd; @@ -541,6 +536,7 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, uint32_t config; #elif defined(__amd64__) uint64_t config; + uint16_t eventval, extevent; #endif KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), Modified: stable/11/sys/i386/include/pmc_mdep.h ============================================================================== --- stable/11/sys/i386/include/pmc_mdep.h Fri Oct 26 05:25:22 2018 (r339768) +++ stable/11/sys/i386/include/pmc_mdep.h Fri Oct 26 06:12:56 2018 (r339769) @@ -69,6 +69,7 @@ struct pmc_mdep; #define PMC_MDEP_CLASS_INDEX_TSC 1 #define PMC_MDEP_CLASS_INDEX_K7 2 #define PMC_MDEP_CLASS_INDEX_K8 2 +#define PMC_MDEP_CLASS_INDEX_F17H 2 #define PMC_MDEP_CLASS_INDEX_P4 2 #define PMC_MDEP_CLASS_INDEX_P5 2 #define PMC_MDEP_CLASS_INDEX_P6 2 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"