From owner-svn-src-head@FreeBSD.ORG Mon Apr 20 15:45:47 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 506EAB04; Mon, 20 Apr 2015 15:45:47 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C295647; Mon, 20 Apr 2015 15:45:47 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id D7F5AB913; Mon, 20 Apr 2015 11:45:45 -0400 (EDT) From: John Baldwin To: Justin Hibbits Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r281721 - head/sys/sys Date: Mon, 20 Apr 2015 11:25:44 -0400 Message-ID: <476583045.Qcb6O2DFtY@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201504190033.t3J0XMDX041769@svn.freebsd.org> References: <201504190033.t3J0XMDX041769@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 20 Apr 2015 11:45:45 -0400 (EDT) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2015 15:45:47 -0000 On Sunday, April 19, 2015 12:33:22 AM Justin Hibbits wrote: > Author: jhibbits > Date: Sun Apr 19 00:33:21 2015 > New Revision: 281721 > URL: https://svnweb.freebsd.org/changeset/base/281721 > > Log: > Fix the build. Commit the last part of e500 PMC. > > Pointy hat to: jhibbits > > Modified: > head/sys/sys/pmc.h > > Modified: head/sys/sys/pmc.h > ============================================================================== > --- head/sys/sys/pmc.h Sun Apr 19 00:29:02 2015 (r281720) > +++ head/sys/sys/pmc.h Sun Apr 19 00:33:21 2015 (r281721) > @@ -102,6 +102,8 @@ > __PMC_CPU(MIPS_OCTEON, 0x201, "Cavium Octeon") \ > __PMC_CPU(MIPS_74K, 0x202, "MIPS 74K") \ > __PMC_CPU(PPC_7450, 0x300, "PowerPC MPC7450") \ > + __PMC_CPU(PPC_E500, 0x340, "PowerPC e500 Core") \ > + __PMC_CPU(PPC_MPC85XX, 0x340, "Freescale PowerPC MPC85XX") \ > __PMC_CPU(PPC_970, 0x380, "IBM PowerPC 970") \ > __PMC_CPU(GENERIC, 0x400, "Generic") > > @@ -136,6 +138,7 @@ enum pmc_cputype { > __PMC_CLASS(MIPS74K) /* MIPS 74K */ \ > __PMC_CLASS(PPC7450) /* Motorola MPC7450 class */ \ > __PMC_CLASS(PPC970) /* IBM PowerPC 970 class */ \ > + __PMC_CLASS(E500) /* Freescale e500 class */ \ > __PMC_CLASS(SOFT) /* Software events */ Note that each time a PMC_CLASS is added, the ABI for pmccontrol -L breaks since the enum value of the "SOFT" class changes. We should perhaps fix the value of SOFT to make this less painful (just as we fix the values for PMC_CPU so that those don't change). -- John Baldwin