PERFORCE change 143351 for review

[Julian Elischer]

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

Change 143351 by julian at julian_trafmon1 on 2008/06/12 06:36:03

	A few more things to compile LINT
	remove more loadavg stuff.

Affected files ...

.. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#4 edit
.. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#3 edit
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#2 edit
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#3 edit
.. //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#3 edit
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#3 edit

Differences ...

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

@@ -29,7 +29,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");
 
-#include "opt_vimage.h
+#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>

==== //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ====

@@ -50,6 +50,7 @@
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 #include <sys/queue.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -78,7 +79,6 @@
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>
-#include <sys/vimage.h>
 #include <machine/clock.h>
 #endif
 #if defined(__i386__)

==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ====

@@ -73,6 +73,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 #else
 #include <sys/ioctl.h>
 #include <sys/timeout.h>

==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#3 (text+ko) ====

@@ -1856,16 +1856,6 @@
 	pf_osfp_validate(void);
 
 /*
- * Stack virtualization support.
- */
-#ifdef VIMAGE
-struct vnet_pf {
-	struct vnet		*parent_vnet;
-
-}
-#endif
-
-/*
  * Symbol translation macros
  */
 #define INIT_VNET_PF(vnet) \

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

@@ -39,7 +39,6 @@
 
 #include "opt_ktrace.h"
 #include "opt_sched.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,7 +62,6 @@
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #endif
-#include <sys/vimage.h>
 
 #include <machine/cpu.h>
 
@@ -495,19 +493,12 @@
 	int i, nrun;
 	struct loadavg *avg;
 
-	VPROCG_ITERLOOP_BEGIN();
-	INIT_VPROCG(vprocg_iter);
-#ifdef VIMAGE
-	nrun = sched_load(vprocg_iter);
-#else
 	nrun = sched_load();
-#endif
-	avg = &V_averunnable;
+	avg = &averunnable;
 
 	for (i = 0; i < 3; i++)
 		avg->ldavg[i] = (cexp[i] * avg->ldavg[i] +
 		    nrun * FSCALE * (FSCALE - cexp[i])) >> FSHIFT;
-	VPROCG_ITERLOOP_END();
 
 	/*
 	 * Schedule the next update to occur after 5 seconds, but add a

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

@@ -85,7 +85,6 @@
 	esp_enable,	CTLFLAG_RW,	esp_enable,	0, "");
 SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_esp, IPSECCTL_STATS,
 	stats,		CTLFLAG_RD,	espstat,	espstat, "");
-#ifndef VIMAGE
 static	int esp_max_ivlen;		/* max iv length over all algorithms */
 
 static int esp_input_cb(struct cryptop *op);