PERFORCE change 166789 for review
John Baldwin
jhb at FreeBSD.org
Thu Jul 30 12:53:14 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166789
Change 166789 by jhb at jhb_jhbbsd on 2009/07/30 12:53:00
IFC @166786
Affected files ...
.. //depot/projects/multipass/sys/amd64/amd64/initcpu.c#3 integrate
.. //depot/projects/multipass/sys/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/multipass/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/multipass/sys/amd64/include/cpufunc.h#3 integrate
.. //depot/projects/multipass/sys/amd64/include/md_var.h#3 integrate
.. //depot/projects/multipass/sys/amd64/pci/pci_bus.c#4 integrate
.. //depot/projects/multipass/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/multipass/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/multipass/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/multipass/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/multipass/sys/arm/conf/AVILA#5 integrate
.. //depot/projects/multipass/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/multipass/sys/boot/forth/loader.conf#6 integrate
.. //depot/projects/multipass/sys/bsm/audit.h#4 integrate
.. //depot/projects/multipass/sys/bsm/audit_kevents.h#5 integrate
.. //depot/projects/multipass/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/multipass/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_xpt.c#2 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/sig.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/multipass/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#3 integrate
.. //depot/projects/multipass/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_misc.c#6 integrate
.. //depot/projects/multipass/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_mib.c#4 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_socket.c#5 integrate
.. //depot/projects/multipass/sys/compat/svr4/svr4_sockio.c#5 integrate
.. //depot/projects/multipass/sys/conf/NOTES#8 integrate
.. //depot/projects/multipass/sys/conf/files#8 integrate
.. //depot/projects/multipass/sys/conf/newvers.sh#4 integrate
.. //depot/projects/multipass/sys/conf/options#8 integrate
.. //depot/projects/multipass/sys/contrib/altq/altq/altq_subr.c#6 integrate
.. //depot/projects/multipass/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_ioctl.c#6 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_subr.c#3 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/multipass/sys/contrib/rdma/rdma_cma.c#4 integrate
.. //depot/projects/multipass/sys/ddb/db_expr.c#3 integrate
.. //depot/projects/multipass/sys/ddb/db_sym.c#2 integrate
.. //depot/projects/multipass/sys/ddb/db_variables.c#2 integrate
.. //depot/projects/multipass/sys/ddb/db_variables.h#2 integrate
.. //depot/projects/multipass/sys/ddb/ddb.h#2 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-marvell.c#4 integrate
.. //depot/projects/multipass/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#3 integrate
.. //depot/projects/multipass/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/multipass/sys/dev/ath/if_athvar.h#5 integrate
.. //depot/projects/multipass/sys/dev/ciss/ciss.c#6 integrate
.. //depot/projects/multipass/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/multipass/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate
.. //depot/projects/multipass/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/multipass/sys/dev/e1000/e1000_ich8lan.c#4 integrate
.. //depot/projects/multipass/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/multipass/sys/dev/e1000/if_igb.c#6 integrate
.. //depot/projects/multipass/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/multipass/sys/dev/ixgbe/ixgbe.c#4 integrate
.. //depot/projects/multipass/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/multipass/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/multipass/sys/dev/re/if_re.c#6 integrate
.. //depot/projects/multipass/sys/dev/siis/siis.c#1 branch
.. //depot/projects/multipass/sys/dev/siis/siis.h#1 branch
.. //depot/projects/multipass/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/multipass/sys/dev/sound/pcm/feeder_rate.c#5 integrate
.. //depot/projects/multipass/sys/dev/sound/usb/uaudio.c#6 integrate
.. //depot/projects/multipass/sys/dev/uart/uart_cpu_powerpc.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/at91dci.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/atmegadci.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/avr32dci.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci_pci.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ohci.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ohci_pci.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/uhci.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/uhci_pci.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/usb_controller.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/uss820dci.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/input/ums.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/u3g.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/ulpt.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_compat_linux.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_compat_linux.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_controller.h#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_dev.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_dev.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_handle_request.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_hid.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_hub.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_parse.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_request.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_transfer.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usbdi.h#5 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_uath.c#5 integrate
.. //depot/projects/multipass/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clbio.c#4 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clstate.c#6 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clvnops.c#6 integrate
.. //depot/projects/multipass/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate
.. //depot/projects/multipass/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/initcpu.c#3 integrate
.. //depot/projects/multipass/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/multipass/sys/i386/i386/pmap.c#8 integrate
.. //depot/projects/multipass/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/multipass/sys/i386/include/cpufunc.h#4 integrate
.. //depot/projects/multipass/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/multipass/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/multipass/sys/i386/include/sf_buf.h#2 integrate
.. //depot/projects/multipass/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/multipass/sys/i386/xen/pmap.c#6 integrate
.. //depot/projects/multipass/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/multipass/sys/kern/init_main.c#5 integrate
.. //depot/projects/multipass/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_exit.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_fork.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_jail.c#8 integrate
.. //depot/projects/multipass/sys/kern/kern_linker.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_poll.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/multipass/sys/kern/kern_prot.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/multipass/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/multipass/sys/kern/kern_sysctl.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/multipass/sys/kern/kern_uuid.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_vimage.c#5 integrate
.. //depot/projects/multipass/sys/kern/link_elf.c#5 integrate
.. //depot/projects/multipass/sys/kern/link_elf_obj.c#5 integrate
.. //depot/projects/multipass/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/multipass/sys/kern/subr_trap.c#4 integrate
.. //depot/projects/multipass/sys/kern/uipc_domain.c#4 integrate
.. //depot/projects/multipass/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/multipass/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/multipass/sys/kern/vfs_lookup.c#6 integrate
.. //depot/projects/multipass/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/multipass/sys/kern/vfs_syscalls.c#8 integrate
.. //depot/projects/multipass/sys/mips/mips/pmap.c#6 integrate
.. //depot/projects/multipass/sys/modules/Makefile#8 integrate
.. //depot/projects/multipass/sys/modules/if_epair/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/siis/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/wlan/Makefile#7 integrate
.. //depot/projects/multipass/sys/net/bridgestp.c#6 integrate
.. //depot/projects/multipass/sys/net/flowtable.c#4 integrate
.. //depot/projects/multipass/sys/net/flowtable.h#4 integrate
.. //depot/projects/multipass/sys/net/if.c#8 integrate
.. //depot/projects/multipass/sys/net/if_bridge.c#7 integrate
.. //depot/projects/multipass/sys/net/if_clone.c#4 integrate
.. //depot/projects/multipass/sys/net/if_clone.h#2 integrate
.. //depot/projects/multipass/sys/net/if_ef.c#6 integrate
.. //depot/projects/multipass/sys/net/if_enc.c#4 integrate
.. //depot/projects/multipass/sys/net/if_epair.c#2 integrate
.. //depot/projects/multipass/sys/net/if_ethersubr.c#7 integrate
.. //depot/projects/multipass/sys/net/if_faith.c#4 integrate
.. //depot/projects/multipass/sys/net/if_gif.c#6 integrate
.. //depot/projects/multipass/sys/net/if_gif.h#6 integrate
.. //depot/projects/multipass/sys/net/if_gre.c#5 integrate
.. //depot/projects/multipass/sys/net/if_loop.c#6 integrate
.. //depot/projects/multipass/sys/net/if_mib.c#6 integrate
.. //depot/projects/multipass/sys/net/if_spppsubr.c#6 integrate
.. //depot/projects/multipass/sys/net/if_stf.c#7 integrate
.. //depot/projects/multipass/sys/net/if_var.h#8 integrate
.. //depot/projects/multipass/sys/net/if_vlan.c#6 integrate
.. //depot/projects/multipass/sys/net/netisr.h#6 integrate
.. //depot/projects/multipass/sys/net/raw_cb.c#5 integrate
.. //depot/projects/multipass/sys/net/raw_cb.h#3 integrate
.. //depot/projects/multipass/sys/net/raw_usrreq.c#5 integrate
.. //depot/projects/multipass/sys/net/route.c#7 integrate
.. //depot/projects/multipass/sys/net/rtsock.c#7 integrate
.. //depot/projects/multipass/sys/net/vnet.c#1 branch
.. //depot/projects/multipass/sys/net/vnet.h#7 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211.c#8 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_crypto.c#3 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_crypto.h#4 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_ddb.c#8 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_freebsd.c#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_hwmp.c#2 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_input.h#3 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_ioctl.h#6 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_mesh.h#2 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_output.c#6 integrate
.. //depot/projects/multipass/sys/netgraph/atm/ng_atm.c#5 integrate
.. //depot/projects/multipass/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/multipass/sys/netgraph/netgraph.h#5 integrate
.. //depot/projects/multipass/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/multipass/sys/netgraph/ng_eiface.c#6 integrate
.. //depot/projects/multipass/sys/netgraph/ng_ether.c#7 integrate
.. //depot/projects/multipass/sys/netgraph/ng_gif.c#4 integrate
.. //depot/projects/multipass/sys/netgraph/ng_iface.c#6 integrate
.. //depot/projects/multipass/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/multipass/sys/netinet/icmp6.h#4 integrate
.. //depot/projects/multipass/sys/netinet/icmp_var.h#3 integrate
.. //depot/projects/multipass/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/multipass/sys/netinet/igmp.c#7 integrate
.. //depot/projects/multipass/sys/netinet/in.c#8 integrate
.. //depot/projects/multipass/sys/netinet/in_gif.c#5 integrate
.. //depot/projects/multipass/sys/netinet/in_mcast.c#7 integrate
.. //depot/projects/multipass/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/multipass/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/multipass/sys/netinet/in_proto.c#6 integrate
.. //depot/projects/multipass/sys/netinet/in_rmx.c#7 integrate
.. //depot/projects/multipass/sys/netinet/in_var.h#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_carp.c#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_divert.c#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/multipass/sys/netinet/ip_fw.h#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_icmp.c#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_ipsec.c#5 integrate
.. //depot/projects/multipass/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/multipass/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_var.h#5 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw2.c#5 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_nat.c#3 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate
.. //depot/projects/multipass/sys/netinet/raw_ip.c#8 integrate
.. //depot/projects/multipass/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/multipass/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/multipass/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_uio.h#5 integrate
.. //depot/projects/multipass/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/multipass/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/multipass/sys/netinet/tcp_hostcache.c#6 integrate
.. //depot/projects/multipass/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_offload.c#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_output.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_reass.c#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_sack.c#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/multipass/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/multipass/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/multipass/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/multipass/sys/netinet/udp_var.h#5 integrate
.. //depot/projects/multipass/sys/netinet/vinet.h#6 delete
.. //depot/projects/multipass/sys/netinet6/dest6.c#3 integrate
.. //depot/projects/multipass/sys/netinet6/frag6.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/icmp6.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/in6.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/in6_gif.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/in6_ifattach.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/in6_mcast.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/in6_proto.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/in6_rmx.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/in6_src.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6_var.h#6 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_forward.c#3 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_input.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_ipsec.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_mroute.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_output.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_var.h#6 integrate
.. //depot/projects/multipass/sys/netinet6/mld6.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/nd6.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/nd6.h#5 integrate
.. //depot/projects/multipass/sys/netinet6/nd6_nbr.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/nd6_rtr.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/raw_ip6.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/raw_ip6.h#3 integrate
.. //depot/projects/multipass/sys/netinet6/route6.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/scope6.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/tcp6_var.h#3 integrate
.. //depot/projects/multipass/sys/netinet6/udp6_usrreq.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/vinet6.h#6 delete
.. //depot/projects/multipass/sys/netipsec/ah_var.h#2 integrate
.. //depot/projects/multipass/sys/netipsec/esp_var.h#2 integrate
.. //depot/projects/multipass/sys/netipsec/ipcomp_var.h#2 integrate
.. //depot/projects/multipass/sys/netipsec/ipip_var.h#3 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec.c#6 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec.h#4 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec6.h#4 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec_input.c#5 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec_mbuf.c#3 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec_output.c#4 integrate
.. //depot/projects/multipass/sys/netipsec/key.c#7 integrate
.. //depot/projects/multipass/sys/netipsec/key_debug.c#3 integrate
.. //depot/projects/multipass/sys/netipsec/key_debug.h#2 integrate
.. //depot/projects/multipass/sys/netipsec/keysock.c#5 integrate
.. //depot/projects/multipass/sys/netipsec/keysock.h#3 integrate
.. //depot/projects/multipass/sys/netipsec/vipsec.h#5 delete
.. //depot/projects/multipass/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/multipass/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/multipass/sys/netipsec/xform_ipcomp.c#3 integrate
.. //depot/projects/multipass/sys/netipsec/xform_ipip.c#5 integrate
.. //depot/projects/multipass/sys/netipsec/xform_tcp.c#4 integrate
.. //depot/projects/multipass/sys/nfsclient/bootp_subr.c#7 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_bio.c#7 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_diskless.c#7 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/multipass/sys/nfsclient/nfsmount.h#4 integrate
.. //depot/projects/multipass/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/multipass/sys/powerpc/booke/pmap.c#6 integrate
.. //depot/projects/multipass/sys/powerpc/mpc85xx/lbc.h#3 integrate
.. //depot/projects/multipass/sys/rpc/clnt_rc.c#5 integrate
.. //depot/projects/multipass/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/multipass/sys/security/audit/audit.c#5 integrate
.. //depot/projects/multipass/sys/security/audit/audit.h#4 integrate
.. //depot/projects/multipass/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/multipass/sys/security/audit/audit_bsm.c#5 integrate
.. //depot/projects/multipass/sys/security/audit/audit_bsm_errno.c#2 integrate
.. //depot/projects/multipass/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/multipass/sys/security/audit/audit_bsm_token.c#4 integrate
.. //depot/projects/multipass/sys/security/audit/audit_private.h#5 integrate
.. //depot/projects/multipass/sys/sparc64/include/param.h#4 integrate
.. //depot/projects/multipass/sys/sparc64/sparc64/pmap.c#5 integrate
.. //depot/projects/multipass/sys/sun4v/sun4v/pmap.c#4 integrate
.. //depot/projects/multipass/sys/sys/domain.h#3 integrate
.. //depot/projects/multipass/sys/sys/jail.h#6 integrate
.. //depot/projects/multipass/sys/sys/kernel.h#5 integrate
.. //depot/projects/multipass/sys/sys/param.h#7 integrate
.. //depot/projects/multipass/sys/sys/pcpu.h#5 integrate
.. //depot/projects/multipass/sys/sys/priv.h#7 integrate
.. //depot/projects/multipass/sys/sys/proc.h#6 integrate
.. //depot/projects/multipass/sys/sys/signalvar.h#2 integrate
.. //depot/projects/multipass/sys/sys/sleepqueue.h#2 integrate
.. //depot/projects/multipass/sys/sys/sockio.h#4 integrate
.. //depot/projects/multipass/sys/sys/sysctl.h#6 integrate
.. //depot/projects/multipass/sys/sys/ucred.h#5 integrate
.. //depot/projects/multipass/sys/sys/user.h#5 integrate
.. //depot/projects/multipass/sys/sys/vimage.h#7 integrate
.. //depot/projects/multipass/sys/vm/device_pager.c#4 integrate
.. //depot/projects/multipass/sys/vm/sg_pager.c#1 branch
.. //depot/projects/multipass/sys/vm/vm.h#4 integrate
.. //depot/projects/multipass/sys/vm/vm_fault.c#6 integrate
.. //depot/projects/multipass/sys/vm/vm_map.c#7 integrate
.. //depot/projects/multipass/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/multipass/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/multipass/sys/vm/vm_object.c#7 integrate
.. //depot/projects/multipass/sys/vm/vm_object.h#5 integrate
.. //depot/projects/multipass/sys/vm/vm_page.c#7 integrate
.. //depot/projects/multipass/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/multipass/sys/vm/vm_pager.c#4 integrate
.. //depot/projects/multipass/sys/vm/vm_pager.h#4 integrate
.. //depot/projects/multipass/sys/xen/evtchn/evtchn.c#4 integrate
Differences ...
==== //depot/projects/multipass/sys/amd64/amd64/initcpu.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.53 2009/01/12 19:17:35 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $");
#include "opt_cpu.h"
@@ -65,6 +65,7 @@
u_int cpu_vendor_id; /* CPU vendor ID */
u_int cpu_fxsr; /* SSE enabled */
u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */
+u_int cpu_clflush_line_size = 32;
SYSCTL_UINT(_hw, OID_AUTO, via_feature_rng, CTLFLAG_RD,
&via_feature_rng, 0, "VIA C3/C7 RNG feature available in CPU");
@@ -156,4 +157,12 @@
AMD64_CPU_FAMILY(cpu_id) == 0x6 &&
AMD64_CPU_MODEL(cpu_id) >= 0xf)
init_via();
+
+ /*
+ * CPUID with %eax = 1, %ebx returns
+ * Bits 15-8: CLFLUSH line size
+ * (Value * 8 = cache line size in bytes)
+ */
+ if ((cpu_feature & CPUID_CLFSH) != 0)
+ cpu_clflush_line_size = ((cpu_procinfo >> 8) & 0xff) * 8;
}
==== //depot/projects/multipass/sys/amd64/amd64/machdep.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.705 2009/07/09 09:34:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.706 2009/07/27 13:51:55 rpaulo Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -213,7 +213,10 @@
*/
sysenv = getenv("smbios.system.product");
if (sysenv != NULL) {
- if (strncmp(sysenv, "MacBook", 7) == 0) {
+ if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+ strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+ strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+ strncmp(sysenv, "Macmini1,1", 10) == 0) {
if (bootverbose)
printf("Disabling LEGACY_USB_EN bit on "
"Intel ICH.\n");
==== //depot/projects/multipass/sys/amd64/amd64/pmap.c#8 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.663 2009/07/12 23:31:20 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.667 2009/07/24 13:50:29 jhb Exp $");
/*
* Manages physical address maps.
@@ -231,6 +231,7 @@
vm_page_t m, vm_prot_t prot, vm_page_t mpte);
static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte);
static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte);
+static void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva);
static boolean_t pmap_is_modified_pvh(struct md_page *pvh);
static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode);
static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va);
@@ -752,21 +753,6 @@
/* The PAT bit is different for PTE's and PDE's. */
pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT;
- /* If we don't support PAT, map extended modes to older ones. */
- if (!(cpu_feature & CPUID_PAT)) {
- switch (mode) {
- case PAT_UNCACHEABLE:
- case PAT_WRITE_THROUGH:
- case PAT_WRITE_BACK:
- break;
- case PAT_UNCACHED:
- case PAT_WRITE_COMBINING:
- case PAT_WRITE_PROTECTED:
- mode = PAT_UNCACHEABLE;
- break;
- }
- }
-
/* Map the caching mode to a PAT index. */
switch (mode) {
case PAT_UNCACHEABLE:
@@ -936,6 +922,40 @@
}
#endif /* !SMP */
+static void
+pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva)
+{
+
+ KASSERT((sva & PAGE_MASK) == 0,
+ ("pmap_invalidate_cache_range: sva not page-aligned"));
+ KASSERT((eva & PAGE_MASK) == 0,
+ ("pmap_invalidate_cache_range: eva not page-aligned"));
+
+ if (cpu_feature & CPUID_SS)
+ ; /* If "Self Snoop" is supported, do nothing. */
+ else if (cpu_feature & CPUID_CLFSH) {
+
+ /*
+ * Otherwise, do per-cache line flush. Use the mfence
+ * instruction to insure that previous stores are
+ * included in the write-back. The processor
+ * propagates flush to other processors in the cache
+ * coherence domain.
+ */
+ mfence();
+ for (; eva < sva; eva += cpu_clflush_line_size)
+ clflush(eva);
+ mfence();
+ } else {
+
+ /*
+ * No targeted cache flush methods are supported by CPU,
+ * globally invalidate cache as a last resort.
+ */
+ pmap_invalidate_cache();
+ }
+}
+
/*
* Are we current address space or kernel?
*/
@@ -3339,7 +3359,7 @@
int pat_mode;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
- KASSERT(object->type == OBJT_DEVICE,
+ KASSERT(object->type == OBJT_DEVICE || object->type == OBJT_SG,
("pmap_object_init_pt: non-device object"));
if ((addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 0) {
if (!vm_object_populate(object, pindex, pindex + atop(size)))
@@ -4271,7 +4291,8 @@
void *
pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode)
{
- vm_offset_t va, tmpva, offset;
+ vm_offset_t va, offset;
+ vm_size_t tmpsize;
/*
* If the specified range of physical addresses fits within the direct
@@ -4288,14 +4309,10 @@
if (!va)
panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
pa = trunc_page(pa);
- for (tmpva = va; size > 0; ) {
- pmap_kenter_attr(tmpva, pa, mode);
- size -= PAGE_SIZE;
- tmpva += PAGE_SIZE;
- pa += PAGE_SIZE;
- }
- pmap_invalidate_range(kernel_pmap, va, tmpva);
- pmap_invalidate_cache();
+ for (tmpsize = 0; tmpsize < size; tmpsize += PAGE_SIZE)
+ pmap_kenter_attr(va + tmpsize, pa + tmpsize, mode);
+ pmap_invalidate_range(kernel_pmap, va, va + tmpsize);
+ pmap_invalidate_cache_range(va, va + tmpsize);
return ((void *)(va + offset));
}
@@ -4394,9 +4411,12 @@
m->md.pat_mode = ma;
/*
- * Update the direct mapping and flush the cache.
+ * If "m" is a normal page, update its direct mapping. This update
+ * can be relied upon to perform any cache operations that are
+ * required for data coherence.
*/
- if (pmap_change_attr(PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)), PAGE_SIZE,
+ if ((m->flags & PG_FICTITIOUS) == 0 &&
+ pmap_change_attr(PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)), PAGE_SIZE,
m->md.pat_mode))
panic("memory attribute change on the direct map failed");
}
@@ -4634,7 +4654,7 @@
*/
if (changed) {
pmap_invalidate_range(kernel_pmap, base, tmpva);
- pmap_invalidate_cache();
+ pmap_invalidate_cache_range(base, tmpva);
}
return (error);
}
==== //depot/projects/multipass/sys/amd64/include/cpufunc.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.153 2009/04/11 14:01:01 ed Exp $
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.154 2009/07/22 14:32:38 kib Exp $
*/
/*
@@ -100,6 +100,13 @@
}
static __inline void
+clflush(u_long addr)
+{
+
+ __asm __volatile("clflush %0" : : "m" (*(char *)addr));
+}
+
+static __inline void
disable_intr(void)
{
__asm __volatile("cli" : : : "memory");
@@ -267,6 +274,13 @@
}
static __inline void
+mfence(void)
+{
+
+ __asm__ __volatile("mfence" : : : "memory");
+}
+
+static __inline void
ia32_pause(void)
{
__asm __volatile("pause");
==== //depot/projects/multipass/sys/amd64/include/md_var.h#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.85 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.86 2009/07/22 14:32:38 kib Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
@@ -47,6 +47,7 @@
extern u_int amd_pminfo;
extern u_int via_feature_rng;
extern u_int via_feature_xcrypt;
+extern u_int cpu_clflush_line_size;
extern u_int cpu_fxsr;
extern u_int cpu_high;
extern u_int cpu_id;
==== //depot/projects/multipass/sys/amd64/pci/pci_bus.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.123 2009/02/08 07:02:42 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.124 2009/07/13 21:36:31 jkim Exp $");
#include "opt_cpu.h"
@@ -382,6 +382,7 @@
*/
static struct isa_pnp_id pcibus_pnp_ids[] = {
{ 0x030ad041 /* PNP0A03 */, "PCI Bus" },
+ { 0x080ad041 /* PNP0A08 */, "PCIe Bus" },
{ 0 }
};
==== //depot/projects/multipass/sys/arm/arm/busdma_machdep.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.47 2009/04/23 20:24:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.48 2009/07/20 07:53:07 raj Exp $");
/*
* ARM bus dma support routines
@@ -630,10 +630,6 @@
((vm_offset_t)*vaddr & PAGE_MASK));
newmap->origbuffer = *vaddr;
newmap->allocbuffer = tmpaddr;
- cpu_idcache_wbinv_range((vm_offset_t)*vaddr,
- dmat->maxsize);
- cpu_l2cache_wbinv_range((vm_offset_t)*vaddr,
- dmat->maxsize);
*vaddr = tmpaddr;
} else
newmap->origbuffer = newmap->allocbuffer = NULL;
==== //depot/projects/multipass/sys/arm/arm/cpufunc.c#4 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.26 2009/05/05 12:57:16 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.27 2009/07/21 08:29:19 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -265,7 +265,7 @@
arm9_dcache_wbinv_all, /* dcache_wbinv_all */
arm9_dcache_wbinv_range, /* dcache_wbinv_range */
-/*XXX*/ arm9_dcache_wbinv_range, /* dcache_inv_range */
+ arm9_dcache_inv_range, /* dcache_inv_range */
arm9_dcache_wb_range, /* dcache_wb_range */
arm9_idcache_wbinv_all, /* idcache_wbinv_all */
@@ -327,7 +327,7 @@
armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */
armv5_ec_dcache_wbinv_range, /* dcache_wbinv_range */
-/*XXX*/ armv5_ec_dcache_wbinv_range, /* dcache_inv_range */
+ armv5_ec_dcache_inv_range, /* dcache_inv_range */
armv5_ec_dcache_wb_range, /* dcache_wb_range */
armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */
==== //depot/projects/multipass/sys/arm/arm/pmap.c#7 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.111 2009/06/24 21:03:59 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.113 2009/07/24 13:50:29 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -2984,6 +2984,7 @@
pmap_free_pv_entry(pve);
PMAP_UNLOCK(pmap_kernel());
vm_page_unlock_queues();
+ va = va & ~PAGE_MASK;
cpu_dcache_wbinv_range(va, PAGE_SIZE);
cpu_l2cache_wbinv_range(va, PAGE_SIZE);
cpu_tlb_flushD_SE(va);
@@ -3100,7 +3101,7 @@
{
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
- KASSERT(object->type == OBJT_DEVICE,
+ KASSERT(object->type == OBJT_DEVICE || object->type == OBJT_SG,
("pmap_object_init_pt: non-device object"));
}
==== //depot/projects/multipass/sys/arm/arm/vm_machdep.c#4 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.39 2009/06/24 21:00:13 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.40 2009/07/20 07:53:07 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -426,10 +426,15 @@
vm_offset_t tomap = arm_nocache_startaddr + i * PAGE_SIZE;
void *ret = (void *)tomap;
vm_paddr_t physaddr = vtophys((vm_offset_t)addr);
+ vm_offset_t vaddr = (vm_offset_t) addr;
+ vaddr = vaddr & ~PAGE_MASK;
for (; tomap < (vm_offset_t)ret + size; tomap += PAGE_SIZE,
- physaddr += PAGE_SIZE, i++) {
+ vaddr += PAGE_SIZE, physaddr += PAGE_SIZE, i++) {
+ cpu_idcache_wbinv_range(vaddr, PAGE_SIZE);
+ cpu_l2cache_wbinv_range(vaddr, PAGE_SIZE);
pmap_kenter_nocache(tomap, physaddr);
+ cpu_tlb_flushID_SE(vaddr);
arm_nocache_allocated[i / BITS_PER_INT] |= 1 << (i %
BITS_PER_INT);
}
==== //depot/projects/multipass/sys/arm/conf/AVILA#5 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.33 2009/07/17 18:35:45 rpaulo Exp $
ident AVILA
@@ -105,6 +105,7 @@
device wlan # 802.11 support
options IEEE80211_DEBUG
options IEEE80211_SUPPORT_TDMA
+options IEEE80211_SUPPORT_MESH
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
==== //depot/projects/multipass/sys/arm/conf/CAMBRIA#3 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.11 2009/05/10 00:00:25 kuriyama Exp $
+# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.12 2009/07/17 18:35:45 rpaulo Exp $
ident CAMBRIA
@@ -108,6 +108,7 @@
device wlan # 802.11 support
options IEEE80211_DEBUG
options IEEE80211_SUPPORT_TDMA
+options IEEE80211_SUPPORT_MESH
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
==== //depot/projects/multipass/sys/boot/forth/loader.conf#6 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.142 2009/06/15 18:22:41 marius Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.143 2009/07/26 12:20:07 bz Exp $
##############################################################
### Basic configuration options ############################
@@ -190,6 +190,7 @@
if_disc_load="NO" # Discard device
if_ef_load="NO" # pseudo-device providing support for multiple
# ethernet frame types
+if_epair_load="NO" # Virtual b-t-b Ethernet-like interface pair
if_faith_load="NO" # IPv6-to-IPv4 TCP relay capturing interface
if_gif_load="NO" # generic tunnel interface
if_gre_load="NO" # encapsulating network device
==== //depot/projects/multipass/sys/bsm/audit.h#4 (text) ====
@@ -26,8 +26,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9
- * $FreeBSD: src/sys/bsm/audit.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $
+ * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.17 2009/07/17 14:02:20 rwatson Exp $
*/
#ifndef _BSM_AUDIT_H
@@ -173,6 +173,7 @@
typedef u_int16_t au_event_t;
typedef u_int16_t au_emod_t;
typedef u_int32_t au_class_t;
+typedef u_int64_t au_asflgs_t __attribute__ ((aligned (8)));
struct au_tid {
dev_t port;
@@ -206,7 +207,7 @@
au_mask_t ai_mask; /* Audit masks. */
au_tid_addr_t ai_termid; /* Terminal ID. */
au_asid_t ai_asid; /* Audit session ID. */
- u_int64_t ai_flags; /* Audit session flags. */
+ au_asflgs_t ai_flags; /* Audit session flags. */
};
typedef struct auditinfo_addr auditinfo_addr_t;
@@ -225,7 +226,7 @@
au_mask_t ap_mask; /* Audit masks. */
au_tid_addr_t ap_termid; /* Terminal ID. */
au_asid_t ap_asid; /* Audit session ID. */
- u_int64_t ap_flags; /* Audit session flags. */
+ au_asflgs_t ap_flags; /* Audit session flags. */
};
typedef struct auditpinfo_addr auditpinfo_addr_t;
==== //depot/projects/multipass/sys/bsm/audit_kevents.h#5 (text) ====
@@ -26,8 +26,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#6
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.21 2009/07/08 15:23:18 trasz Exp $
+ * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#7
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.22 2009/07/17 14:02:20 rwatson Exp $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
==== //depot/projects/multipass/sys/cam/ata/ata_da.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.1 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.2 2009/07/17 21:48:08 mav Exp $");
#include <sys/param.h>
@@ -275,7 +275,6 @@
if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) {
ccb = cam_periph_getccb(periph, /*priority*/1);
- ccb->ccb_h.ccb_state = ADA_CCB_DUMP;
cam_fill_ataio(&ccb->ataio,
1,
adadone,
@@ -289,7 +288,9 @@
ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0);
else
ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0);
- xpt_polled_action(ccb);
+ cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0,
+ /*sense_flags*/SF_RETRY_UA,
+ softc->disk->d_devstat);
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
xpt_print(periph->path, "Synchronize cache failed\n");
==== //depot/projects/multipass/sys/cam/ata/ata_xpt.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.2 2009/07/13 06:12:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.3 2009/07/13 21:21:30 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1204,7 +1204,7 @@
scan_info->request_ccb->ccb_h.path, 1);
cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
- cts.xport_specific.sata.pm_present = 1;
+ cts.xport_specific.sata.pm_present = 0;
cts.xport_specific.sata.valid = CTS_SATA_VALID_PM;
xpt_action((union ccb *)&cts);
}
==== //depot/projects/multipass/sys/cam/scsi/scsi_xpt.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.1 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.3 2009/07/14 18:44:17 emaste Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -836,8 +836,11 @@
serial_buf = NULL;
device = periph->path->device;
- device->serial_num = NULL;
- device->serial_num_len = 0;
+ if (device->serial_num != NULL) {
+ free(device->serial_num, M_CAMXPT);
+ device->serial_num = NULL;
+ device->serial_num_len = 0;
+ }
serial_buf = (struct scsi_vpd_unit_serial_number *)
malloc(sizeof(*serial_buf), M_CAMXPT, M_NOWAIT|M_ZERO);
@@ -1176,7 +1179,7 @@
}
if (page_list != NULL)
- free(page_list, M_DEVBUF);
+ free(page_list, M_CAMXPT);
if (serialnum_supported) {
xpt_release_ccb(done_ccb);
@@ -1465,14 +1468,14 @@
/*
* To start a scan, request_ccb is an XPT_SCAN_BUS ccb.
- * As the scan progresses, xpt_scan_bus is used as the
+ * As the scan progresses, scsi_scan_bus is used as the
* callback on completion function.
*/
static void
scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
{
CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
- ("xpt_scan_bus\n"));
+ ("scsi_scan_bus\n"));
switch (request_ccb->ccb_h.func_code) {
case XPT_SCAN_BUS:
{
@@ -1550,7 +1553,7 @@
request_ccb->ccb_h.path_id,
i, 0);
if (status != CAM_REQ_CMP) {
- printf("xpt_scan_bus: xpt_create_path failed"
+ printf("scsi_scan_bus: xpt_create_path failed"
" with status %#x, bus scan halted\n",
status);
free(scan_info, M_CAMXPT);
@@ -1561,6 +1564,7 @@
}
work_ccb = xpt_alloc_ccb_nowait();
if (work_ccb == NULL) {
+ xpt_free_ccb((union ccb *)scan_info->cpi);
free(scan_info, M_CAMXPT);
xpt_free_path(path);
request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
@@ -1682,13 +1686,14 @@
}
if ((scan_info->cpi->hba_misc & PIM_SEQSCAN) == 0) {
+ xpt_free_ccb(request_ccb);
break;
}
status = xpt_create_path(&path, xpt_periph,
scan_info->request_ccb->ccb_h.path_id,
scan_info->counter, 0);
if (status != CAM_REQ_CMP) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list