From owner-svn-src-all@freebsd.org Thu Jul 28 11:27:42 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F390BA58F0; Thu, 28 Jul 2016 11:27:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 53BB41C89; Thu, 28 Jul 2016 11:27:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 4C27716E4; Thu, 28 Jul 2016 11:27:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id C136524640; Thu, 28 Jul 2016 11:27:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id DqoiUGoxz0PY; Thu, 28 Jul 2016 11:27:34 +0000 (UTC) Subject: Re: svn commit: r303419 - head/usr.sbin/pmcstudy DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 62BF12463B To: Konstantin Belousov References: <201607272145.u6RLjBZO016327@repo.freebsd.org> <20160728083042.GR38613@kib.kiev.ua> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <5f26182c-c69b-af45-db8d-88de6c8e0ff0@FreeBSD.org> Date: Thu, 28 Jul 2016 04:27:35 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160728083042.GR38613@kib.kiev.ua> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RGOE6cSWlF13FRXV4rpV9oHpm92WQnvMH" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Thu, 28 Jul 2016 11:27:42 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --RGOE6cSWlF13FRXV4rpV9oHpm92WQnvMH Content-Type: multipart/mixed; boundary="J4TVRX84w6V7GRIWPpjEvE1gnlenwx8vQ" From: Bryan Drewery To: Konstantin Belousov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <5f26182c-c69b-af45-db8d-88de6c8e0ff0@FreeBSD.org> Subject: Re: svn commit: r303419 - head/usr.sbin/pmcstudy References: <201607272145.u6RLjBZO016327@repo.freebsd.org> <20160728083042.GR38613@kib.kiev.ua> In-Reply-To: <20160728083042.GR38613@kib.kiev.ua> --J4TVRX84w6V7GRIWPpjEvE1gnlenwx8vQ Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 7/28/2016 1:30 AM, Konstantin Belousov wrote: > On Wed, Jul 27, 2016 at 09:45:11PM +0000, Bryan Drewery wrote: >> Author: bdrewery >> Date: Wed Jul 27 21:45:11 2016 >> New Revision: 303419 >> URL: https://svnweb.freebsd.org/changeset/base/303419 >> >> Log: >> Fix non-amd64 build from r292043 after reconnecting in r303410. >> =20 >> MFC after: 3 days >> X-MFC-With: r303410 >> Sponsored by: EMC / Isilon Storage Division >> >> Modified: >> head/usr.sbin/pmcstudy/pmcstudy.c >> >> Modified: head/usr.sbin/pmcstudy/pmcstudy.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/usr.sbin/pmcstudy/pmcstudy.c Wed Jul 27 20:51:31 2016 (r30341= 8) >> +++ head/usr.sbin/pmcstudy/pmcstudy.c Wed Jul 27 21:45:11 2016 (r30341= 9) >> @@ -2322,11 +2322,7 @@ do_cpuid(u_int ax, u_int cx, u_int *p) >> =20 >> #else >> #define cpuid(in, a, b, c, d)=20 >> -static __inline void >> -do_cpuid(u_int ax, u_int cx, u_int *p) >> -{ >> -} >> - >> +#define do_cpuid(ax, cx, p) >> #endif >> =20 >> static void > Should the same code be enabled for i386 as well ? >=20 I don't know. I just know I accidentally disconnected it and when reconnecting it revealed a bug introduced while disconnected. --=20 Regards, Bryan Drewery --J4TVRX84w6V7GRIWPpjEvE1gnlenwx8vQ-- --RGOE6cSWlF13FRXV4rpV9oHpm92WQnvMH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJXmewnAAoJEDXXcbtuRpfPFOgH/2U/wKceSMEjL/nXOVyGpEB1 Nga3GfXEIqewwnEIifddoZYIv/dwJOjFiocLlkzTsZGIwYB9R5GeNLdM886D2/vI jEuJpFFmp6javpi8VpC2yJpR6M9SfOJLSMDinAFEJcAldNh57rMqxjCRurtCefdn CL9TGLwqJ6OXZp48Sl3a0BzhaaoawsVO1oOe/VkJK27MnOjo/m8EBweLxgob1fMc XJJKcJlOGXult8etYz1mO1mhSK7hQYPydD6zoVGG8EZnT3fe3dg5INY09Y9RNhEU C04/ohzoGMwDnMgHdNPxSoYAEK8ftjLxWXDFwpO9GVM5qbu2D1LqrEmeO/c8esQ= =ADZC -----END PGP SIGNATURE----- --RGOE6cSWlF13FRXV4rpV9oHpm92WQnvMH--