PERFORCE change 143329 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=143329

Change 143329 by julian at julian_trafmon1 on 2008/06/12 00:09:02

	Oops, removed too much

Affected files ...

.. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#4 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ====

@@ -39,6 +39,9 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  */
 
+#include "opt_compat.h"
+#include "opt_vimage.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $");
 
@@ -89,7 +92,6 @@
 #include <machine/md_var.h>
 #endif /* __i386__ || __amd64__ */
 
-#include "opt_compat.h"
 #ifdef COMPAT_LINUX32				/* XXX */
 #include <machine/../linux32/linux.h>
 #else
@@ -512,12 +514,12 @@
 
 	sbuf_printf(sb,
 	    "%d.%02d %d.%02d %d.%02d %d/%d %d\n",
-	    (int)(averunnable.ldavg[0] / V_averunnable.fscale),
-	    (int)(averunnable.ldavg[0] * 100 / V_averunnable.fscale % 100),
-	    (int)(averunnable.ldavg[1] / V_averunnable.fscale),
-	    (int)(averunnable.ldavg[1] * 100 / V_averunnable.fscale % 100),
-	    (int)(averunnable.ldavg[2] / V_averunnable.fscale),
-	    (int)(averunnable.ldavg[2] * 100 / V_averunnable.fscale % 100),
+	    (int)(averunnable.ldavg[0] / averunnable.fscale),
+	    (int)(averunnable.ldavg[0] * 100 / averunnable.fscale % 100),
+	    (int)(averunnable.ldavg[1] / averunnable.fscale),
+	    (int)(averunnable.ldavg[1] * 100 / averunnable.fscale % 100),
+	    (int)(averunnable.ldavg[2] / averunnable.fscale),
+	    (int)(averunnable.ldavg[2] * 100 / averunnable.fscale % 100),
 	    1,				/* number of running tasks */
 	    nprocs,			/* number of tasks */
 	    lastpid			/* the last pid */
@@ -1000,6 +1002,7 @@
 static int
 linprocfs_donetdev(PFS_FILL_ARGS)
 {
+	INIT_VNET_NET(curvnet);
 	char ifname[16]; /* XXX LINUX_IFNAMSIZ */
 	struct ifnet *ifp;