svn commit: r303675 - in stable/11/usr.sbin: . pmcstudy

[Bryan Drewery]

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