Module Name: src
Committed By: wiz
Date: Tue Sep 24 11:31:06 UTC 2019
Modified Files:
src/usr.sbin/intrctl: intrctl.8 intrctl.c
Log Message:
Merge single letter options in usage.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/intrctl/intrctl.8
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/intrctl/intrctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/intrctl/intrctl.8
diff -u src/usr.sbin/intrctl/intrctl.8:1.6 src/usr.sbin/intrctl/intrctl.8:1.7
--- src/usr.sbin/intrctl/intrctl.8:1.6 Mon Sep 23 20:15:31 2019
+++ src/usr.sbin/intrctl/intrctl.8 Tue Sep 24 11:31:06 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: intrctl.8,v 1.6 2019/09/23 20:15:31 mrg Exp $
+.\" $NetBSD: intrctl.8,v 1.7 2019/09/24 11:31:06 wiz Exp $
.\"
.\" Copyright (c) 2015 Internet Initiative Japan Inc.
.\" All rights reserved.
@@ -56,7 +56,7 @@ enable to set an interrupt's affinity to
If
.Ar cpu_index
is already enabled, this command has no effect.
-.It list Oo Fl c Oc Oo Fl w Ar wait Oc Op Fl z
+.It list Oo Fl cz Oc Oo Fl w Ar wait Oc
for each intrid in the system, display interrupt counts per CPU.
The intrid is an interrupt name such as "ioapic0 pin 22" for x86.
.Pp
Index: src/usr.sbin/intrctl/intrctl.c
diff -u src/usr.sbin/intrctl/intrctl.c:1.10 src/usr.sbin/intrctl/intrctl.c:1.11
--- src/usr.sbin/intrctl/intrctl.c:1.10 Mon Sep 23 20:15:31 2019
+++ src/usr.sbin/intrctl/intrctl.c Tue Sep 24 11:31:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intrctl.c,v 1.10 2019/09/23 20:15:31 mrg Exp $ */
+/* $NetBSD: intrctl.c,v 1.11 2019/09/24 11:31:06 wiz Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: intrctl.c,v 1.10 2019/09/23 20:15:31 mrg Exp $");
+__RCSID("$NetBSD: intrctl.c,v 1.11 2019/09/24 11:31:06 wiz Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -99,7 +99,7 @@ usage(void)
{
const char *progname = getprogname();
- fprintf(stderr, "usage: %s list [-c] [-w secs] [-z]\n", progname);
+ fprintf(stderr, "usage: %s list [-cz] [-w secs]\n", progname);
fprintf(stderr, " %s affinity -i interrupt_name -c cpu_index\n",
progname);
fprintf(stderr, " %s intr -c cpu_index\n", progname);