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");
 
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to