Date: Sat, 1 Aug 2009 22:43:50 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 166906 for review Message-ID: <200908012243.n71Mhob5082180@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=166906 Change 166906 by zec@zec_tpx32 on 2009/08/01 22:43:05 IFC @ 166905 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/minidump_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#10 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_mib.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#35 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#48 integrate .. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#8 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_sym.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_ich8lan.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ispfw/asm_2400.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ispfw/asm_2500.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/dev/siis/siis.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/siis/siis.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clbio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/md_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#58 delete .. //depot/projects/vimage-commit2/src/sys/kern/link_elf_obj.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#28 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_epair/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/ispfw/isp_2500/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/siis/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/wlan/Makefile#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#81 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_clone.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_epair.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#36 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#47 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#29 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#30 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pipe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/icmp6.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/icmp_var.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#45 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#46 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#49 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw2.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#57 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_mcast.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#38 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/tcp6_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ah_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/esp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipcomp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipip_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec6.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_tcp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/lbc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_errno.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_token.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_private.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/param.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sys/domain.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/jail.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kernel.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#50 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sockio.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#25 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ucred.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/user.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#79 delete .. //depot/projects/vimage-commit2/src/sys/vm/device_pager.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/sg_pager.c#1 branch .. //depot/projects/vimage-commit2/src/sys/vm/vm.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_meter.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#9 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#5 (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/vimage-commit2/src/sys/amd64/amd64/machdep.c#14 (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/vimage-commit2/src/sys/amd64/amd64/pmap.c#18 (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/vimage-commit2/src/sys/amd64/include/cpufunc.h#6 (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/vimage-commit2/src/sys/amd64/include/md_var.h#6 (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/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#8 (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/vimage-commit2/src/sys/arm/arm/cpufunc.c#5 (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/vimage-commit2/src/sys/arm/arm/minidump_machdep.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/minidump_machdep.c,v 1.1 2008/11/06 16:20:27 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/minidump_machdep.c,v 1.2 2009/08/01 19:26:27 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -36,7 +36,6 @@ #include <sys/kernel.h> #include <sys/kerneldump.h> #include <sys/msgbuf.h> -#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/pmap.h> ==== //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#10 (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/vimage-commit2/src/sys/arm/arm/vm_machdep.c#5 (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/vimage-commit2/src/sys/arm/conf/AVILA#10 (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/vimage-commit2/src/sys/arm/conf/CAMBRIA#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/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/vimage-commit2/src/sys/boot/forth/loader.conf#15 (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/vimage-commit2/src/sys/bsm/audit.h#7 (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/vimage-commit2/src/sys/bsm/audit_kevents.h#9 (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/vimage-commit2/src/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/vimage-commit2/src/sys/cam/cam_ccb.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.36 2009/07/10 08:18:08 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.37 2009/08/01 01:04:26 mjacob Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -173,6 +173,15 @@ XPT_ATA_IO = 0x18 | XPT_FC_DEV_QUEUED, /* Execute the requested ATA I/O operation */ + XPT_GET_SIM_KNOB = 0x18, + /* + * Get SIM specific knob values. + */ + + XPT_SET_SIM_KNOB = 0x19, + /* + * Set SIM specific knob values. + */ /* HBA engine commands 0x20->0x2F */ XPT_ENG_INQ = 0x20 | XPT_FC_XPT_ONLY, /* HBA engine feature inquiry */ @@ -189,8 +198,12 @@ XPT_CONT_TARGET_IO = 0x33 | XPT_FC_DEV_QUEUED, /* Continue Host Target I/O Connection */ XPT_IMMED_NOTIFY = 0x34 | XPT_FC_QUEUED | XPT_FC_USER_CCB, + /* Notify Host Target driver of event (obsolete) */ + XPT_NOTIFY_ACK = 0x35, + /* Acknowledgement of event (obsolete) */ + XPT_IMMEDIATE_NOTIFY = 0x36 | XPT_FC_QUEUED | XPT_FC_USER_CCB, /* Notify Host Target driver of event */ - XPT_NOTIFY_ACK = 0x35, + XPT_NOTIFY_ACKNOWLEDGE = 0x37 | XPT_FC_QUEUED | XPT_FC_USER_CCB, /* Acknowledgement of event */ /* Vendor Unique codes: 0x80->0x8F */ @@ -531,12 +544,14 @@ struct ccb_pathinq_settings_spi { u_int8_t ppr_options; }; + struct ccb_pathinq_settings_fc { u_int64_t wwnn; /* world wide node name */ u_int64_t wwpn; /* world wide port name */ u_int32_t port; /* 24 bit port id, if known */ u_int32_t bitrate; /* Mbps */ }; + struct ccb_pathinq_settings_sas { u_int32_t bitrate; /* Mbps */ }; @@ -678,6 +693,7 @@ * Definitions for the asynchronous callback CCB fields. */ typedef enum { + AC_CONTRACT = 0x1000,/* A contractual callback */ AC_GETDEV_CHANGED = 0x800,/* Getdev info might have changed */ AC_INQ_CHANGED = 0x400,/* Inquiry info might have changed */ AC_TRANSFER_NEG = 0x200,/* New transfer settings in effect */ @@ -694,6 +710,26 @@ typedef void ac_callback_t (void *softc, u_int32_t code, struct cam_path *path, void *args); +/* + * Generic Asynchronous callbacks. + * + * Generic arguments passed bac which are then interpreted between a per-system + * contract number. + */ +#define AC_CONTRACT_DATA_MAX (128 - sizeof (u_int64_t)) +struct ac_contract { + u_int64_t contract_number; + u_int8_t contract_data[AC_CONTRACT_DATA_MAX]; +}; + +#define AC_CONTRACT_DEV_CHG 1 +struct ac_device_changed { + u_int64_t wwpn; + u_int32_t port; + target_id_t target; + u_int8_t arrived; +}; + /* Set Asynchronous Callback CCB */ struct ccb_setasync { struct ccb_hdr ccb_h; @@ -823,6 +859,50 @@ }; /* + * Set or get SIM (and transport) specific knobs + */ + +#define KNOB_VALID_ADDRESS 0x1 +#define KNOB_VALID_ROLE 0x2 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908012243.n71Mhob5082180>