diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-27 19:33:22 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-27 19:33:22 +0000 |
| commit | b4d055c56d56b705a9874806044897b6f933a892 (patch) | |
| tree | ea6944e4424f24dce67f9a7422a498a2e3e97486 /usr.bin/systat | |
| parent | d413353d829242c97addbbe6aace0c12d53c4772 (diff) | |
From NetBSD: merge of 960317
Diffstat (limited to 'usr.bin/systat')
| -rw-r--r-- | usr.bin/systat/disks.c | 12 | ||||
| -rw-r--r-- | usr.bin/systat/iostat.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/usr.bin/systat/disks.c b/usr.bin/systat/disks.c index 5b3a058e9cc..aa42b2c9d76 100644 --- a/usr.bin/systat/disks.c +++ b/usr.bin/systat/disks.c @@ -1,4 +1,5 @@ -/* $NetBSD: disks.c,v 1.2 1995/01/20 08:51:53 jtc Exp $ */ +/* $OpenBSD: disks.c,v 1.2 1996/03/27 19:32:52 niklas Exp $ */ +/* $NetBSD: disks.c,v 1.3 1996/03/15 22:19:23 ragge Exp $ */ /*- * Copyright (c) 1980, 1992, 1993 @@ -36,8 +37,9 @@ #ifndef lint #if 0 static char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93"; +static char rcsid[] = "$NetBSD: disks.c,v 1.3 1996/03/15 22:19:23 ragge Exp $"; #endif -static char rcsid[] = "$NetBSD: disks.c,v 1.2 1995/01/20 08:51:53 jtc Exp $"; +static char rcsid[] = "$OpenBSD: disks.c,v 1.2 1996/03/27 19:32:52 niklas Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -59,12 +61,6 @@ static struct nlist namelist[] = { { "_dk_ndrive" }, #define X_DK_WPMS 1 { "_dk_wpms" }, -#ifdef vax -#define X_MBDINIT (X_DK_WPMS+1) - { "_mbdinit" }, -#define X_UBDINIT (X_DK_WPMS+2) - { "_ubdinit" }, -#endif #ifdef sun #define X_MBDINIT (X_DK_WPMS+1) { "_mbdinit" }, diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index dc0525326c0..c2607d46790 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -1,4 +1,5 @@ -/* $NetBSD: iostat.c,v 1.3 1995/05/17 15:51:47 mycroft Exp $ */ +/* $OpenBSD: iostat.c,v 1.2 1996/03/27 19:32:54 niklas Exp $ */ +/* $NetBSD: iostat.c,v 1.4 1996/03/15 22:19:25 ragge Exp $ */ /* * Copyright (c) 1980, 1992, 1993 @@ -36,8 +37,9 @@ #ifndef lint #if 0 static char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93"; +static char rcsid[] = "$NetBSD: iostat.c,v 1.4 1996/03/15 22:19:25 ragge Exp $"; #endif -static char rcsid[] = "$NetBSD: iostat.c,v 1.3 1995/05/17 15:51:47 mycroft Exp $"; +static char rcsid[] = "$OpenBSD: iostat.c,v 1.2 1996/03/27 19:32:54 niklas Exp $"; #endif not lint #include <sys/param.h> @@ -64,12 +66,6 @@ static struct nlist namelist[] = { { "_dk_seek" }, #define X_CP_TIME 5 { "_cp_time" }, -#ifdef vax -#define X_MBDINIT (X_CP_TIME+1) - { "_mbdinit" }, -#define X_UBDINIT (X_CP_TIME+2) - { "_ubdinit" }, -#endif #ifdef tahoe #define X_VBDINIT (X_CP_TIME+1) { "_vbdinit" }, |