PERFORCE change 143328 for review

[Julian Elischer]

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

Change 143328 by julian at julian_trafmon1 on 2008/06/12 00:01:43

	revert this change. Doesn't belong here.

Affected files ...

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

Differences ...

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

@@ -42,9 +42,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $");
 
-#include "opt_compat.h"
-#include "opt_vimage.h"
-
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/blist.h>
@@ -92,6 +89,7 @@
 #include <machine/md_var.h>
 #endif /* __i386__ || __amd64__ */
 
+#include "opt_compat.h"
 #ifdef COMPAT_LINUX32				/* XXX */
 #include <machine/../linux32/linux.h>
 #else
@@ -511,16 +509,15 @@
 static int
 linprocfs_doloadavg(PFS_FILL_ARGS)
 {
-	INIT_VPROCG(TD_TO_VPROCG(curthread));
 
 	sbuf_printf(sb,
 	    "%d.%02d %d.%02d %d.%02d %d/%d %d\n",
-	    (int)(V_averunnable.ldavg[0] / V_averunnable.fscale),
-	    (int)(V_averunnable.ldavg[0] * 100 / V_averunnable.fscale % 100),
-	    (int)(V_averunnable.ldavg[1] / V_averunnable.fscale),
-	    (int)(V_averunnable.ldavg[1] * 100 / V_averunnable.fscale % 100),
-	    (int)(V_averunnable.ldavg[2] / V_averunnable.fscale),
-	    (int)(V_averunnable.ldavg[2] * 100 / V_averunnable.fscale % 100),
+	    (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),
 	    1,				/* number of running tasks */
 	    nprocs,			/* number of tasks */
 	    lastpid			/* the last pid */
@@ -1003,7 +1000,6 @@
 static int
 linprocfs_donetdev(PFS_FILL_ARGS)
 {
-	INIT_VNET_NET(TD_TO_VNET(curthread));
 	char ifname[16]; /* XXX LINUX_IFNAMSIZ */
 	struct ifnet *ifp;