PERFORCE change 147492 for review

Julian Elischer julian at FreeBSD.org
Fri Aug 15 21:32:30 UTC 2008 

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

Change 147492 by julian at julian_trafmon1 on 2008/08/15 21:32:27

	Integrate change 147490.
	remove reference to opt_vimage as per DES

Affected files ...

.. //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#5 edit
.. //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#7 edit
.. //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#5 edit
.. //depot/projects/vimage-devel/src/sys/compat/linprocfs/linprocfs.c#4 edit
.. //depot/projects/vimage-devel/src/sys/compat/linux/linux_ioctl.c#4 edit
.. //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#7 edit
.. //depot/projects/vimage-devel/src/sys/compat/linux/linux_socket.c#4 edit
.. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_sockio.c#3 edit
.. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#5 edit
.. //depot/projects/vimage-devel/src/sys/conf/options#4 integrate
.. //depot/projects/vimage-devel/src/sys/contrib/altq/altq/altq_subr.c#3 edit
.. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 edit
.. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf.c#4 edit
.. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_if.c#3 edit
.. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_ioctl.c#4 edit
.. //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#3 edit
.. //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#3 edit
.. //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#5 edit
.. //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_rrip.c#4 edit
.. //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#6 edit
.. //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#6 edit
.. //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#5 edit
.. //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#5 edit
.. //depot/projects/vimage-devel/src/sys/kern/init_main.c#3 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#5 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#5 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_poll.c#4 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_prot.c#3 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#5 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#4 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_uuid.c#3 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#9 edit
.. //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#7 edit
.. //depot/projects/vimage-devel/src/sys/kern/subr_pcpu.c#3 edit
.. //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#4 edit
.. //depot/projects/vimage-devel/src/sys/kern/tty.c#5 edit
.. //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#4 edit
.. //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#6 edit
.. //depot/projects/vimage-devel/src/sys/kern/uipc_syscalls.c#4 edit
.. //depot/projects/vimage-devel/src/sys/kern/uipc_usrreq.c#5 edit
.. //depot/projects/vimage-devel/src/sys/kern/vfs_export.c#3 edit
.. //depot/projects/vimage-devel/src/sys/kern/vfs_lookup.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/bpf.c#8 edit
.. //depot/projects/vimage-devel/src/sys/net/bridgestp.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if.c#6 edit
.. //depot/projects/vimage-devel/src/sys/net/if_bridge.c#4 edit
.. //depot/projects/vimage-devel/src/sys/net/if_clone.c#4 edit
.. //depot/projects/vimage-devel/src/sys/net/if_ef.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#5 edit
.. //depot/projects/vimage-devel/src/sys/net/if_faith.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_gif.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_gre.c#5 edit
.. //depot/projects/vimage-devel/src/sys/net/if_loop.c#6 edit
.. //depot/projects/vimage-devel/src/sys/net/if_mib.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_ppp.c#4 edit
.. //depot/projects/vimage-devel/src/sys/net/if_spppsubr.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_stf.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_tap.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_tun.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net/if_vlan.c#4 edit
.. //depot/projects/vimage-devel/src/sys/net/netisr.c#6 edit
.. //depot/projects/vimage-devel/src/sys/net/raw_cb.c#5 edit
.. //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#5 edit
.. //depot/projects/vimage-devel/src/sys/net/route.c#6 edit
.. //depot/projects/vimage-devel/src/sys/net/rtsock.c#4 edit
.. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#6 edit
.. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#3 edit
.. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#6 edit
.. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ioctl.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#8 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_gif.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet/if_ether.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/igmp.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/in.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/in_gif.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/in_mcast.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#12 edit
.. //depot/projects/vimage-devel/src/sys/netinet/in_proto.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_carp.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_fastfwd.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#7 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_nat.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_icmp.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_ipsec.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_options.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/ip_output.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#7 edit
.. //depot/projects/vimage-devel/src/sys/netinet/sctp_output.c#6 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_hostcache.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_output.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_reass.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_sack.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#9 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_timer.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_usrreq.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#8 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/dest6.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#6 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_gif.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_pcb.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_src.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_forward.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_ipsec.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_mroute.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_output.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/mld6.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/nd6.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/nd6_nbr.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/raw_ip6.c#6 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/route6.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#6 edit
.. //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#6 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/ipsec.c#7 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_input.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_mbuf.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_output.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/key.c#5 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#6 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/xform_ah.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#4 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/xform_ipcomp.c#3 edit
.. //depot/projects/vimage-devel/src/sys/netipsec/xform_ipip.c#3 edit
.. //depot/projects/vimage-devel/src/sys/nfsclient/bootp_subr.c#5 edit
.. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#3 edit
.. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_socket.c#4 edit
.. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vfsops.c#8 edit
.. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vnops.c#4 edit
.. //depot/projects/vimage-devel/src/sys/nlm/nlm_advlock.c#5 edit
.. //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#6 edit
.. //depot/projects/vimage-devel/src/sys/rpc/rpc_generic.c#3 edit
.. //depot/projects/vimage-devel/src/sys/rpc/svc_dg.c#3 edit
.. //depot/projects/vimage-devel/src/sys/rpc/svc_generic.c#3 edit
.. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#5 edit
.. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#5 edit
.. //depot/projects/vimage-devel/src/sys/vm/vm_meter.c#4 edit

Differences ...

==== //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#5 (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-devel/src/sys/amd64/amd64/minidump_machdep.c#7 (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-devel/src/sys/arm/arm/dump_machdep.c#5 (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-devel/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ====

@@ -43,7 +43,6 @@
 __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>

==== //depot/projects/vimage-devel/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-devel/src/sys/compat/linux/linux_misc.c#7 (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-devel/src/sys/compat/linux/linux_socket.c#4 (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-devel/src/sys/compat/svr4/svr4_sockio.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_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");

==== //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#5 (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-devel/src/sys/conf/options#4 (text+ko) ====

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

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

@@ -32,7 +32,6 @@
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #include "opt_inet.h"
-#include "opt_vimage.h"
 #endif
 #endif /* __FreeBSD__ || __NetBSD__ */
 

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

@@ -26,7 +26,6 @@
 #endif
 #include <sys/param.h>
 #if __FreeBSD_version > 800000
-# include "opt_vimage.h"
 #endif
 #if defined(__FreeBSD__) && !defined(__FreeBSD_version)
 # if defined(IPFILTER_LKM)

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

@@ -39,7 +39,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.55 2008/08/04 14:42:09 mlaier Exp $");

==== //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_if.c#3 (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-devel/src/sys/contrib/pf/net/pf_ioctl.c#4 (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-devel/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-devel/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-devel/src/sys/dev/syscons/daemon/daemon_saver.c#5 (text+ko) ====

@@ -28,7 +28,6 @@
  * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-devel/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-devel/src/sys/i386/i386/dump_machdep.c#6 (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-devel/src/sys/i386/i386/minidump_machdep.c#6 (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-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#5 (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-devel/src/sys/ia64/ia64/dump_machdep.c#5 (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-devel/src/sys/kern/init_main.c#3 (text+ko) ====

@@ -47,7 +47,6 @@
 #include "opt_ddb.h"
 #include "opt_init_path.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

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

@@ -42,7 +42,6 @@
 #include "opt_hwpmc_hooks.h"
 #include "opt_ntp.h"
 #include "opt_watchdog.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#6 (text+ko) ====

@@ -42,7 +42,6 @@
 #include "opt_ktrace.h"
 #include "opt_mac.h"
 #include "opt_sched.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#6 (text+ko) ====

@@ -40,7 +40,6 @@
 #include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#6 (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-devel/src/sys/kern/kern_linker.c#5 (text+ko) ====

@@ -30,7 +30,6 @@
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#6 (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-devel/src/sys/kern/kern_poll.c#4 (text+ko) ====

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

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

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

==== //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#6 (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>

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

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

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

@@ -27,7 +27,6 @@
  */
 
 #include "opt_witness.h"
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.276 2008/08/13 18:24:22 attilio Exp $");

==== //depot/projects/vimage-devel/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-devel/src/sys/kern/kern_vimage.c#6 (text+ko) ====

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

==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#9 (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-devel/src/sys/kern/sched_4bsd.c#7 (text+ko) ====

@@ -38,7 +38,6 @@
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
 #include "opt_kdtrace.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -46,7 +46,6 @@
 __FBSDID("$FreeBSD: src/sys/kern/subr_pcpu.c,v 1.10 2007/11/14 06:21:23 julian Exp $");
 
 #include "opt_ddb.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.76 2008/05/09 23:02:55 julian Exp $");
 
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -75,7 +75,6 @@
 
 #include "opt_compat.h"
 #include "opt_tty.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -29,7 +29,6 @@
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
  */
 
-#include "opt_vimage.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.52 2008/03/16 10:58:05 rwatson Exp $");

==== //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#6 (text+ko) ====

@@ -101,7 +101,6 @@
 #include "opt_mac.h"
 #include "opt_zero.h"
 #include "opt_compat.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -39,7 +39,6 @@
 #include "opt_compat.h"
 #include "opt_ktrace.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -60,7 +60,6 @@
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>

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

@@ -37,7 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.343 2008/06/09 10:31:38 kib Exp $");
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/dirent.h>

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

@@ -40,7 +40,6 @@
 #include "opt_ktrace.h"
 #include "opt_mac.h"
 #include "opt_vfs.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-devel/src/sys/net/bpf.c#8 (text+ko) ====

@@ -40,7 +40,6 @@
 #include "opt_bpf.h"
 #include "opt_mac.h"
 #include "opt_netgraph.h"
-#include "opt_vimage.h"
 
 #include <sys/types.h>
 #include <sys/param.h>

==== //depot/projects/vimage-devel/src/sys/net/bridgestp.c#3 (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-devel/src/sys/net/if.c#6 (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-devel/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-devel/src/sys/net/if_clone.c#4 (text+ko) ====

@@ -30,7 +30,6 @@
  * $FreeBSD: src/sys/net/if_clone.c,v 1.11 2006/07/09 06:04:00 sam Exp $
  */
 
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/malloc.h>

==== //depot/projects/vimage-devel/src/sys/net/if_ef.c#3 (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-devel/src/sys/net/if_ethersubr.c#5 (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-devel/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-devel/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-devel/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-devel/src/sys/net/if_loop.c#6 (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-devel/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-devel/src/sys/net/if_ppp.c#4 (text+ko) ====

@@ -80,7 +80,6 @@
 #include "opt_ipx.h"
 #include "opt_mac.h"
 #include "opt_ppp.h"
-#include "opt_vimage.h"
 
 #ifdef INET
 #define VJC

==== //depot/projects/vimage-devel/src/sys/net/if_spppsubr.c#3 (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-devel/src/sys/net/if_stf.c#3 (text+ko) ====

@@ -77,7 +77,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-devel/src/sys/net/if_tap.c#3 (text+ko) ====

@@ -37,7 +37,6 @@
 
 #include "opt_compat.h"
 #include "opt_inet.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/conf.h>

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

@@ -21,7 +21,6 @@
 #include "opt_inet6.h"
 #include "opt_ipx.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/priv.h>

==== //depot/projects/vimage-devel/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-devel/src/sys/net/netisr.c#6 (text+ko) ====

@@ -28,7 +28,6 @@
  */
 
 #include "opt_device_polling.h"
-#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>

==== //depot/projects/vimage-devel/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-devel/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-devel/src/sys/net/route.c#6 (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-devel/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-devel/src/sys/net80211/ieee80211.c#6 (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-devel/src/sys/net80211/ieee80211_ddb.c#3 (text+ko) ====

@@ -28,7 +28,6 @@
 
 #include "opt_ddb.h"
 #include "opt_wlan.h"
-#include "opt_vimage.h"
 
 #ifdef DDB
 

==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#6 (text+ko) ====

@@ -26,7 +26,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.20 2008/08/02 18:00:33 sam Exp $");
 
-#include "opt_vimage.h"
 
 /*
  * IEEE 802.11 support (FreeBSD-specific code)

==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ioctl.c#4 (text+ko) ====

@@ -34,7 +34,6 @@
 #include "opt_inet.h"
 #include "opt_ipx.h"
 #include "opt_wlan.h"
-#include "opt_vimage.h"
 
 #include <sys/endian.h>
 #include <sys/param.h>

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

@@ -31,7 +31,6 @@

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

More information about the p4-projects mailing list