From owner-svn-src-stable-9@freebsd.org  Fri Oct  2 14:16:39 2015
Return-Path: <owner-svn-src-stable-9@freebsd.org>
Delivered-To: svn-src-stable-9@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 1171DA0EA49;
 Fri,  2 Oct 2015 14:16:39 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0169714A5;
 Fri,  2 Oct 2015 14:16:39 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t92EGc0Y023842;
 Fri, 2 Oct 2015 14:16:38 GMT (envelope-from vangyzen@FreeBSD.org)
Received: (from vangyzen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t92EGc3V023840;
 Fri, 2 Oct 2015 14:16:38 GMT (envelope-from vangyzen@FreeBSD.org)
Message-Id: <201510021416.t92EGc3V023840@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to
 vangyzen@FreeBSD.org using -f
From: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Fri, 2 Oct 2015 14:16:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r288496 - stable/9/usr.sbin/pmcstat
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Oct 2015 14:16:39 -0000

Author: vangyzen
Date: Fri Oct  2 14:16:37 2015
New Revision: 288496
URL: https://svnweb.freebsd.org/changeset/base/288496

Log:
  MFC r280793
  
  pmcstat.8: The -m flag requires the -R flag.
  
  Approved by:    kib (mentor until recently)
  Sponsored by:   Dell Inc.

Modified:
  stable/9/usr.sbin/pmcstat/pmcstat.8
  stable/9/usr.sbin/pmcstat/pmcstat.c
Directory Properties:
  stable/9/usr.sbin/pmcstat/   (props changed)

Modified: stable/9/usr.sbin/pmcstat/pmcstat.8
==============================================================================
--- stable/9/usr.sbin/pmcstat/pmcstat.8	Fri Oct  2 14:11:44 2015	(r288495)
+++ stable/9/usr.sbin/pmcstat/pmcstat.8	Fri Oct  2 14:16:37 2015	(r288496)
@@ -279,6 +279,12 @@ is a
 this information is sent to the output file specified by the
 .Fl o
 option.
+This option requires the
+.Fl R
+option to read in samples that were previously collected and
+saved with the
+.Fl O
+option.
 .It Fl n Ar rate
 Set the default sampling rate for subsequent sampling mode
 PMCs specified on the command line.

Modified: stable/9/usr.sbin/pmcstat/pmcstat.c
==============================================================================
--- stable/9/usr.sbin/pmcstat/pmcstat.c	Fri Oct  2 14:11:44 2015	(r288495)
+++ stable/9/usr.sbin/pmcstat/pmcstat.c	Fri Oct  2 14:16:37 2015	(r288496)
@@ -935,7 +935,7 @@ main(int argc, char **argv)
 		errx(EX_USAGE, "ERROR: options -T and -l are mutually "
 		    "exclusive.");
 
-	/* -m option is allowed with -R only. */
+	/* -m requires -R */
 	if (args.pa_flags & FLAG_DO_ANNOTATE && args.pa_inputpath == NULL)
 		errx(EX_USAGE, "ERROR: option -m requires an input file");