From owner-svn-src-stable@freebsd.org  Tue Aug  2 20:18:44 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 C6EBCBAD9AC;
 Tue,  2 Aug 2016 20:18:44 +0000 (UTC)
 (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id 9639F1EA2;
 Tue,  2 Aug 2016 20:18:44 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72KIhdT003265;
 Tue, 2 Aug 2016 20:18:43 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72KIhoT003263;
 Tue, 2 Aug 2016 20:18:43 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201608022018.u72KIhoT003263@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 2 Aug 2016 20:18:43 +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: r303675 - in stable/11/usr.sbin: . pmcstudy
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Aug 2016 20:18:44 -0000

Author: bdrewery
Date: Tue Aug  2 20:18:43 2016
New Revision: 303675
URL: https://svnweb.freebsd.org/changeset/base/303675

Log:
  MFC r303410,r303419:
  
    r303410:
      Reconnect pmcstudy, lost in r291021
    r303419:
      Fix non-amd64 build from r292043 after reconnecting in r303410.
  
  Approved by:	re (kib)

Modified:
  stable/11/usr.sbin/Makefile
  stable/11/usr.sbin/pmcstudy/pmcstudy.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/Makefile
==============================================================================
--- stable/11/usr.sbin/Makefile	Tue Aug  2 20:11:04 2016	(r303674)
+++ stable/11/usr.sbin/Makefile	Tue Aug  2 20:18:43 2016	(r303675)
@@ -181,6 +181,7 @@ SUBDIR.${MK_PKGBOOTSTRAP}+=	pkg
 SUBDIR.${MK_PMC}+=	pmcannotate
 SUBDIR.${MK_PMC}+=	pmccontrol
 SUBDIR.${MK_PMC}+=	pmcstat
+SUBDIR.${MK_PMC}+=	pmcstudy
 SUBDIR.${MK_PORTSNAP}+=	portsnap
 SUBDIR.${MK_PPP}+=	ppp
 SUBDIR.${MK_QUOTAS}+=	edquota

Modified: stable/11/usr.sbin/pmcstudy/pmcstudy.c
==============================================================================
--- stable/11/usr.sbin/pmcstudy/pmcstudy.c	Tue Aug  2 20:11:04 2016	(r303674)
+++ stable/11/usr.sbin/pmcstudy/pmcstudy.c	Tue Aug  2 20:18:43 2016	(r303675)
@@ -2322,11 +2322,7 @@ do_cpuid(u_int ax, u_int cx, u_int *p)
 
 #else
 #define cpuid(in, a, b, c, d) 
-static __inline void
-do_cpuid(u_int ax, u_int cx, u_int *p)
-{
-}
-
+#define do_cpuid(ax, cx, p)
 #endif
 
 static void