Module Name: src
Committed By: joerg
Date: Mon Jun 2 19:29:58 UTC 2014
Modified Files:
src/libexec/rpc.rstatd: Makefile rstat_proc.c
Log Message:
Remove remaining kvm glue.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/libexec/rpc.rstatd/Makefile
cvs rdiff -u -r1.49 -r1.50 src/libexec/rpc.rstatd/rstat_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/rpc.rstatd/Makefile
diff -u src/libexec/rpc.rstatd/Makefile:1.20 src/libexec/rpc.rstatd/Makefile:1.21
--- src/libexec/rpc.rstatd/Makefile:1.20 Fri Apr 14 13:19:03 2006
+++ src/libexec/rpc.rstatd/Makefile Mon Jun 2 19:29:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/14 13:19:03 blymn Exp $
+# $NetBSD: Makefile,v 1.21 2014/06/02 19:29:58 joerg Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@ SRCS = drvstats.c rstatd.c rstat_proc.c
MAN = rpc.rstatd.8
MLINKS= rpc.rstatd.8 rstatd.8
-DPADD= ${LIBRPCSVC} ${LIBKVM}
-LDADD= -lrpcsvc -lkvm
+DPADD= ${LIBRPCSVC}
+LDADD= -lrpcsvc
.include <bsd.prog.mk>
Index: src/libexec/rpc.rstatd/rstat_proc.c
diff -u src/libexec/rpc.rstatd/rstat_proc.c:1.49 src/libexec/rpc.rstatd/rstat_proc.c:1.50
--- src/libexec/rpc.rstatd/rstat_proc.c:1.49 Mon Jun 2 18:17:51 2014
+++ src/libexec/rpc.rstatd/rstat_proc.c Mon Jun 2 19:29:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rstat_proc.c,v 1.49 2014/06/02 18:17:51 joerg Exp $ */
+/* $NetBSD: rstat_proc.c,v 1.50 2014/06/02 19:29:58 joerg Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: rstat_proc.c,v 1.49 2014/06/02 18:17:51 joerg Exp $");
+__RCSID("$NetBSD: rstat_proc.c,v 1.50 2014/06/02 19:29:58 joerg Exp $");
/*
* rstat service: built with rstat.x and derived from rpc.rstatd.c
@@ -50,7 +50,6 @@ __RCSID("$NetBSD: rstat_proc.c,v 1.49 20
#include <signal.h>
#include <fcntl.h>
#include <limits.h>
-#include <nlist.h>
#include <syslog.h>
#include <sys/sysctl.h>
#include <uvm/uvm_extern.h>
@@ -80,14 +79,7 @@ __RCSID("$NetBSD: rstat_proc.c,v 1.49 20
#define BSD_CPUSTATES 5 /* Use protocol's idea of CPU states */
int cp_xlat[CPUSTATES] = { CP_USER, CP_NICE, CP_SYS, CP_IDLE };
-struct nlist nl[] = {
-#define X_IFNET 0
- { "_ifnet", 0, 0, 0, 0 },
- { NULL, 0, 0, 0, 0 },
-};
-
int hz;
-char *memf = NULL, *nlistf = NULL;
extern int from_inetd;
int sincelastreq = 0; /* number of alarms since last request */
