PERFORCE change 166164 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Jul 16 13:08:09 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166164
Change 166164 by hselasky at hselasky_laptop001 on 2009/07/16 13:07:24
IFC @166163
Affected files ...
.. //depot/projects/usb/src/lib/libusb/libusb.h#8 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10.c#10 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10.h#8 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#7 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#7 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#13 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/exception.S#11 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#22 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#25 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#13 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#30 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_exception.S#4 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_reg.c#3 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/include/pcb.h#9 integrate
.. //depot/projects/usb/src/sys/amd64/include/pmap.h#11 integrate
.. //depot/projects/usb/src/sys/amd64/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#21 integrate
.. //depot/projects/usb/src/sys/amd64/pci/pci_bus.c#7 integrate
.. //depot/projects/usb/src/sys/arm/include/pmap.h#11 integrate
.. //depot/projects/usb/src/sys/arm/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/bsm/audit_kevents.h#13 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_all.c#1 branch
.. //depot/projects/usb/src/sys/cam/ata/ata_all.h#1 branch
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#1 branch
.. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#1 branch
.. //depot/projects/usb/src/sys/cam/cam.c#4 integrate
.. //depot/projects/usb/src/sys/cam/cam.h#3 integrate
.. //depot/projects/usb/src/sys/cam/cam_ccb.h#5 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.c#11 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#18 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.h#5 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt_internal.h#1 branch
.. //depot/projects/usb/src/sys/cam/cam_xpt_periph.h#3 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#7 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#10 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#6 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#14 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#11 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_pt.c#6 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#9 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#9 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#8 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_xpt.c#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sig.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#19 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#19 integrate
.. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#21 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#15 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#15 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#9 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#9 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#43 integrate
.. //depot/projects/usb/src/sys/conf/files#73 integrate
.. //depot/projects/usb/src/sys/conf/newvers.sh#10 integrate
.. //depot/projects/usb/src/sys/conf/options#37 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#12 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#14 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#13 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#11 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#17 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_subr.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pfvar.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/rdma/rdma_cma.c#6 integrate
.. //depot/projects/usb/src/sys/ddb/db_expr.c#3 integrate
.. //depot/projects/usb/src/sys/ddb/db_sym.c#3 integrate
.. //depot/projects/usb/src/sys/ddb/db_variables.c#2 integrate
.. //depot/projects/usb/src/sys/ddb/db_variables.h#2 integrate
.. //depot/projects/usb/src/sys/ddb/ddb.h#5 integrate
.. //depot/projects/usb/src/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate
.. //depot/projects/usb/src/sys/dev/advansys/advansys.c#5 integrate
.. //depot/projects/usb/src/sys/dev/advansys/advlib.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#1 branch
.. //depot/projects/usb/src/sys/dev/ahci/ahci.h#1 branch
.. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.h#4 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate
.. //depot/projects/usb/src/sys/dev/amd/amd.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#29 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#21 integrate
.. //depot/projects/usb/src/sys/dev/ciss/ciss.c#15 integrate
.. //depot/projects/usb/src/sys/dev/ciss/cissvar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#18 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#9 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#9 integrate
.. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#7 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#11 integrate
.. //depot/projects/usb/src/sys/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#8 integrate
.. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#15 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#11 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfi.c#16 integrate
.. //depot/projects/usb/src/sys/dev/mfi/mfivar.h#8 integrate
.. //depot/projects/usb/src/sys/dev/mlx/mlx.c#6 integrate
.. //depot/projects/usb/src/sys/dev/mlx/mlxvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt.h#10 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#9 integrate
.. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ral/rt2560.c#14 integrate
.. //depot/projects/usb/src/sys/dev/ral/rt2661.c#13 integrate
.. //depot/projects/usb/src/sys/dev/re/if_re.c#21 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#32 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/feeder_rate.c#10 integrate
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#54 integrate
.. //depot/projects/usb/src/sys/dev/trm/trm.h#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#14 integrate
.. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#14 integrate
.. //depot/projects/usb/src/sys/dev/xl/if_xl.c#7 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_commonkrpc.c#4 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#4 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#6 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#6 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#8 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#7 integrate
.. //depot/projects/usb/src/sys/geom/geom_dev.c#11 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#19 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_if.m#6 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC#29 integrate
.. //depot/projects/usb/src/sys/i386/i386/pmap.c#20 integrate
.. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_misc.c#10 integrate
.. //depot/projects/usb/src/sys/i386/include/pmap.h#12 integrate
.. //depot/projects/usb/src/sys/i386/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/i386/pci/pci_bus.c#7 integrate
.. //depot/projects/usb/src/sys/i386/xen/pmap.c#9 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#14 integrate
.. //depot/projects/usb/src/sys/ia64/include/pmap.h#4 integrate
.. //depot/projects/usb/src/sys/ia64/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/kern/init_sysent.c#16 integrate
.. //depot/projects/usb/src/sys/kern/kern_exit.c#21 integrate
.. //depot/projects/usb/src/sys/kern/kern_linker.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_mbuf.c#14 integrate
.. //depot/projects/usb/src/sys/kern/kern_poll.c#15 integrate
.. //depot/projects/usb/src/sys/kern/kern_prot.c#17 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/usb/src/sys/kern/kern_synch.c#17 integrate
.. //depot/projects/usb/src/sys/kern/kern_sysctl.c#17 integrate
.. //depot/projects/usb/src/sys/kern/kern_thread.c#15 integrate
.. //depot/projects/usb/src/sys/kern/kern_uuid.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_vimage.c#10 integrate
.. //depot/projects/usb/src/sys/kern/link_elf.c#15 integrate
.. //depot/projects/usb/src/sys/kern/link_elf_obj.c#15 integrate
.. //depot/projects/usb/src/sys/kern/subr_param.c#11 integrate
.. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#13 integrate
.. //depot/projects/usb/src/sys/kern/subr_trap.c#11 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.c#15 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.master#15 integrate
.. //depot/projects/usb/src/sys/kern/systrace_args.c#13 integrate
.. //depot/projects/usb/src/sys/kern/tty.c#29 integrate
.. //depot/projects/usb/src/sys/kern/tty_pts.c#15 integrate
.. //depot/projects/usb/src/sys/kern/uipc_domain.c#11 integrate
.. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#26 integrate
.. //depot/projects/usb/src/sys/mips/include/pmap.h#6 integrate
.. //depot/projects/usb/src/sys/mips/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#39 integrate
.. //depot/projects/usb/src/sys/modules/ahci/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/cam/Makefile#3 integrate
.. //depot/projects/usb/src/sys/net/bridgestp.c#16 integrate
.. //depot/projects/usb/src/sys/net/flowtable.c#5 integrate
.. //depot/projects/usb/src/sys/net/flowtable.h#5 integrate
.. //depot/projects/usb/src/sys/net/if.c#34 integrate
.. //depot/projects/usb/src/sys/net/if_bridge.c#17 integrate
.. //depot/projects/usb/src/sys/net/if_clone.c#6 integrate
.. //depot/projects/usb/src/sys/net/if_ef.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_enc.c#8 integrate
.. //depot/projects/usb/src/sys/net/if_ethersubr.c#20 integrate
.. //depot/projects/usb/src/sys/net/if_faith.c#7 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#15 integrate
.. //depot/projects/usb/src/sys/net/if_gif.h#9 integrate
.. //depot/projects/usb/src/sys/net/if_gre.c#13 integrate
.. //depot/projects/usb/src/sys/net/if_loop.c#21 integrate
.. //depot/projects/usb/src/sys/net/if_media.h#11 integrate
.. //depot/projects/usb/src/sys/net/if_mib.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_spppsubr.c#13 integrate
.. //depot/projects/usb/src/sys/net/if_stf.c#14 integrate
.. //depot/projects/usb/src/sys/net/if_var.h#24 integrate
.. //depot/projects/usb/src/sys/net/if_vlan.c#16 integrate
.. //depot/projects/usb/src/sys/net/raw_cb.c#13 integrate
.. //depot/projects/usb/src/sys/net/raw_cb.h#5 integrate
.. //depot/projects/usb/src/sys/net/raw_usrreq.c#12 integrate
.. //depot/projects/usb/src/sys/net/route.c#21 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#28 integrate
.. //depot/projects/usb/src/sys/net/vnet.c#1 branch
.. //depot/projects/usb/src/sys/net/vnet.h#13 integrate
.. //depot/projects/usb/src/sys/net80211/_ieee80211.h#13 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#26 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.h#17 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_action.c#2 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ageq.c#2 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#18 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#18 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_hwmp.c#1 branch
.. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#18 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#24 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#14 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.c#1 branch
.. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.h#1 branch
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#26 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#18 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#25 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#21 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#18 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#11 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan.h#9 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#15 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#25 integrate
.. //depot/projects/usb/src/sys/netgraph/atm/ng_atm.c#8 integrate
.. //depot/projects/usb/src/sys/netgraph/netgraph.h#13 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_base.c#18 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#12 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ether.c#14 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_gif.c#7 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#15 integrate
.. //depot/projects/usb/src/sys/netinet/icmp6.h#6 integrate
.. //depot/projects/usb/src/sys/netinet/icmp_var.h#5 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#24 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#30 integrate
.. //depot/projects/usb/src/sys/netinet/in_gif.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/in_mcast.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.c#29 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.h#22 integrate
.. //depot/projects/usb/src/sys/netinet/in_rmx.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/in_var.h#15 integrate
.. //depot/projects/usb/src/sys/netinet/ip_carp.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/ip_divert.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw.h#17 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#28 integrate
.. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#15 integrate
.. //depot/projects/usb/src/sys/netinet/ip_mroute.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/ip_options.c#15 integrate
.. //depot/projects/usb/src/sys/netinet/ip_output.c#24 integrate
.. //depot/projects/usb/src/sys/netinet/ip_var.h#12 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#3 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#26 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#17 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_input.c#26 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_offload.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_offload.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_output.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_reass.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_sack.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_subr.c#26 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#23 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.h#8 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timer.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#22 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_var.h#20 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#24 integrate
.. //depot/projects/usb/src/sys/netinet/udp_var.h#10 integrate
.. //depot/projects/usb/src/sys/netinet/vinet.h#12 delete
.. //depot/projects/usb/src/sys/netinet6/dest6.c#7 integrate
.. //depot/projects/usb/src/sys/netinet6/frag6.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#23 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#28 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_gif.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#26 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_mcast.c#5 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#21 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_proto.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#18 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_src.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_var.h#12 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_forward.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#26 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_ipsec.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_output.c#18 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_var.h#15 integrate
.. //depot/projects/usb/src/sys/netinet6/mld6.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#22 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.h#8 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#17 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#20 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#23 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.h#4 integrate
.. //depot/projects/usb/src/sys/netinet6/route6.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/scope6.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/tcp6_var.h#4 integrate
.. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#22 integrate
.. //depot/projects/usb/src/sys/netinet6/vinet6.h#10 delete
.. //depot/projects/usb/src/sys/netipsec/ah_var.h#2 integrate
.. //depot/projects/usb/src/sys/netipsec/esp_var.h#2 integrate
.. //depot/projects/usb/src/sys/netipsec/ipcomp_var.h#2 integrate
.. //depot/projects/usb/src/sys/netipsec/ipip_var.h#3 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.c#20 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.h#14 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec6.h#8 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_input.c#13 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_mbuf.c#6 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_output.c#12 integrate
.. //depot/projects/usb/src/sys/netipsec/key.c#22 integrate
.. //depot/projects/usb/src/sys/netipsec/key_debug.c#5 integrate
.. //depot/projects/usb/src/sys/netipsec/key_debug.h#3 integrate
.. //depot/projects/usb/src/sys/netipsec/keysock.c#12 integrate
.. //depot/projects/usb/src/sys/netipsec/keysock.h#3 integrate
.. //depot/projects/usb/src/sys/netipsec/vipsec.h#7 delete
.. //depot/projects/usb/src/sys/netipsec/xform_ah.c#9 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_esp.c#9 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#14 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_tcp.c#5 integrate
.. //depot/projects/usb/src/sys/nfs/nfs_common.c#5 integrate
.. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#17 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#19 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_diskless.c#13 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#27 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfsmount.h#7 integrate
.. //depot/projects/usb/src/sys/pc98/conf/GENERIC#21 integrate
.. //depot/projects/usb/src/sys/pci/if_rlreg.h#16 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#4 integrate
.. //depot/projects/usb/src/sys/powerpc/include/pmap.h#8 integrate
.. //depot/projects/usb/src/sys/powerpc/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/rpc/clnt_rc.c#8 integrate
.. //depot/projects/usb/src/sys/rpc/clnt_vc.c#7 integrate
.. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#23 integrate
.. //depot/projects/usb/src/sys/sparc64/include/pmap.h#4 integrate
.. //depot/projects/usb/src/sys/sparc64/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#16 integrate
.. //depot/projects/usb/src/sys/sun4v/include/pmap.h#3 integrate
.. //depot/projects/usb/src/sys/sun4v/include/vm.h#2 integrate
.. //depot/projects/usb/src/sys/sun4v/sun4v/pmap.c#9 integrate
.. //depot/projects/usb/src/sys/sys/disk.h#5 integrate
.. //depot/projects/usb/src/sys/sys/namei.h#6 integrate
.. //depot/projects/usb/src/sys/sys/param.h#40 integrate
.. //depot/projects/usb/src/sys/sys/pcpu.h#13 integrate
.. //depot/projects/usb/src/sys/sys/proc.h#21 integrate
.. //depot/projects/usb/src/sys/sys/signalvar.h#4 integrate
.. //depot/projects/usb/src/sys/sys/sleepqueue.h#6 integrate
.. //depot/projects/usb/src/sys/sys/syscall.h#15 integrate
.. //depot/projects/usb/src/sys/sys/syscall.mk#15 integrate
.. //depot/projects/usb/src/sys/sys/syscallsubr.h#12 integrate
.. //depot/projects/usb/src/sys/sys/sysctl.h#20 integrate
.. //depot/projects/usb/src/sys/sys/sysproto.h#15 integrate
.. //depot/projects/usb/src/sys/sys/vimage.h#17 integrate
.. //depot/projects/usb/src/sys/vm/device_pager.c#9 integrate
.. //depot/projects/usb/src/sys/vm/pmap.h#6 integrate
.. //depot/projects/usb/src/sys/vm/vm.h#6 integrate
.. //depot/projects/usb/src/sys/vm/vm_contig.c#14 integrate
.. //depot/projects/usb/src/sys/vm/vm_extern.h#9 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#18 integrate
.. //depot/projects/usb/src/sys/vm/vm_mmap.c#20 integrate
.. //depot/projects/usb/src/sys/vm/vm_object.c#20 integrate
.. //depot/projects/usb/src/sys/vm/vm_object.h#9 integrate
.. //depot/projects/usb/src/sys/vm/vm_page.c#17 integrate
.. //depot/projects/usb/src/sys/vm/vm_phys.c#7 integrate
.. //depot/projects/usb/src/sys/vm/vm_phys.h#5 integrate
Differences ...
==== //depot/projects/usb/src/lib/libusb/libusb.h#8 (text+ko) ====
==== //depot/projects/usb/src/lib/libusb/libusb10.c#10 (text+ko) ====
==== //depot/projects/usb/src/lib/libusb/libusb10.h#8 (text+ko) ====
==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#7 (text+ko) ====
==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#7 (text+ko) ====
==== //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#13 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.168 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.169 2009/07/09 09:34:11 kib Exp $
*/
#include <machine/asmacros.h>
@@ -97,6 +97,7 @@
ENTRY(cpu_switch)
/* Switch to new thread. First, save context. */
movq TD_PCB(%rdi),%r8
+ movb $1,PCB_FULL_IRET(%r8)
movq (%rsp),%rax /* Hardware registers */
movq %r15,PCB_R15(%r8)
==== //depot/projects/usb/src/sys/amd64/amd64/exception.S#11 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.138 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.140 2009/07/10 10:29:16 kib Exp $
*/
#include "opt_atpic.h"
@@ -162,19 +162,20 @@
.globl alltraps
.type alltraps, at function
alltraps:
+ movq %rdi,TF_RDI(%rsp)
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz alltraps_testi /* already running with kernel GS.base */
swapgs
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
alltraps_testi:
testl $PSL_I,TF_RFLAGS(%rsp)
- jz alltraps_pushregs
+ jz alltraps_pushregs_no_rdi
sti
-alltraps_pushregs:
- movq %rdi,TF_RDI(%rsp)
alltraps_pushregs_no_rdi:
movq %rsi,TF_RSI(%rsp)
movq %rdx,TF_RDX(%rsp)
@@ -233,14 +234,17 @@
.globl alltraps_noen
.type alltraps_noen, at function
alltraps_noen:
+ movq %rdi,TF_RDI(%rsp)
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
1: movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
- jmp alltraps_pushregs
+ jmp alltraps_pushregs_no_rdi
IDTVEC(dblfault)
subq $TF_ERR,%rsp
@@ -278,12 +282,13 @@
IDTVEC(page)
subq $TF_ERR,%rsp
movl $T_PAGEFLT,TF_TRAPNO(%rsp)
+ movq %rdi,TF_RDI(%rsp) /* free up a GP register */
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
-1:
- movq %rdi,TF_RDI(%rsp) /* free up a GP register */
- movq %cr2,%rdi /* preserve %cr2 before .. */
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
+1: movq %cr2,%rdi /* preserve %cr2 before .. */
movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */
movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
@@ -311,7 +316,9 @@
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 2f /* already running with kernel GS.base */
1: swapgs
-2: movw %fs,TF_FS(%rsp)
+2: movq PCPU(CURPCB),%rdi
+ movb $1,PCB_FULL_IRET(%rdi) /* always full iret from GPF */
+ movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
@@ -341,6 +348,8 @@
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
+ movq PCPU(CURPCB),%r11
+ movb $0,PCB_FULL_IRET(%r11)
sti
movq $KUDSEL,TF_SS(%rsp)
movq $KUCSEL,TF_CS(%rsp)
@@ -644,7 +653,8 @@
*/
testb $SEL_RPL_MASK,TF_CS(%rsp)
jz ld_regs
-
+ cmpb $0,PCB_FULL_IRET(%r8)
+ je ld_regs
testl $TF_HASSEGS,TF_FLAGS(%rsp)
je set_segs
@@ -756,38 +766,38 @@
.globl ds_load_fault
ds_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_DS(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUDSEL,TF_DS(%rsp)
- jmp calltrap
+ jmp doreti
ALIGN_TEXT
.globl es_load_fault
es_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_ES(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUDSEL,TF_ES(%rsp)
- jmp calltrap
+ jmp doreti
ALIGN_TEXT
.globl fs_load_fault
fs_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_FS(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUF32SEL,TF_FS(%rsp)
- jmp calltrap
+ jmp doreti
ALIGN_TEXT
.globl gs_load_fault
gs_load_fault:
popfq
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_GS(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUG32SEL,TF_GS(%rsp)
- jmp calltrap
+ jmp doreti
#ifdef HWPMC_HOOKS
ENTRY(end_exceptions)
#endif
==== //depot/projects/usb/src/sys/amd64/amd64/genassym.c#14 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.176 2009/07/01 07:34:28 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.177 2009/07/09 09:34:11 kib Exp $");
#include "opt_compat.h"
#include "opt_hwpmc_hooks.h"
@@ -141,6 +141,7 @@
ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6));
ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7));
ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp));
+ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret));
ASSYM(PCB_DBREGS, PCB_DBREGS);
ASSYM(PCB_32BIT, PCB_32BIT);
ASSYM(PCB_GS32BIT, PCB_GS32BIT);
==== //depot/projects/usb/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.704 2009/07/06 18:10:27 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.705 2009/07/09 09:34:11 kib Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -382,6 +382,7 @@
regs->tf_fs = _ufssel;
regs->tf_gs = _ugssel;
regs->tf_flags = TF_HASSEGS;
+ td->td_pcb->pcb_full_iret = 1;
PROC_LOCK(p);
mtx_lock(&psp->ps_mtx);
}
@@ -483,6 +484,7 @@
signotify(td);
PROC_UNLOCK(p);
td->td_pcb->pcb_flags |= PCB_FULLCTX;
+ td->td_pcb->pcb_full_iret = 1;
return (EJUSTRETURN);
}
@@ -853,6 +855,7 @@
pcb->pcb_gsbase = 0;
pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT);
pcb->pcb_initial_fpucw = __INITIAL_FPUCW__;
+ pcb->pcb_full_iret = 1;
bzero((char *)regs, sizeof(struct trapframe));
regs->tf_rip = entry;
@@ -2031,6 +2034,7 @@
td->td_pcb->pcb_gsbase = mcp->mc_gsbase;
}
td->td_pcb->pcb_flags |= PCB_FULLCTX;
+ td->td_pcb->pcb_full_iret = 1;
return (0);
}
==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#25 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.662 2009/07/06 18:43:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.663 2009/07/12 23:31:20 alc Exp $");
/*
* Manages physical address maps.
@@ -614,6 +614,7 @@
{
TAILQ_INIT(&m->md.pv_list);
+ m->md.pat_mode = PAT_WRITE_BACK;
}
/*
@@ -1120,7 +1121,8 @@
endpte = pte + count;
while (pte < endpte) {
oldpte |= *pte;
- pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V);
+ pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G |
+ pmap_cache_bits((*ma)->md.pat_mode, 0) | PG_RW | PG_V);
pte++;
ma++;
}
@@ -3025,7 +3027,7 @@
/*
* Now validate mapping with desired protection/wiring.
*/
- newpte = (pt_entry_t)(pa | PG_V);
+ newpte = (pt_entry_t)(pa | pmap_cache_bits(m->md.pat_mode, 0) | PG_V);
if ((prot & VM_PROT_WRITE) != 0) {
newpte |= PG_RW;
vm_page_flag_set(m, PG_WRITEABLE);
@@ -3110,7 +3112,8 @@
" in pmap %p", va, pmap);
return (FALSE);
}
- newpde = VM_PAGE_TO_PHYS(m) | PG_PS | PG_V;
+ newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 1) |
+ PG_PS | PG_V;
if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) {
newpde |= PG_MANAGED;
@@ -3292,7 +3295,7 @@
*/
pmap->pm_stats.resident_count++;
- pa = VM_PAGE_TO_PHYS(m);
+ pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 0);
if ((prot & VM_PROT_EXECUTE) == 0)
pa |= pg_nx;
@@ -3333,6 +3336,7 @@
pd_entry_t *pde;
vm_paddr_t pa, ptepa;
vm_page_t p, pdpg;
+ int pat_mode;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
KASSERT(object->type == OBJT_DEVICE,
@@ -3343,6 +3347,7 @@
p = vm_page_lookup(object, pindex);
KASSERT(p->valid == VM_PAGE_BITS_ALL,
("pmap_object_init_pt: invalid page %p", p));
+ pat_mode = p->md.pat_mode;
/*
* Abort the mapping if the first page is not physically
@@ -3354,21 +3359,28 @@
/*
* Skip the first page. Abort the mapping if the rest of
- * the pages are not physically contiguous.
+ * the pages are not physically contiguous or have differing
+ * memory attributes.
*/
p = TAILQ_NEXT(p, listq);
for (pa = ptepa + PAGE_SIZE; pa < ptepa + size;
pa += PAGE_SIZE) {
KASSERT(p->valid == VM_PAGE_BITS_ALL,
("pmap_object_init_pt: invalid page %p", p));
- if (pa != VM_PAGE_TO_PHYS(p))
+ if (pa != VM_PAGE_TO_PHYS(p) ||
+ pat_mode != p->md.pat_mode)
return;
p = TAILQ_NEXT(p, listq);
}
- /* Map using 2MB pages. */
+ /*
+ * Map using 2MB pages. Since "ptepa" is 2M aligned and
+ * "size" is a multiple of 2M, adding the PAT setting to "pa"
+ * will not affect the termination of this loop.
+ */
PMAP_LOCK(pmap);
- for (pa = ptepa; pa < ptepa + size; pa += NBPDR) {
+ for (pa = ptepa | pmap_cache_bits(pat_mode, 1); pa < ptepa +
+ size; pa += NBPDR) {
pdpg = pmap_allocpde(pmap, addr, M_NOWAIT);
if (pdpg == NULL) {
/*
@@ -4373,6 +4385,23 @@
}
/*
+ * Sets the memory attribute for the specified page.
+ */
+void
+pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma)
+{
+
+ m->md.pat_mode = ma;
+
+ /*
+ * Update the direct mapping and flush the cache.
+ */
+ if (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");
+}
+
+/*
* Changes the specified virtual address range's memory type to that given by
* the parameter "mode". The specified virtual address range must be
* completely contained within either the direct map or the kernel map. If
==== //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.93 2009/06/27 15:03:50 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.94 2009/07/09 09:34:11 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,6 +103,7 @@
error = amd64_get_ldt(td, largs);
break;
case I386_SET_LDT:
+ td->td_pcb->pcb_full_iret = 1;
if (largs->descs != NULL) {
lp = (struct user_segment_descriptor *)
kmem_alloc(kernel_map, largs->num *
@@ -132,6 +133,7 @@
if (td != curthread)
return;
+ td->td_pcb->pcb_full_iret = 1;
critical_enter();
sd = PCPU_GET(gs32p);
sd->sd_lobase = base & 0xffffff;
@@ -146,6 +148,7 @@
if (td != curthread)
return;
+ td->td_pcb->pcb_full_iret = 1;
critical_enter();
sd = PCPU_GET(fs32p);
sd->sd_lobase = base & 0xffffff;
@@ -201,6 +204,7 @@
if (!error) {
pcb->pcb_fsbase = i386base;
td->td_frame->tf_fs = _ufssel;
+ pcb->pcb_full_iret = 1;
update_gdt_fsbase(td, i386base);
}
break;
@@ -212,6 +216,7 @@
error = copyin(uap->parms, &i386base, sizeof(i386base));
if (!error) {
pcb->pcb_gsbase = i386base;
+ pcb->pcb_full_iret = 1;
td->td_frame->tf_gs = _ugssel;
update_gdt_gsbase(td, i386base);
}
@@ -225,6 +230,7 @@
if (!error) {
if (a64base < VM_MAXUSER_ADDRESS) {
pcb->pcb_fsbase = a64base;
+ pcb->pcb_full_iret = 1;
td->td_frame->tf_fs = _ufssel;
} else
error = EINVAL;
@@ -240,6 +246,7 @@
if (!error) {
if (a64base < VM_MAXUSER_ADDRESS) {
pcb->pcb_gsbase = a64base;
+ pcb->pcb_full_iret = 1;
td->td_frame->tf_gs = _ugssel;
} else
error = EINVAL;
@@ -525,6 +532,7 @@
uap->start, uap->num, (void *)uap->descs);
#endif
+ td->td_pcb->pcb_full_iret = 1;
p = td->td_proc;
if (descs == NULL) {
/* Free descriptors */
==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#13 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.263 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.264 2009/07/09 09:34:11 kib Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -186,6 +186,9 @@
/* As an i386, do not copy io permission bitmap. */
pcb2->pcb_tssp = NULL;
+ /* New segment registers. */
+ pcb2->pcb_full_iret = 1;
+
/* Copy the LDT, if necessary. */
mdp1 = &td1->td_proc->p_md;
mdp2 = &p2->p_md;
@@ -336,6 +339,7 @@
*/
bcopy(td0->td_pcb, pcb2, sizeof(*pcb2));
pcb2->pcb_flags &= ~PCB_FPUINITDONE;
+ pcb2->pcb_full_iret = 1;
/*
* Create a new fresh stack for the new thread.
@@ -450,6 +454,7 @@
}
#endif
td->td_pcb->pcb_fsbase = (register_t)tls_base;
+ td->td_pcb->pcb_full_iret = 1;
return (0);
}
==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#30 (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/amd64/conf/GENERIC,v 1.530 2009/07/02 18:24:37 ed Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.531 2009/07/11 15:02:45 rpaulo Exp $
cpu HAMMER
ident GENERIC
@@ -258,6 +258,7 @@
device wlan # 802.11 support
options IEEE80211_DEBUG # enable debug msgs
options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
+options IEEE80211_SUPPORT_MESH # enable 802.11s D3.0 support
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
==== //depot/projects/usb/src/sys/amd64/ia32/ia32_exception.S#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.6 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.7 2009/07/09 09:34:11 kib Exp $
*/
#include <machine/asmacros.h>
@@ -42,10 +42,16 @@
SUPERALIGN_TEXT
IDTVEC(int0x80_syscall)
swapgs
- sti
pushq $2 /* sizeof "int 0x80" */
subq $TF_ERR,%rsp /* skip over tf_trapno */
movq %rdi,TF_RDI(%rsp)
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
+ movw %fs,TF_FS(%rsp)
+ movw %gs,TF_GS(%rsp)
+ movw %es,TF_ES(%rsp)
+ movw %ds,TF_DS(%rsp)
+ sti
movq %rsi,TF_RSI(%rsp)
movq %rdx,TF_RDX(%rsp)
movq %rcx,TF_RCX(%rsp)
@@ -60,10 +66,6 @@
movq %r13,TF_R13(%rsp)
movq %r14,TF_R14(%rsp)
movq %r15,TF_R15(%rsp)
- movw %fs,TF_FS(%rsp)
- movw %gs,TF_GS(%rsp)
- movw %es,TF_ES(%rsp)
- movw %ds,TF_DS(%rsp)
movl $TF_HASSEGS,TF_FLAGS(%rsp)
FAKE_MCOUNT(TF_RIP(%rsp))
movq %rsp, %rdi
==== //depot/projects/usb/src/sys/amd64/ia32/ia32_reg.c#3 (text+ko) ====
@@ -23,11 +23,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.4 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.5 2009/07/09 09:34:11 kib Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.4 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.5 2009/07/09 09:34:11 kib Exp $");
#include "opt_compat.h"
@@ -125,6 +125,7 @@
tp->tf_fs = regs->r_fs;
tp->tf_es = regs->r_es;
tp->tf_ds = regs->r_ds;
+ td->td_pcb->pcb_full_iret = 1;
tp->tf_flags = TF_HASSEGS;
tp->tf_rdi = regs->r_edi;
tp->tf_rsi = regs->r_esi;
==== //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.22 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.23 2009/07/09 09:34:11 kib Exp $");
#include "opt_compat.h"
@@ -159,6 +159,7 @@
ia32_get_fpcontext(td, mcp);
mcp->mc_fsbase = td->td_pcb->pcb_fsbase;
mcp->mc_gsbase = td->td_pcb->pcb_gsbase;
+ td->td_pcb->pcb_full_iret = 1;
return (0);
}
@@ -201,6 +202,7 @@
tp->tf_rsp = mcp->mc_esp;
tp->tf_ss = mcp->mc_ss;
td->td_pcb->pcb_flags |= PCB_FULLCTX;
+ td->td_pcb->pcb_full_iret = 1;
return (0);
}
@@ -394,6 +396,7 @@
regs->tf_ss = _udatasel;
regs->tf_ds = _udatasel;
regs->tf_es = _udatasel;
+ td->td_pcb->pcb_full_iret = 1;
/* leave user %fs and %gs untouched */
PROC_LOCK(p);
mtx_lock(&psp->ps_mtx);
@@ -514,6 +517,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list