Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Aug 2008 21:44:42 GMT
From:      Julian Elischer <julian@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 147495 for review
Message-ID:  <200808152144.m7FLigdQ064512@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147495

Change 147495 by julian@julian_trafmon1 on 2008/08/15 21:44:14

	remove opt_vimage.h as per DES

Affected files ...

.. //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_stat.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/conf/options#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/altq/altq/altq_subr.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#4 edit
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/if_pfsync.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/ddb/db_textdump.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_mib.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_xxx.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_ef.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_enc.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_faith.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_gif.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_gre.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_loop.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_mib.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_stf.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/net/route.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/rtsock.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/atm/ng_atm.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_iface.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/igmp.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_gif.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_carp.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_encap.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw_nat.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_gre.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_id.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_ipsec.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_options.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_debug.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_hostcache.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_output.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_sack.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/dest6.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/icmp6.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_proto.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_src.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_forward.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_input.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_ipsec.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_mroute.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/mld6.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/raw_ip6.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/route6.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_input.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_mbuf.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/key.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ipcomp.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vfsops.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/rpc/authunix_prot.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac/mac_inet.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_biba/mac_biba.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_mls/mac_mls.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate

Differences ...

==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#4 (text) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#2 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -40,7 +40,6 @@
  */
 
 #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 $");

==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#4 (text+ko) ====

@@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $");
 
-#include "opt_vimage.h"
 #include "opt_compat.h"
 
 #include <sys/param.h>

==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#5 (text+ko) ====

@@ -32,7 +32,6 @@
 
 #include "opt_compat.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/blist.h>

==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_socket.c#2 (text+ko) ====

@@ -32,7 +32,6 @@
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>

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

@@ -29,7 +29,6 @@
 #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 <sys/param.h>
 #include <sys/proc.h>

==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_stat.c#3 (text+ko) ====

@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_vimage.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/conf/options#3 (text+ko) ====

@@ -768,4 +768,4 @@
 TCP_OFFLOAD_DISABLE	opt_inet.h
 
 # Virtualize the network stack
-VIMAGE			opt_vimage.h
+VIMAGE			opt_global.h

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

@@ -32,7 +32,6 @@
 #if (__FreeBSD__ != 2)
 #include "opt_inet.h"
 #ifdef __FreeBSD__
-#include "opt_vimage.h"
 #include "opt_inet6.h"
 #endif
 #endif

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#4 (text+ko) ====

@@ -28,7 +28,6 @@
     (__FreeBSD_version >= 220000)
 # if (__FreeBSD_version >= 400000)
 #  if (__FreeBSD_version >= 800000)
-#   include "opt_vimage.h"
 #   include "opt_inet6.h"
 #  endif
 #  if (__FreeBSD_version == 400019)
@@ -36,7 +35,6 @@
 #  endif
 # endif
 # if (__FreeBSD_version >= 800000)
-#  include "opt_vimage.h"
 #  include <sys/vimage.h>
 # endif
 # include <sys/filio.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ====

@@ -54,7 +54,6 @@
 #endif
 #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \
     (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000))
-# include "opt_vimage.h"
 # include <sys/queue.h>
 # include <sys/vimage.h>
 #endif

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ====

@@ -63,7 +63,6 @@
 # include <sys/select.h>
 #endif
 #if __FreeBSD_version >= 800000
-# include "opt_vimage.h"
 # include <sys/vimage.h>
 #else
 #define V_path_mtu_discovery path_mtu_discovery

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 (text+ko) ====

@@ -59,7 +59,6 @@
 # include <sys/kmem.h>
 #endif
 #if (__FreeBSD_version > 800000)
-# include "opt_vimage.h"
 # include <sys/vimage.h>
 #endif
 #include <net/if.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#2 (text+ko) ====

@@ -105,7 +105,6 @@
 # include <net/if_var.h>
 #endif
 #if __FreeBSD_version >= 800000
-# include "opt_vimage.h"
 # include <sys/vimage.h>
 #endif
 #include <net/route.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 (text+ko) ====

@@ -71,7 +71,6 @@
 # include <sys/queue.h>
 #endif
 #if __FreeBSD_version >= 800000
-# include "opt_vimage.h"
 # include <sys/vimage.h>
 #endif
 #include <net/if.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 (text+ko) ====

@@ -50,7 +50,6 @@
 # include <sys/filio.h>
 # include <sys/fcntl.h>
 # if (__FreeBSD_version > 800000)
-#  include "opt_vimage.h"
 #  include <sys/vimage.h>
 # endif   
 # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#3 (text+ko) ====

@@ -45,7 +45,6 @@
 #  include "opt_ipfilter.h"
 # endif
 # if (__FreeBSD_version > 800000)
-#  include "opt_vimage.h"
 #  include <sys/vimage.h>
 # endif   
 #else

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 (text+ko) ====

@@ -43,7 +43,6 @@
 #  include "opt_ipfilter.h"
 # endif
 # if (__FreeBSD_version > 800000)
-#  include "opt_vimage.h"
 #  include <sys/vimage.h>
 # endif   
 #else

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

@@ -32,7 +32,6 @@
 #include "opt_carp.h"
 #include "opt_bpf.h"
 #include "opt_pf.h"
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $");

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

@@ -38,7 +38,6 @@
 #ifdef __FreeBSD__
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.54 2008/05/09 23:02:55 julian Exp $");

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

@@ -35,7 +35,6 @@
 #if defined(__FreeBSD__)
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $");

==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#3 (text+ko) ====

@@ -38,7 +38,6 @@
 #ifdef __FreeBSD__
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $");

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

@@ -29,7 +29,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_pf.h"
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.19 2007/07/03 12:16:07 mlaier Exp $");

==== //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#2 (text+ko) ====

@@ -63,7 +63,6 @@
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#2 (text+ko) ====

@@ -29,7 +29,6 @@
  *
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $");

==== //depot/projects/vimage-commit3/src/sys/ddb/db_textdump.c#3 (text+ko) ====

@@ -60,7 +60,6 @@
 __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $");
 
 #include "opt_config.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/conf.h>

==== //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 (text+ko) ====

@@ -26,7 +26,6 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $");

==== //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#3 (text+ko) ====

@@ -35,7 +35,6 @@
  *
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#4 (text+ko) ====

@@ -34,7 +34,6 @@
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $");

==== //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#3 (text+ko) ====

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $");

==== //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#2 (text+ko) ====

@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");

==== //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#2 (text) ====

@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $");

==== //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#3 (text+ko) ====

@@ -23,7 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $");

==== //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#2 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#5 (text+ko) ====

@@ -11,7 +11,6 @@
 __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.80 2008/07/07 20:53:49 bz Exp $");
 
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/types.h>

==== //depot/projects/vimage-commit3/src/sys/kern/kern_mib.c#4 (text+ko) ====

@@ -41,7 +41,6 @@
 #include "opt_compat.h"
 #include "opt_posix.h"
 #include "opt_config.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

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

@@ -29,7 +29,6 @@
 __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $");
 
 #include "opt_device_polling.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/endian.h>

==== //depot/projects/vimage-commit3/src/sys/kern/kern_xxx.c#5 (text+ko) ====

@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.51 2008/07/05 13:10:10 rwatson Exp $");
 
 #include "opt_compat.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#2 (text+ko) ====

@@ -34,7 +34,6 @@
  * ISO/IEC 802.1D-2004, June 9, 2004.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $");

==== //depot/projects/vimage-commit3/src/sys/net/if.c#4 (text+ko) ====

@@ -35,7 +35,6 @@
 #include "opt_inet.h"
 #include "opt_mac.h"
 #include "opt_carp.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/types.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_bridge.c#4 (text+ko) ====

@@ -80,7 +80,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_carp.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/mbuf.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_ef.c#2 (text+ko) ====

@@ -29,7 +29,6 @@
 #include "opt_inet.h"
 #include "opt_ipx.h"
 #include "opt_ef.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_enc.c#2 (text+ko) ====

@@ -27,7 +27,6 @@
  * $FreeBSD$
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_ethersubr.c#3 (text+ko) ====

@@ -38,7 +38,6 @@
 #include "opt_netgraph.h"
 #include "opt_carp.h"
 #include "opt_mbuf_profiling.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_faith.c#3 (text+ko) ====

@@ -41,7 +41,6 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_gif.c#3 (text+ko) ====

@@ -33,7 +33,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_gre.c#5 (text+ko) ====

@@ -51,7 +51,6 @@
 #include "opt_atalk.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_loop.c#5 (text+ko) ====

@@ -38,7 +38,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_mib.c#3 (text+ko) ====

@@ -29,7 +29,6 @@
  * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_spppsubr.c#2 (text+ko) ====

@@ -27,7 +27,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_vimage.h"
 #endif
 
 #ifdef NetBSD1_3

==== //depot/projects/vimage-commit3/src/sys/net/if_stf.c#3 (text+ko) ====

@@ -76,7 +76,6 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_vlan.c#4 (text+ko) ====

@@ -42,7 +42,6 @@
  */
 
 #include "opt_vlan.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#5 (text+ko) ====

@@ -31,7 +31,6 @@
  * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>

==== //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#5 (text+ko) ====

@@ -31,7 +31,6 @@
  * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/net/route.c#4 (text+ko) ====

@@ -38,7 +38,6 @@
 #include "opt_route.h"
 #include "opt_mrouting.h"
 #include "opt_mpath.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/net/rtsock.c#4 (text+ko) ====

@@ -32,7 +32,6 @@
 
 #include "opt_sctp.h"
 #include "opt_mpath.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>

==== //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#3 (text+ko) ====

@@ -32,7 +32,6 @@
  */
 #include "opt_wlan.h"
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vimage-commit3/src/sys/netgraph/atm/ng_atm.c#2 (text+ko) ====

@@ -34,7 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $");
 
-#include "opt_vimage.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#5 (text+ko) ====

@@ -46,7 +46,6 @@
  * This file implements the base netgraph code.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#2 (text+ko) ====

@@ -58,7 +58,6 @@
  * from one port to the other only rarely.
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#3 (text+ko) ====

@@ -28,7 +28,6 @@
  * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#2 (text+ko) ====

@@ -46,7 +46,6 @@
  * ng_ether(4) netgraph node type
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#2 (text+ko) ====

@@ -69,7 +69,6 @@
  * ng_gif(4) netgraph node type
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_iface.c#4 (text+ko) ====

@@ -56,7 +56,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#2 (text+ko) ====

@@ -26,7 +26,6 @@
  * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#2 (text+ko) ====

@@ -26,7 +26,6 @@
  * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#2 (text+ko) ====

@@ -38,7 +38,6 @@
  * Author: Dave Chapeskie <dchapeskie@sandvine.com>
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $");

==== //depot/projects/vimage-commit3/src/sys/netinet/if_ether.c#4 (text+ko) ====

@@ -41,7 +41,6 @@
 #include "opt_inet.h"
 #include "opt_mac.h"
 #include "opt_carp.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/igmp.c#3 (text+ko) ====

@@ -48,7 +48,6 @@
 __FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $");
 
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/in.c#4 (text+ko) ====

@@ -34,7 +34,6 @@
 __FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.104 2008/06/24 13:58:28 gonzo Exp $");
 
 #include "opt_carp.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/in_gif.c#3 (text+ko) ====

@@ -35,7 +35,6 @@
 #include "opt_mrouting.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#3 (text+ko) ====

@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#5 (text+ko) ====

@@ -38,7 +38,6 @@
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808152144.m7FLigdQ064512>