PERFORCE change 167066 for review

Marko Zec zec at FreeBSD.org
Thu Aug 6 16:00:34 UTC 2009


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

Change 167066 by zec at zec_tpx32 on 2009/08/06 15:59:33

	IFC @ 167016

Affected files ...

.. //depot/projects/vimage/src/share/man/man4/Makefile#16 integrate
.. //depot/projects/vimage/src/share/man/man4/ahci.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/altq.4#8 integrate
.. //depot/projects/vimage/src/share/man/man4/asmc.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/epair.4#5 integrate
.. //depot/projects/vimage/src/share/man/man4/mxge.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/siis.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/u3g.4#5 integrate
.. //depot/projects/vimage/src/share/man/man4/urtw.4#3 integrate
.. //depot/projects/vimage/src/share/man/man9/netisr.9#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#22 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#32 integrate
.. //depot/projects/vimage/src/sys/amd64/include/cpufunc.h#6 integrate
.. //depot/projects/vimage/src/sys/amd64/include/md_var.h#8 integrate
.. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#17 integrate
.. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#10 integrate
.. //depot/projects/vimage/src/sys/arm/arm/minidump_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#22 integrate
.. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA#18 integrate
.. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#7 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#23 integrate
.. //depot/projects/vimage/src/sys/bsm/audit.h#11 integrate
.. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#13 integrate
.. //depot/projects/vimage/src/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_ccb.h#5 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#20 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#24 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#40 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#26 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_mib.c#9 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#25 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#15 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#60 integrate
.. //depot/projects/vimage/src/sys/conf/files#76 integrate
.. //depot/projects/vimage/src/sys/conf/newvers.sh#10 integrate
.. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#23 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/fil.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#22 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#25 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#20 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#27 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#17 integrate
.. //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#10 integrate
.. //depot/projects/vimage/src/sys/ddb/db_sym.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_dock.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_thermal.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_bus.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/alc/if_alc.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/amdtemp/amdtemp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#43 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#24 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/bktr/bktr_os.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#25 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_ich8lan.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#31 integrate
.. //depot/projects/vimage/src/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_ioctl.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_library.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_library.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_stds.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_target.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/isp/ispmbox.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/isp/ispreg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/ispfw/asm_2300.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ispfw/asm_2400.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ispfw/asm_2500.h#1 branch
.. //depot/projects/vimage/src/sys/dev/ispfw/ispfw.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/mlx/mlx.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#19 integrate
.. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci.c#27 integrate
.. //depot/projects/vimage/src/sys/dev/pst/pst-iop.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/rp/rp.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/siis/siis.c#1 branch
.. //depot/projects/vimage/src/sys/dev/siis/siis.h#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#37 integrate
.. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/twe/twe.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_powerpc.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/avr32dci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#53 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdi.h#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uath.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgt.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/xen/blkback/blkback.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/xen/netback/netback.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clstate.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#11 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#17 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#8 integrate
.. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/i386/bios/smapi.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#7 integrate
.. //depot/projects/vimage/src/sys/i386/i386/machdep.c#24 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#30 integrate
.. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#15 integrate
.. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#11 integrate
.. //depot/projects/vimage/src/sys/i386/include/md_var.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmap.h#13 integrate
.. //depot/projects/vimage/src/sys/i386/include/sf_buf.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/xen/pmap.c#11 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/init_main.c#30 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#35 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#31 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#33 integrate
.. //depot/projects/vimage/src/sys/kern/kern_linker.c#31 integrate
.. //depot/projects/vimage/src/sys/kern/kern_poll.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#27 integrate
.. //depot/projects/vimage/src/sys/kern/kern_prot.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#28 integrate
.. //depot/projects/vimage/src/sys/kern/kern_uuid.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#101 delete
.. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/sys_socket.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pts.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_domain.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_socket.c#41 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#32 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#30 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#27 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#37 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#31 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#53 integrate
.. //depot/projects/vimage/src/sys/modules/if_epair/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/ispfw/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ispfw/isp_2500/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/siis/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/wlan/Makefile#11 integrate
.. //depot/projects/vimage/src/sys/net/bpf.c#40 integrate
.. //depot/projects/vimage/src/sys/net/bridgestp.c#24 integrate
.. //depot/projects/vimage/src/sys/net/flowtable.c#7 integrate
.. //depot/projects/vimage/src/sys/net/flowtable.h#6 integrate
.. //depot/projects/vimage/src/sys/net/if.c#90 integrate
.. //depot/projects/vimage/src/sys/net/if_bridge.c#33 integrate
.. //depot/projects/vimage/src/sys/net/if_clone.c#18 integrate
.. //depot/projects/vimage/src/sys/net/if_clone.h#3 integrate
.. //depot/projects/vimage/src/sys/net/if_ef.c#17 integrate
.. //depot/projects/vimage/src/sys/net/if_enc.c#11 integrate
.. //depot/projects/vimage/src/sys/net/if_epair.c#9 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#47 integrate
.. //depot/projects/vimage/src/sys/net/if_faith.c#11 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.c#35 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.h#16 integrate
.. //depot/projects/vimage/src/sys/net/if_gre.c#16 integrate
.. //depot/projects/vimage/src/sys/net/if_llatbl.c#7 integrate
.. //depot/projects/vimage/src/sys/net/if_loop.c#53 integrate
.. //depot/projects/vimage/src/sys/net/if_mib.c#19 integrate
.. //depot/projects/vimage/src/sys/net/if_spppsubr.c#20 integrate
.. //depot/projects/vimage/src/sys/net/if_stf.c#21 integrate
.. //depot/projects/vimage/src/sys/net/if_tun.c#21 integrate
.. //depot/projects/vimage/src/sys/net/if_var.h#44 integrate
.. //depot/projects/vimage/src/sys/net/if_vlan.c#22 integrate
.. //depot/projects/vimage/src/sys/net/netisr.c#23 integrate
.. //depot/projects/vimage/src/sys/net/netisr.h#11 integrate
.. //depot/projects/vimage/src/sys/net/raw_cb.c#17 integrate
.. //depot/projects/vimage/src/sys/net/raw_cb.h#8 integrate
.. //depot/projects/vimage/src/sys/net/raw_usrreq.c#16 integrate
.. //depot/projects/vimage/src/sys/net/route.c#57 integrate
.. //depot/projects/vimage/src/sys/net/rtsock.c#42 integrate
.. //depot/projects/vimage/src/sys/net/vnet.c#2 integrate
.. //depot/projects/vimage/src/sys/net/vnet.h#30 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#40 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.c#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#11 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#30 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#25 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_hwmp.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#21 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_input.h#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#16 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_mesh.h#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#29 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#19 integrate
.. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#15 integrate
.. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate
.. //depot/projects/vimage/src/sys/netgraph/netgraph.h#24 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#63 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#10 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#33 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#31 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#16 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#31 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#11 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_socket.c#7 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_source.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/icmp6.h#7 integrate
.. //depot/projects/vimage/src/sys/netinet/icmp_var.h#10 integrate
.. //depot/projects/vimage/src/sys/netinet/if_ether.c#49 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#46 integrate
.. //depot/projects/vimage/src/sys/netinet/in.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet/in_gif.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/in_mcast.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#64 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.h#37 integrate
.. //depot/projects/vimage/src/sys/netinet/in_proto.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet/in_rmx.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet/in_var.h#23 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_carp.c#26 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_divert.c#37 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw.h#36 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#64 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#26 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#27 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_options.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_var.h#23 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw2.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_nat.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#53 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#16 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#32 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#26 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.h#21 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#59 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#89 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#57 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#36 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#39 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_var.h#39 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#60 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_var.h#17 integrate
.. //depot/projects/vimage/src/sys/netinet6/dest6.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet6/frag6.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#49 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6.c#41 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#45 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_mcast.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#39 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#46 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_src.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_var.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#61 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#34 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#24 integrate
.. //depot/projects/vimage/src/sys/netinet6/mld6.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#57 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.h#19 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#39 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#39 integrate
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#44 integrate
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.h#5 integrate
.. //depot/projects/vimage/src/sys/netinet6/route6.c#16 integrate
.. //depot/projects/vimage/src/sys/netinet6/scope6.c#29 integrate
.. //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#7 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#47 integrate
.. //depot/projects/vimage/src/sys/netipsec/ah_var.h#3 integrate
.. //depot/projects/vimage/src/sys/netipsec/esp_var.h#3 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipcomp_var.h#3 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipip_var.h#4 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#52 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.h#17 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec6.h#9 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#24 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#11 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#24 integrate
.. //depot/projects/vimage/src/sys/netipsec/key.c#47 integrate
.. //depot/projects/vimage/src/sys/netipsec/key_debug.h#5 integrate
.. //depot/projects/vimage/src/sys/netipsec/keysock.c#28 integrate
.. //depot/projects/vimage/src/sys/netipsec/keysock.h#7 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#28 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#28 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#23 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#34 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#24 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#19 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#40 integrate
.. //depot/projects/vimage/src/sys/pc98/cbus/fdc.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.h#3 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.c#19 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.h#13 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#15 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#16 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_errno.c#3 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#13 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#14 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_private.h#12 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/param.h#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/sys/bus.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/domain.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#17 integrate
.. //depot/projects/vimage/src/sys/sys/kernel.h#20 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#60 integrate
.. //depot/projects/vimage/src/sys/sys/priv.h#22 integrate
.. //depot/projects/vimage/src/sys/sys/sockio.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/sysctl.h#41 integrate
.. //depot/projects/vimage/src/sys/sys/ucred.h#13 integrate
.. //depot/projects/vimage/src/sys/sys/user.h#13 integrate
.. //depot/projects/vimage/src/sys/vm/device_pager.c#9 integrate
.. //depot/projects/vimage/src/sys/vm/sg_pager.c#1 branch
.. //depot/projects/vimage/src/sys/vm/vm.h#5 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#20 integrate
.. //depot/projects/vimage/src/sys/vm/vm_map.c#21 integrate
.. //depot/projects/vimage/src/sys/vm/vm_meter.c#12 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#26 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.h#9 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#25 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#19 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pager.c#5 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pager.h#4 integrate
.. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#10 integrate
.. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#7 integrate
.. //depot/projects/vimage/src/usr.bin/kdump/mkioctls#6 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man4/Makefile#16 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.458 2009/07/12 03:19:25 sam Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.460 2009/07/26 12:20:07 bz Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -94,6 +94,7 @@
 	em.4 \
 	en.4 \
 	enc.4 \
+	epair.4 \
 	esp.4 \
 	et.4 \
 	exca.4 \
@@ -332,6 +333,7 @@
 	sf.4 \
 	si.4 \
 	sio.4 \
+	siis.4 \
 	sis.4 \
 	sk.4 \
 	smb.4 \
@@ -489,6 +491,7 @@
 MLINKS+=em.4 if_em.4
 MLINKS+=en.4 if_en.4
 MLINKS+=enc.4 if_enc.4
+MLINKS+=epair.4 if_epair.4
 MLINKS+=et.4 if_et.4
 MLINKS+=faith.4 if_faith.4
 MLINKS+=fatm.4 if_fatm.4

==== //depot/projects/vimage/src/share/man/man4/ahci.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.1 2009/07/10 08:18:08 scottl Exp $
+.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.2 2009/07/25 18:19:31 mav Exp $
 .\"
 .Dd June 26, 2009
 .Dt AHCI 4
@@ -87,7 +87,7 @@
 .Tn SATA
 ports of AHCI-compatible controllers.
 Each SATA port found is represented to CAM as a separate bus with one
-target, or, if HBA supports Port Multipliers, 15 targets.
+target, or, if HBA supports Port Multipliers, 16 targets.
 Most of the bus-management details are handled by the SATA-specific 
 transport of CAM.
 Connected ATA disks are handled by the ATA protocol disk peripheral driver

==== //depot/projects/vimage/src/share/man/man4/altq.4#8 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/altq.4,v 1.41 2009/06/15 18:24:04 marius Exp $
+.\" $FreeBSD: src/share/man/man4/altq.4,v 1.42 2009/07/26 12:20:07 bz Exp $
 .\"
-.Dd June 14, 2009
+.Dd July 26, 2009
 .Dt ALTQ 4
 .Os
 .Sh NAME

==== //depot/projects/vimage/src/share/man/man4/asmc.4#2 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007, 2008 Rui Paulo <rpaulo at FreeBSD.org>
+.\" Copyright (c) 2007, 2008, 2009 Rui Paulo <rpaulo at FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -23,9 +23,9 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.4 2008/04/07 11:27:16 rpaulo Exp $
+.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.5 2009/07/27 13:36:35 rpaulo Exp $
 .\"
-.Dd April 7, 2008
+.Dd July 27, 2009
 .Dt ASMC 4
 .Os
 .Sh NAME
@@ -54,11 +54,17 @@
 .Pp
 .Bl -bullet -offset indent -compact
 .It
-MacBook (any generation)
+MacBook
 .It
-MacBook Pro (any generation)
+MacBook Pro
 .It
 Intel MacMini
+.It
+Mac Pro
+.It
+MacBook Air
+.It
+Intel iMac
 .El
 .Pp
 With this driver, you can configure your keyboard backlight
@@ -72,15 +78,16 @@
 .Sh KEYBOARD BACKLIGHT
 On
 .Tn MacBook Pro
-systems, you can control the keyboard brightness by writing values to
+systems, you can control the keyboard brightness by writing a value to
 the
+.Va dev.asmc.%d.light.control
+sysctl MIB.
+.Pp
+The following sysctl MIBs contains the raw value returned by the left
+and right light sensors:
 .Va dev.asmc.%d.light.left
 or
-.Va dev.asmc.%d.light.right
-sysctl MIBs.
-.Pp
-Each of these sysctl MIBs contains the raw value returned by the left
-and right light sensors.
+.Va dev.asmc.%d.light.right .
 .Sh TEMPERATURES
 The number of temperature sensors and their description varies among
 systems.

==== //depot/projects/vimage/src/share/man/man4/epair.4#5 (text+ko) ====

@@ -26,14 +26,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/epair.4,v 1.1 2009/06/24 22:21:30 bz Exp $
+.\" $FreeBSD: src/share/man/man4/epair.4,v 1.2 2009/07/26 12:20:07 bz Exp $
 .\"
-.Dd December 15, 2008
+.Dd July 26, 2009
 .Dt EPAIR 4
 .Os
 .Sh NAME
 .Nm epair
-.Nd Virtual cross-over Ethernet-like interface pair.
+.Nd A pair of virtual back-to-back connected Ethernet interfaces.
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following line in your
@@ -52,7 +52,7 @@
 The
 .Nm
 is a pair of Ethernet-like software interfaces,
-which are directly connected by a virtual cross-over cable.
+which are connected back-to-back with a virtual cross-over cable.
 .Pp
 Each
 .Nm

==== //depot/projects/vimage/src/share/man/man4/mxge.4#2 (text+ko) ====

@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.9 2008/02/13 08:09:55 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.10 2009/07/22 11:57:34 gallatin Exp $
 .\"
 .Dd February 13, 2008
 .Dt MXGE 4
@@ -125,14 +125,14 @@
 of a set of receive queues and an associated interrupt thread.
 When using multiple slices, the NIC hashes traffic to different slices
 based on the value of
-.Va hw.mxge.rss_hash_type .
+.Va hw.mxge.rss_hashtype .
 Using multiple slices requires that your motherboard and Myri10GE NIC
 both be capable of MSI-X.
 Older Myri10GE NICs can be field upgraded to add
 MSI-X using the "10G NIC Tool Kit" for FreeBSD which is available from
 .Pa http://www.myri.com/scs/download-10g-tools.html .
 .Pp
-.It Va hw.mxge.rss_hash_type
+.It Va hw.mxge.rss_hashtype
 This value determines how incoming traffic is steered to different
 slices.
 This tunable is ignored when using just a single slice.

==== //depot/projects/vimage/src/share/man/man4/u3g.4#5 (text+ko) ====

@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.11 2009/05/02 11:59:56 hrs Exp $
+.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.12 2009/07/30 00:15:17 alfred Exp $
 .\"
 .Dd October 7, 2008
 .Dt U3G 4
@@ -64,7 +64,7 @@
 .It
 Qualcomm Inc. CDMA MSM
 .It
-Huawei B190, E220 ('<Huawei Mobile>')
+Huawei B190, E180v, E220 ('<Huawei Mobile>')
 .It
 Novatel U740, MC950D, X950D, etc.
 .It

==== //depot/projects/vimage/src/share/man/man4/urtw.4#3 (text+ko) ====

@@ -22,14 +22,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/urtw.4,v 1.2 2009/05/16 12:11:06 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/urtw.4,v 1.3 2009/07/27 18:07:44 weongyo Exp $
 .\"
-.Dd November 15, 2008
+.Dd July 25, 2009
 .Dt URTW 4
 .Os
 .Sh NAME
 .Nm urtw
-.Nd Realtek RTL8187L USB IEEE 802.11b/g wireless network device
+.Nd Realtek RTL8187B/L USB IEEE 802.11b/g wireless network device
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your kernel configuration file:
@@ -52,7 +52,7 @@
 The
 .Nm
 driver supports USB 802.11b/g wireless adapters based on the
-Realtek RTL8187L.
+Realtek RTL8187B/L.
 .Pp
 .Nm
 supports
@@ -66,7 +66,7 @@
 .Sh HARDWARE
 The
 .Nm
-driver supports Realtek RTL8187L based wireless network devices, including:
+driver supports Realtek RTL8187B/L based wireless network devices, including:
 .Pp
 .Bl -column "Shuttle XPC Accessory PN20" "RTL8225" "USB" -compact -offset 6n
 .It Em "Card	Radio	Bus"

==== //depot/projects/vimage/src/share/man/man9/netisr.9#3 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.3 2009/06/14 17:15:18 bz Exp $
+.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.4 2009/07/26 12:20:07 bz Exp $
 .\"
-.Dd June 14, 2009
+.Dd July 26, 2009
 .Dt NETISR 9
 .Os
 .Sh NAME
@@ -208,6 +208,8 @@
 IPv6
 .It Dv NETISR_NATM
 ATM
+.It Dv NETISR_EPAIR
+.Xr epair 4
 .El
 .Sh AUTHORS
 This manual page and the

==== //depot/projects/vimage/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/src/sys/amd64/amd64/machdep.c#22 (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.707 2009/08/02 11:26:23 ed Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -213,7 +213,11 @@
 	 */
 	sysenv = getenv("smbios.system.product");
 	if (sysenv != NULL) {
-		if (strncmp(sysenv, "MacBook", 7) == 0) {
+		if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+		    strncmp(sysenv, "MacBook3,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/src/sys/amd64/amd64/pmap.c#32 (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/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/src/sys/amd64/include/md_var.h#8 (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/src/sys/arm/arm/busdma_machdep.c#17 (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/src/sys/arm/arm/cpufunc.c#10 (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	*/

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


More information about the p4-projects mailing list