diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-08-04 05:37:06 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-08-04 05:37:06 +0000 |
| commit | 2b19a7d476c4e52c7af403cc6b98cce4a9a792ab (patch) | |
| tree | 3506e575cfa58422f6277ccf570b58cebec6210b /bin/ps/ps.c | |
| parent | d0eafefda38ac398713867970be8869d686180a4 (diff) | |
toast non-NEWVM code; freebsd
Diffstat (limited to 'bin/ps/ps.c')
| -rw-r--r-- | bin/ps/ps.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 1546df9998b..d506c2b20a3 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ps.c,v 1.8 1997/06/13 00:37:39 michaels Exp $ */ +/* $OpenBSD: ps.c,v 1.9 1997/08/04 05:37:05 deraadt Exp $ */ /* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: ps.c,v 1.8 1997/06/13 00:37:39 michaels Exp $"; +static char rcsid[] = "$OpenBSD: ps.c,v 1.9 1997/08/04 05:37:05 deraadt Exp $"; #endif #endif /* not lint */ @@ -72,10 +72,6 @@ static char rcsid[] = "$OpenBSD: ps.c,v 1.8 1997/06/13 00:37:39 michaels Exp $"; #include "ps.h" -#ifdef P_PPWAIT -#define NEWVM -#endif - KINFO *kinfo; struct varent *vhead, *vtail; @@ -399,12 +395,8 @@ pscomp(a, b) const void *a, *b; { int i; -#ifdef NEWVM #define VSIZE(k) (KI_EPROC(k)->e_vm.vm_dsize + KI_EPROC(k)->e_vm.vm_ssize + \ KI_EPROC(k)->e_vm.vm_tsize) -#else -#define VSIZE(k) ((k)->ki_p->p_dsize + (k)->ki_p->p_ssize + (k)->ki_e->e_xsize) -#endif if (sortby == SORTCPU) return (getpcpu((KINFO *)b) - getpcpu((KINFO *)a)); |