From owner-p4-projects@FreeBSD.ORG  Thu Jun 12 00:02:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A77F6106564A; Thu, 12 Jun 2008 00:02:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33A5D1065671
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 00:02:41 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0440C8FC19
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 00:02:41 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5C02ej7014933
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 00:02:40 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5C02eAq014931
	for perforce@freebsd.org; Thu, 12 Jun 2008 00:02:40 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 12 Jun 2008 00:02:40 GMT
Message-Id: <200806120002.m5C02eAq014931@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143328 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jun 2008 00:02:41 -0000

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

Change 143328 by julian@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;