From owner-svn-src-all@freebsd.org Fri Oct 26 06:12:57 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5448910D7FA1; Fri, 26 Oct 2018 06:12:57 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0579286034; Fri, 26 Oct 2018 06:12:57 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D9A011D0C7; Fri, 26 Oct 2018 06:12:56 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9Q6CuCW033692; Fri, 26 Oct 2018 06:12:56 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9Q6CugK033690; Fri, 26 Oct 2018 06:12:56 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201810260612.w9Q6CugK033690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 26 Oct 2018 06:12:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r339769 - in stable/11/sys: dev/hwpmc i386/include X-SVN-Group: stable-11 X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in stable/11/sys: dev/hwpmc i386/include X-SVN-Commit-Revision: 339769 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Oct 2018 06:12:57 -0000 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