PERFORCE change 143754 for review
Julian Elischer
julian at FreeBSD.org
Thu Jun 19 08:10:10 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143754
Change 143754 by julian at julian_trafmon1 on 2008/06/19 08:09:15
slight changes from vimage branch
Affected files ...
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files#5 integrate
.. //depot/projects/vimage-commit/src/sys/conf/options#3 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_mtag.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ruleset.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/ddb/db_command.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#1 branch
.. //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/tty.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/modules/Makefile#4 integrate
.. //depot/projects/vimage-commit/src/sys/modules/netgraph/Makefile#2 integrate
.. //depot/projects/vimage-commit/src/sys/modules/netgraph/pipe/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/modules/netgraph/wormhole/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/net/bpf.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/bpf.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/if.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_clone.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_faith.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_gif.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_gif.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_gre.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_loop.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_mib.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_ppp.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_stf.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_tap.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_tun.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_var.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_vlan.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/netisr.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/raw_cb.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/raw_cb.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/route.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/vnet.h#1 branch
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_hub.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.c#1 branch
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.h#1 branch
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_wormhole.c#1 branch
.. //depot/projects/vimage-commit/src/sys/netgraph/vnetgraph.h#1 branch
.. //depot/projects/vimage-commit/src/sys/netinet/icmp_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_gif.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip6.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ipprotosw.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.h#1 branch
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#1 branch
.. //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6protosw.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/route6.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/vinet6.h#1 branch
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key_debug.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/keysock.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#1 branch
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/auth_unix.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/domain.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/kernel.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/mbuf.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/proc.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/protosw.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/resource.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/sched.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/socketvar.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/sockio.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/ucred.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/vimage-commit/src/usr.sbin/vimage/Makefile#1 branch
.. //depot/projects/vimage-commit/src/usr.sbin/vimage/vimage.8#1 branch
.. //depot/projects/vimage-commit/src/usr.sbin/vimage/vimage.c#1 branch
Differences ...
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#4 (text+ko) ====
@@ -112,7 +112,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#4 (text) ====
@@ -88,7 +88,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#4 (text+ko) ====
@@ -110,7 +110,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ====
@@ -1002,7 +1002,7 @@
static int
linprocfs_donetdev(PFS_FILL_ARGS)
{
- INIT_VNET_NET(curvnet);
+ INIT_VNET_NET(TD_TO_VNET(curthread));
char ifname[16]; /* XXX LINUX_IFNAMSIZ */
struct ifnet *ifp;
==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#5 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/conf/files#5 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/conf/options#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_mtag.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_norm.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_osfp.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ruleset.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/contrib/pf/netinet/in4_cksum.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/ddb/db_command.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 (text+ko) ====
@@ -140,10 +140,6 @@
#define TCP_CLOSE 2
#define TCP_DROP 3
-extern int tcp_do_autorcvbuf;
-extern int tcp_do_autosndbuf;
-extern int tcp_autorcvbuf_max;
-extern int tcp_autosndbuf_max;
static void t3_send_reset(struct toepcb *toep);
static void send_abort_rpl(struct mbuf *m, struct toedev *tdev, int rst_status);
==== //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#4 (text+ko) ====
@@ -112,7 +112,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#4 (text) ====
@@ -86,7 +86,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(curthread));
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#4 (text+ko) ====
@@ -67,7 +67,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/kern/init_main.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_switch.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_timeout.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#3 (text+ko) ====
@@ -273,21 +273,21 @@
struct setdomainname_args *uap;
{
INIT_VPROCG(TD_TO_VPROCG(td));
- int error, domainnamelen;
+ int error, domainnamelen;
error = priv_check(td, PRIV_SETDOMAINNAME);
printf("setdomainname error=%d\n", error);
if (error)
return (error);
mtx_lock(&Giant);
- if ((u_int)uap->len > sizeof (V_domainname) - 1) {
+ if ((u_int)uap->len > sizeof (V_domainname) - 1) {
error = EINVAL;
goto done2;
}
- domainnamelen = uap->len;
- error = copyin(uap->domainname, V_domainname, uap->len);
- V_domainname[domainnamelen] = 0;
+ domainnamelen = uap->len;
+ error = copyin(uap->domainname, V_domainname, uap->len);
+ V_domainname[domainnamelen] = 0;
done2:
mtx_unlock(&Giant);
- return (error);
+ return (error);
}
==== //depot/projects/vimage-commit/src/sys/kern/sched_4bsd.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/tty.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/modules/Makefile#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/modules/netgraph/Makefile#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/bpf.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/bpf.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_clone.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_faith.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_gif.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_gif.h#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_gre.c#2 (text+ko) ====
@@ -51,6 +51,7 @@
#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/param.h>
#include <sys/kernel.h>
@@ -64,6 +65,7 @@
#include <sys/sockio.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
+#include <sys/vimage.h>
#include <net/ethernet.h>
#include <net/if.h>
@@ -240,12 +242,15 @@
gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
struct rtentry *rt)
{
+#ifdef INET6
+ INIT_VNET_INET(ifp->if_vnet);
+#endif
int error = 0;
struct gre_softc *sc = ifp->if_softc;
struct greip *gh;
struct ip *ip;
- u_short ip_id = 0;
- uint8_t ip_tos = 0;
+ u_short gre_ip_id = 0;
+ uint8_t gre_ip_tos = 0;
u_int16_t etype = 0;
struct mobile_h mob_h;
u_int32_t af;
@@ -362,13 +367,13 @@
switch (dst->sa_family) {
case AF_INET:
ip = mtod(m, struct ip *);
- ip_tos = ip->ip_tos;
- ip_id = ip->ip_id;
+ gre_ip_tos = ip->ip_tos;
+ gre_ip_id = ip->ip_id;
etype = ETHERTYPE_IP;
break;
#ifdef INET6
case AF_INET6:
- ip_id = ip_newid();
+ gre_ip_id = ip_newid();
etype = ETHERTYPE_IPV6;
break;
#endif
@@ -413,8 +418,8 @@
((struct ip*)gh)->ip_v = IPPROTO_IPV4;
((struct ip*)gh)->ip_hl = (sizeof(struct ip)) >> 2;
((struct ip*)gh)->ip_ttl = GRE_TTL;
- ((struct ip*)gh)->ip_tos = ip_tos;
- ((struct ip*)gh)->ip_id = ip_id;
+ ((struct ip*)gh)->ip_tos = gre_ip_tos;
+ ((struct ip*)gh)->ip_id = gre_ip_id;
gh->gi_len = m->m_pkthdr.len;
}
==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_mib.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_ppp.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_stf.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_tap.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_tun.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_var.h#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/if_vlan.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/netisr.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/raw_cb.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/raw_cb.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/route.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net/rtsock.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netgraph/ng_bridge.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netgraph/ng_hub.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/icmp_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/igmp.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_gif.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/in_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip6.h#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#2 (text+ko) ====
@@ -31,6 +31,7 @@
#include "opt_bpf.h"
#include "opt_inet.h"
#include "opt_inet6.h"
+#include "opt_vimage.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -49,6 +50,7 @@
#include <sys/signalvar.h>
#include <sys/filio.h>
#include <sys/sockio.h>
+#include <sys/vimage.h>
#include <sys/socket.h>
#include <sys/vnode.h>
@@ -913,6 +915,7 @@
ch.carp_cksum = 0;
#ifdef INET
+ INIT_VNET_INET(curvnet);
if (sc->sc_ia) {
struct ip *ip;
@@ -1451,6 +1454,7 @@
static int
carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin)
{
+ INIT_VNET_INET(curvnet);
struct ifnet *ifp;
struct carp_if *cif;
struct in_ifaddr *ia, *ia_if;
@@ -1470,7 +1474,7 @@
/* we have to do it by hands to check we won't match on us */
ia_if = NULL; own = 0;
- TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) {
+ TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) {
/* and, yeah, we need a multicast-capable iface too */
if (ia->ia_ifp != SC2IFP(sc) &&
(ia->ia_ifp->if_flags & IFF_MULTICAST) &&
@@ -1612,6 +1616,7 @@
static int
carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6)
{
+ INIT_VNET_INET6(curvnet);
struct ifnet *ifp;
struct carp_if *cif;
struct in6_ifaddr *ia, *ia_if;
@@ -1631,7 +1636,7 @@
/* we have to do it by hands to check we won't match on us */
ia_if = NULL; own = 0;
- for (ia = in6_ifaddr; ia; ia = ia->ia_next) {
+ for (ia = V_in6_ifaddr; ia; ia = ia->ia_next) {
int i;
for (i = 0; i < 4; i++) {
==== //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/ipprotosw.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/in6_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_var.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/ip6protosw.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/route6.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/key.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/key.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/key_debug.h#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/keysock.h#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#4 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#3 (text+ko) ====
@@ -46,6 +46,7 @@
#include <sys/socket.h>
#include <sys/vimage.h>
+#include <sys/socket.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/rpc/auth_unix.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#3 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/rpc/clnt_dg.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/rpc/rpc_generic.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/rpc/svc_generic.c#2 (text+ko) ====
==== //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#4 (text+ko) ====
@@ -63,7 +63,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */
bzero(kdh, sizeof(*kdh));
strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic));
==== //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#4 (text+ko) ====
@@ -64,7 +64,6 @@
mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen,
uint32_t blksz)
{
- INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list