From owner-p4-projects@FreeBSD.ORG Thu Jun 12 06:36:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A12EF1065675; Thu, 12 Jun 2008 06:36:21 +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 4AE1D106564A for ; Thu, 12 Jun 2008 06:36:21 +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 32D6C8FC16 for ; Thu, 12 Jun 2008 06:36:21 +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 m5C6aLAC075312 for ; Thu, 12 Jun 2008 06:36:21 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5C6aLx7075310 for perforce@freebsd.org; Thu, 12 Jun 2008 06:36:21 GMT (envelope-from julian@freebsd.org) Date: Thu, 12 Jun 2008 06:36:21 GMT Message-Id: <200806120636.m5C6aLx7075310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jun 2008 06:36:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=143351 Change 143351 by julian@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 __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 #include ==== //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -78,7 +79,6 @@ #include #include #include -#include #include #endif #if defined(__i386__) ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -73,6 +73,7 @@ #include #include #include +#include #else #include #include ==== //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 #include @@ -63,7 +62,6 @@ #include #include #endif -#include #include @@ -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);