PERFORCE change 177762 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Wed May 5 14:46:16 UTC 2010
http://p4web.freebsd.org/@@177762?ac=10
Change 177762 by hselasky at hselasky_laptop001 on 2010/05/05 14:45:27
IFC @ 177760
- Integrate latest USB changes.
Affected files ...
.. //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/exception.S#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/io.c#4 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#38 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/trap.c#23 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#38 integrate
.. //depot/projects/usb/src/sys/amd64/include/iodev.h#4 integrate
.. //depot/projects/usb/src/sys/amd64/include/pmap.h#12 integrate
.. //depot/projects/usb/src/sys/amd64/include/proc.h#4 integrate
.. //depot/projects/usb/src/sys/amd64/include/vmparam.h#11 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#14 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate
.. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#13 integrate
.. //depot/projects/usb/src/sys/arm/arm/identcpu.c#11 integrate
.. //depot/projects/usb/src/sys/arm/arm/pmap.c#25 integrate
.. //depot/projects/usb/src/sys/arm/at91/if_ate.c#18 integrate
.. //depot/projects/usb/src/sys/arm/include/cpuconf.h#6 integrate
.. //depot/projects/usb/src/sys/arm/include/cpufunc.h#9 integrate
.. //depot/projects/usb/src/sys/arm/include/pmap.h#12 integrate
.. //depot/projects/usb/src/sys/arm/include/proc.h#3 integrate
.. //depot/projects/usb/src/sys/arm/mv/files.mv#7 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#14 integrate
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#26 integrate
.. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#11 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#12 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#6 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#12 integrate
.. //depot/projects/usb/src/sys/cam/cam_ccb.h#13 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#30 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#13 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#12 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#23 integrate
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#5 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#56 integrate
.. //depot/projects/usb/src/sys/conf/files#95 integrate
.. //depot/projects/usb/src/sys/conf/files.sparc64#18 integrate
.. //depot/projects/usb/src/sys/conf/files.sun4v#10 integrate
.. //depot/projects/usb/src/sys/conf/kmod.mk#16 integrate
.. //depot/projects/usb/src/sys/conf/options#48 integrate
.. //depot/projects/usb/src/sys/conf/options.arm#13 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adisasm.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllisting.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslpredef.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslresource.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconfig.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg1.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exsystem.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acevents.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acinterp.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/osunixxf.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbutils.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbxface.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utcopy.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uttrack.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate
.. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdHardware.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ae/if_ae.c#9 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp.c#11 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#14 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.h#8 integrate
.. //depot/projects/usb/src/sys/dev/ale/if_ale.c#9 integrate
.. //depot/projects/usb/src/sys/dev/an/if_an.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.c#26 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#18 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#38 integrate
.. //depot/projects/usb/src/sys/dev/atkbdc/atkbdc.c#3 integrate
.. //depot/projects/usb/src/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate
.. //depot/projects/usb/src/sys/dev/atkbdc/atkbdc_isa.c#4 integrate
.. //depot/projects/usb/src/sys/dev/atkbdc/atkbdcreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/bce/if_bce.c#27 integrate
.. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#17 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bge.c#30 integrate
.. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#7 integrate
.. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#3 integrate
.. //depot/projects/usb/src/sys/dev/cas/if_cas.c#4 integrate
.. //depot/projects/usb/src/sys/dev/cas/if_casreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ce/if_ce.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ciss/ciss.c#21 integrate
.. //depot/projects/usb/src/sys/dev/cm/smc90cx6.c#8 integrate
.. //depot/projects/usb/src/sys/dev/cp/if_cp.c#10 integrate
.. //depot/projects/usb/src/sys/dev/cs/if_cs.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ctau/if_ct.c#10 integrate
.. //depot/projects/usb/src/sys/dev/cx/if_cx.c#9 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_ioctl.h#7 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#29 integrate
.. //depot/projects/usb/src/sys/dev/drm/drmP.h#18 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_hashtab.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_mm.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_sman.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/via_dmablit.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/via_video.c#2 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_em.c#19 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ep/if_ep.c#8 integrate
.. //depot/projects/usb/src/sys/dev/esp/esp_sbus.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ex/if_ex.c#6 integrate
.. //depot/projects/usb/src/sys/dev/fe/if_fe.c#7 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#18 integrate
.. //depot/projects/usb/src/sys/dev/ie/if_ie.c#5 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#7 integrate
.. //depot/projects/usb/src/sys/dev/io/iodev.c#5 integrate
.. //depot/projects/usb/src/sys/dev/io/iodev.h#1 branch
.. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#16 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_pci.c#10 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#11 integrate
.. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#16 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#18 integrate
.. //depot/projects/usb/src/sys/dev/le/lance.c#4 integrate
.. //depot/projects/usb/src/sys/dev/malo/if_malo.c#9 integrate
.. //depot/projects/usb/src/sys/dev/md/md.c#16 integrate
.. //depot/projects/usb/src/sys/dev/mii/brgphy.c#15 integrate
.. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#12 integrate
.. //depot/projects/usb/src/sys/dev/mii/miidevs#19 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt.c#10 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt.h#12 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#15 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_msk.c#22 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#15 integrate
.. //depot/projects/usb/src/sys/dev/mvs/mvs.c#1 branch
.. //depot/projects/usb/src/sys/dev/mvs/mvs.h#1 branch
.. //depot/projects/usb/src/sys/dev/mvs/mvs_if.m#1 branch
.. //depot/projects/usb/src/sys/dev/mvs/mvs_pci.c#1 branch
.. //depot/projects/usb/src/sys/dev/mvs/mvs_soc.c#1 branch
.. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#9 integrate
.. //depot/projects/usb/src/sys/dev/my/if_my.c#10 integrate
.. //depot/projects/usb/src/sys/dev/nxge/if_nxge.c#5 integrate
.. //depot/projects/usb/src/sys/dev/pdq/pdq_ifsubr.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#10 integrate
.. //depot/projects/usb/src/sys/dev/quicc/quicc_bfe.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ral/rt2560.c#16 integrate
.. //depot/projects/usb/src/sys/dev/ral/rt2661.c#15 integrate
.. //depot/projects/usb/src/sys/dev/sbni/if_sbni.c#6 integrate
.. //depot/projects/usb/src/sys/dev/sge/if_sge.c#2 integrate
.. //depot/projects/usb/src/sys/dev/sge/if_sgereg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.c#13 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.h#7 integrate
.. //depot/projects/usb/src/sys/dev/smc/if_smc.c#5 integrate
.. //depot/projects/usb/src/sys/dev/sn/if_sn.c#5 integrate
.. //depot/projects/usb/src/sys/dev/snc/dp83932.c#5 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/buffer.c#7 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/buffer.h#8 integrate
.. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ti/if_ti.c#10 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_dev_ns8250.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#26 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#20 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#27 integrate
.. //depot/projects/usb/src/sys/dev/vx/if_vx.c#4 integrate
.. //depot/projects/usb/src/sys/dev/wi/if_wi.c#16 integrate
.. //depot/projects/usb/src/sys/dev/wl/if_wl.c#7 integrate
.. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#18 integrate
.. //depot/projects/usb/src/sys/dev/xe/if_xe.c#5 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_commonkrpc.c#5 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#6 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#9 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#11 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs.h#5 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#10 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#6 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#8 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#11 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#8 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#16 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#11 integrate
.. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#8 integrate
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#12 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#25 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#12 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#12 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#20 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_if.m#7 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#9 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#11 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#8 integrate
.. //depot/projects/usb/src/sys/i386/i386/bpf_jit_machdep.c#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/bpf_jit_machdep.h#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/io.c#4 integrate
.. //depot/projects/usb/src/sys/i386/i386/pmap.c#34 integrate
.. //depot/projects/usb/src/sys/i386/include/iodev.h#4 integrate
.. //depot/projects/usb/src/sys/i386/include/pmap.h#17 integrate
.. //depot/projects/usb/src/sys/i386/include/proc.h#5 integrate
.. //depot/projects/usb/src/sys/i386/xen/pmap.c#22 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/iodev_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#20 integrate
.. //depot/projects/usb/src/sys/ia64/include/iodev.h#2 integrate
.. //depot/projects/usb/src/sys/ia64/include/pmap.h#7 integrate
.. //depot/projects/usb/src/sys/ia64/include/proc.h#3 integrate
.. //depot/projects/usb/src/sys/kern/imgact_elf.c#19 integrate
.. //depot/projects/usb/src/sys/kern/kern_alq.c#12 integrate
.. //depot/projects/usb/src/sys/kern/kern_descrip.c#28 integrate
.. //depot/projects/usb/src/sys/kern/kern_exec.c#25 integrate
.. //depot/projects/usb/src/sys/kern/kern_gzio.c#2 integrate
.. //depot/projects/usb/src/sys/kern/kern_ntptime.c#6 integrate
.. //depot/projects/usb/src/sys/kern/kern_proc.c#28 integrate
.. //depot/projects/usb/src/sys/kern/kern_resource.c#13 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#26 integrate
.. //depot/projects/usb/src/sys/kern/kern_thread.c#18 integrate
.. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#11 integrate
.. //depot/projects/usb/src/sys/kern/subr_witness.c#23 integrate
.. //depot/projects/usb/src/sys/kern/sys_pipe.c#16 integrate
.. //depot/projects/usb/src/sys/kern/sys_process.c#20 integrate
.. //depot/projects/usb/src/sys/kern/uipc_cow.c#4 integrate
.. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#14 integrate
.. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#26 integrate
.. //depot/projects/usb/src/sys/kern/vfs_bio.c#27 integrate
.. //depot/projects/usb/src/sys/kern/vfs_subr.c#32 integrate
.. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#9 integrate
.. //depot/projects/usb/src/sys/mips/atheros/if_arge.c#3 integrate
.. //depot/projects/usb/src/sys/mips/cavium/uart_dev_oct16550.c#2 integrate
.. //depot/projects/usb/src/sys/mips/conf/AR71XX#5 integrate
.. //depot/projects/usb/src/sys/mips/conf/SWARM#5 integrate
.. //depot/projects/usb/src/sys/mips/include/pmap.h#9 integrate
.. //depot/projects/usb/src/sys/mips/include/proc.h#5 integrate
.. //depot/projects/usb/src/sys/mips/include/vmparam.h#3 integrate
.. //depot/projects/usb/src/sys/mips/mips/db_trace.c#5 integrate
.. //depot/projects/usb/src/sys/mips/mips/exception.S#6 integrate
.. //depot/projects/usb/src/sys/mips/mips/pmap.c#19 integrate
.. //depot/projects/usb/src/sys/mips/mips/tick.c#7 integrate
.. //depot/projects/usb/src/sys/mips/sibyte/sb_machdep.c#5 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#51 integrate
.. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#13 integrate
.. //depot/projects/usb/src/sys/modules/mvs/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/usb/usb/Makefile#3 integrate
.. //depot/projects/usb/src/sys/net/bpf.c#28 integrate
.. //depot/projects/usb/src/sys/net/bpf_zerocopy.c#5 integrate
.. //depot/projects/usb/src/sys/net/bpfdesc.h#9 integrate
.. //depot/projects/usb/src/sys/net/flowtable.c#17 integrate
.. //depot/projects/usb/src/sys/net/if.c#48 integrate
.. //depot/projects/usb/src/sys/net/if_ef.c#14 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#20 integrate
.. //depot/projects/usb/src/sys/net/if_gif.h#11 integrate
.. //depot/projects/usb/src/sys/net/if_gre.c#16 integrate
.. //depot/projects/usb/src/sys/net/if_stf.c#16 integrate
.. //depot/projects/usb/src/sys/net/route.c#30 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#35 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#33 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_amrr.c#6 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#12 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#29 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_rssadapt.c#3 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#29 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_base.c#23 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#18 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_fec.c#8 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#20 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_pipe.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tty.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/icmp6.h#9 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#35 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#24 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#44 integrate
.. //depot/projects/usb/src/sys/netinet/in_gif.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/in_proto.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/in_rmx.c#22 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#36 integrate
.. //depot/projects/usb/src/sys/netinet/ip_var.h#18 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#35 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#16 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_indata.c#26 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_output.c#30 integrate
.. //depot/projects/usb/src/sys/netinet/sctputil.c#31 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#18 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_input.c#32 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_output.c#23 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_reass.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_sack.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_subr.c#32 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#28 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_var.h#26 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#29 integrate
.. //depot/projects/usb/src/sys/netinet/udp_var.h#13 integrate
.. //depot/projects/usb/src/sys/netinet6/frag6.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#30 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#38 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_gif.c#15 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#32 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_proto.c#22 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#21 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_src.c#24 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_var.h#14 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#33 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#22 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_var.h#18 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#32 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.h#11 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#21 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#26 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#28 integrate
.. //depot/projects/usb/src/sys/netinet6/scope6.c#16 integrate
.. //depot/projects/usb/src/sys/netipsec/ah_var.h#4 integrate
.. //depot/projects/usb/src/sys/netipsec/esp_var.h#4 integrate
.. //depot/projects/usb/src/sys/netipsec/ipcomp_var.h#5 integrate
.. //depot/projects/usb/src/sys/netipsec/ipip_var.h#5 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.c#25 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.h#17 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec6.h#10 integrate
.. //depot/projects/usb/src/sys/netipsec/key.c#29 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_esp.c#13 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#21 integrate
.. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#18 integrate
.. //depot/projects/usb/src/sys/pci/if_rl.c#13 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#12 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#12 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#19 integrate
.. //depot/projects/usb/src/sys/powerpc/include/pmap.h#10 integrate
.. //depot/projects/usb/src/sys/powerpc/include/proc.h#2 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/mmu_if.m#8 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/pmap_dispatch.c#12 integrate
.. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#18 integrate
.. //depot/projects/usb/src/sys/sparc64/include/asi.h#5 integrate
.. //depot/projects/usb/src/sys/sparc64/include/cache.h#5 integrate
.. //depot/projects/usb/src/sys/sparc64/include/mcntl.h#1 branch
.. //depot/projects/usb/src/sys/sparc64/include/ofw_machdep.h#3 integrate
.. //depot/projects/usb/src/sys/sparc64/include/pmap.h#6 integrate
.. //depot/projects/usb/src/sys/sparc64/include/proc.h#2 integrate
.. //depot/projects/usb/src/sys/sparc64/isa/isa.c#8 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/cache.c#5 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/cheetah.c#6 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/identcpu.c#7 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/interrupt.S#4 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/locore.S#5 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#22 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/mp_locore.S#5 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#12 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#9 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/ofw_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#17 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/tick.c#6 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/zeus.c#1 branch
.. //depot/projects/usb/src/sys/sun4v/include/ofw_machdep.h#3 integrate
.. //depot/projects/usb/src/sys/sun4v/include/pmap.h#4 integrate
.. //depot/projects/usb/src/sys/sun4v/include/proc.h#2 integrate
.. //depot/projects/usb/src/sys/sun4v/sun4v/pmap.c#11 integrate
.. //depot/projects/usb/src/sys/sys/_task.h#3 integrate
.. //depot/projects/usb/src/sys/sys/alq.h#2 integrate
.. //depot/projects/usb/src/sys/sys/buf.h#9 integrate
.. //depot/projects/usb/src/sys/sys/mount.h#23 integrate
.. //depot/projects/usb/src/sys/sys/param.h#52 integrate
.. //depot/projects/usb/src/sys/sys/proc.h#28 integrate
.. //depot/projects/usb/src/sys/sys/resource.h#7 integrate
.. //depot/projects/usb/src/sys/sys/resourcevar.h#6 integrate
.. //depot/projects/usb/src/sys/sys/taskqueue.h#5 integrate
.. //depot/projects/usb/src/sys/sys/user.h#13 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_alloc.c#13 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_balloc.c#6 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_extern.h#7 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_inode.c#10 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#15 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#16 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_subr.c#2 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#24 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_vnops.c#15 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/fs.h#7 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/softdep.h#2 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/dinode.h#3 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/inode.h#8 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#12 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_extern.h#4 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#17 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#23 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#4 integrate
.. //depot/projects/usb/src/sys/vm/device_pager.c#13 integrate
.. //depot/projects/usb/src/sys/vm/phys_pager.c#7 integrate
.. //depot/projects/usb/src/sys/vm/pmap.h#9 integrate
.. //depot/projects/usb/src/sys/vm/sg_pager.c#3 integrate
.. //depot/projects/usb/src/sys/vm/swap_pager.c#20 integrate
.. //depot/projects/usb/src/sys/vm/uma_core.c#13 integrate
.. //depot/projects/usb/src/sys/vm/vm_contig.c#16 integrate
.. //depot/projects/usb/src/sys/vm/vm_fault.c#22 integrate
.. //depot/projects/usb/src/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/usb/src/sys/vm/vm_kern.c#14 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#26 integrate
.. //depot/projects/usb/src/sys/vm/vm_mmap.c#24 integrate
.. //depot/projects/usb/src/sys/vm/vm_object.c#24 integrate
.. //depot/projects/usb/src/sys/vm/vm_page.c#23 integrate
.. //depot/projects/usb/src/sys/vm/vm_page.h#14 integrate
.. //depot/projects/usb/src/sys/vm/vm_pageout.c#21 integrate
.. //depot/projects/usb/src/sys/vm/vm_param.h#4 integrate
.. //depot/projects/usb/src/sys/vm/vnode_pager.c#21 integrate
Differences ...
==== //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.21 2009/11/23 22:23:19 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.22 2010/04/22 23:47:19 jkim Exp $");
#ifdef _KERNEL
#include "opt_bpf.h"
@@ -419,62 +419,77 @@
break;
case BPF_JMP|BPF_JA:
- JMP(stream.refs[stream.bpf_pc + ins->k] -
- stream.refs[stream.bpf_pc]);
+ JUMP(ins->k);
break;
case BPF_JMP|BPF_JGT|BPF_K:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
CMPid(ins->k, EAX);
JCC(JA, JBE);
break;
case BPF_JMP|BPF_JGE|BPF_K:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
CMPid(ins->k, EAX);
JCC(JAE, JB);
break;
case BPF_JMP|BPF_JEQ|BPF_K:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
CMPid(ins->k, EAX);
JCC(JE, JNE);
break;
case BPF_JMP|BPF_JSET|BPF_K:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
TESTid(ins->k, EAX);
JCC(JNE, JE);
break;
case BPF_JMP|BPF_JGT|BPF_X:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
CMPrd(EDX, EAX);
JCC(JA, JBE);
break;
case BPF_JMP|BPF_JGE|BPF_X:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
CMPrd(EDX, EAX);
JCC(JAE, JB);
break;
case BPF_JMP|BPF_JEQ|BPF_X:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
CMPrd(EDX, EAX);
JCC(JE, JNE);
break;
case BPF_JMP|BPF_JSET|BPF_X:
- if (ins->jt == 0 && ins->jf == 0)
+ if (ins->jt == ins->jf) {
+ JUMP(ins->jt);
break;
+ }
TESTrd(EDX, EAX);
JCC(JNE, JE);
break;
==== //depot/projects/usb/src/sys/amd64/amd64/bpf_jit_machdep.h#5 (text+ko) ====
@@ -28,7 +28,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/sys/amd64/amd64/bpf_jit_machdep.h,v 1.14 2009/11/23 22:23:19 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.15 2010/04/22 23:47:19 jkim Exp $
*/
#ifndef _BPF_JIT_MACHDEP_H_
@@ -473,4 +473,10 @@
} \
} while (0)
+#define JUMP(off) do { \
+ if ((off) != 0) \
+ JMP(stream.refs[stream.bpf_pc + (off)] - \
+ stream.refs[stream.bpf_pc]); \
+} while (0)
+
#endif /* _BPF_JIT_MACHDEP_H_ */
==== //depot/projects/usb/src/sys/amd64/amd64/exception.S#14 (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.144 2010/04/14 20:04:55 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $
*/
#include "opt_atpic.h"
@@ -50,14 +50,14 @@
.bss
.globl dtrace_invop_jump_addr
.align 8
- .type dtrace_invop_jump_addr, @object
- .size dtrace_invop_jump_addr, 8
+ .type dtrace_invop_jump_addr, at object
+ .size dtrace_invop_jump_addr,8
dtrace_invop_jump_addr:
.zero 8
.globl dtrace_invop_calltrap_addr
.align 8
- .type dtrace_invop_calltrap_addr, @object
- .size dtrace_invop_calltrap_addr, 8
+ .type dtrace_invop_calltrap_addr, at object
+ .size dtrace_invop_calltrap_addr,8
dtrace_invop_calltrap_addr:
.zero 8
#endif
@@ -157,7 +157,6 @@
* kernel from userland. Reenable interrupts if they were enabled
* before the trap. This approximates SDT_SYS386TGT on the i386 port.
*/
-
SUPERALIGN_TEXT
.globl alltraps
.type alltraps, at function
@@ -211,16 +210,16 @@
* Set our jump address for the jump back in the event that
* the breakpoint wasn't caused by DTrace at all.
*/
- movq $calltrap, dtrace_invop_calltrap_addr(%rip)
+ movq $calltrap,dtrace_invop_calltrap_addr(%rip)
/* Jump to the code hooked in by DTrace. */
- movq dtrace_invop_jump_addr, %rax
+ movq dtrace_invop_jump_addr,%rax
jmpq *dtrace_invop_jump_addr
#endif
.globl calltrap
.type calltrap, at function
calltrap:
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
MEXITCOUNT
jmp doreti /* Handle any pending ASTs */
@@ -274,9 +273,11 @@
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
-1: movq %rsp, %rdi
+1:
+ movq %rsp,%rdi
call dblfault_handler
-2: hlt
+2:
+ hlt
jmp 2b
IDTVEC(page)
@@ -369,7 +370,7 @@
movq %r15,TF_R15(%rsp) /* C preserved */
movl $TF_HASSEGS,TF_FLAGS(%rsp)
FAKE_MCOUNT(TF_RIP(%rsp))
- movq %rsp, %rdi
+ movq %rsp,%rdi
call syscall
movq PCPU(CURPCB),%rax
andq $~PCB_FULLCTX,PCB_FLAGS(%rax)
@@ -456,7 +457,7 @@
/* Note: this label is also used by ddb and gdb: */
nmi_calltrap:
FAKE_MCOUNT(TF_RIP(%rsp))
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
MEXITCOUNT
#ifdef HWPMC_HOOKS
@@ -555,9 +556,9 @@
iretq
ENTRY(fork_trampoline)
- movq %r12, %rdi /* function */
- movq %rbx, %rsi /* arg1 */
- movq %rsp, %rdx /* trapframe pointer */
+ movq %r12,%rdi /* function */
+ movq %rbx,%rsi /* arg1 */
+ movq %rsp,%rdx /* trapframe pointer */
call fork_exit
MEXITCOUNT
jmp doreti /* Handle any ASTs */
@@ -628,7 +629,7 @@
testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax)
je doreti_exit
sti
- movq %rsp, %rdi /* pass a pointer to the trapframe */
+ movq %rsp,%rdi /* pass a pointer to the trapframe */
call ast
jmp doreti_ast
@@ -648,8 +649,8 @@
* Do not reload segment registers for kernel.
* Since we do not reload segments registers with sane
* values on kernel entry, descriptors referenced by
- * segments registers may be not valid. This is fatal
- * for the usermode, but is innocent for the kernel.
+ * segments registers might be not valid. This is fatal
+ * for user mode, but is not a problem for the kernel.
*/
testb $SEL_RPL_MASK,TF_CS(%rsp)
jz ld_regs
@@ -662,14 +663,16 @@
/* Restore %fs and fsbase */
movw TF_FS(%rsp),%ax
.globl ld_fs
-ld_fs: movw %ax,%fs
+ld_fs:
+ movw %ax,%fs
cmpw $KUF32SEL,%ax
jne 1f
movl $MSR_FSBASE,%ecx
movl PCB_FSBASE(%r8),%eax
movl PCB_FSBASE+4(%r8),%edx
.globl ld_fsbase
-ld_fsbase: wrmsr
+ld_fsbase:
+ wrmsr
1:
/* Restore %gs and gsbase */
movw TF_GS(%rsp),%si
@@ -678,7 +681,8 @@
movl $MSR_GSBASE,%ecx
rdmsr
.globl ld_gs
-ld_gs: movw %si,%gs
+ld_gs:
+ movw %si,%gs
wrmsr
popfq
cmpw $KUG32SEL,%si
@@ -687,12 +691,17 @@
movl PCB_GSBASE(%r8),%eax
movl PCB_GSBASE+4(%r8),%edx
.globl ld_gsbase
-ld_gsbase: wrmsr
-1: .globl ld_es
-ld_es: movw TF_ES(%rsp),%es
+ld_gsbase:
+ wrmsr
+1:
+ .globl ld_es
+ld_es:
+ movw TF_ES(%rsp),%es
.globl ld_ds
-ld_ds: movw TF_DS(%rsp),%ds
-ld_regs:movq TF_RDI(%rsp),%rdi
+ld_ds:
+ movw TF_DS(%rsp),%ds
+ld_regs:
+ movq TF_RDI(%rsp),%rdi
movq TF_RSI(%rsp),%rsi
movq TF_RDX(%rsp),%rdx
movq TF_RCX(%rsp),%rcx
@@ -711,7 +720,8 @@
jz 1f /* keep running with kernel GS.base */
cli
swapgs
-1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */
+1:
+ addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */
.globl doreti_iret
doreti_iret:
iretq
@@ -738,7 +748,8 @@
testl $PSL_I,TF_RFLAGS(%rsp)
jz 1f
sti
-1: movw %fs,TF_FS(%rsp)
+1:
+ movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
@@ -768,7 +779,7 @@
.globl ds_load_fault
ds_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUDSEL,TF_DS(%rsp)
jmp doreti
@@ -777,7 +788,7 @@
.globl es_load_fault
es_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUDSEL,TF_ES(%rsp)
jmp doreti
@@ -786,7 +797,7 @@
.globl fs_load_fault
fs_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUF32SEL,TF_FS(%rsp)
jmp doreti
@@ -796,7 +807,7 @@
gs_load_fault:
popfq
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUG32SEL,TF_GS(%rsp)
jmp doreti
@@ -805,7 +816,7 @@
.globl fsbase_load_fault
fsbase_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movq PCPU(CURTHREAD),%r8
movq TD_PCB(%r8),%r8
@@ -816,7 +827,7 @@
.globl gsbase_load_fault
gsbase_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movq PCPU(CURTHREAD),%r8
movq TD_PCB(%r8),%r8
==== //depot/projects/usb/src/sys/amd64/amd64/io.c#4 (text+ko) ====
@@ -25,63 +25,35 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.3 2010/01/11 18:10:13 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.4 2010/04/28 15:38:01 attilio Exp $");
#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/fcntl.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/priv.h>
#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/systm.h>
-#include <machine/db_machdep.h>
#include <machine/frame.h>
+#include <machine/iodev.h>
#include <machine/psl.h>
-#include <machine/specialreg.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <machine/iodev.h>
-
-/* ARGSUSED */
int
-ioopen(struct cdev *dev __unused, int flags __unused, int fmt __unused,
- struct thread *td)
+iodev_open(struct thread *td)
{
- int error;
- error = priv_check(td, PRIV_IO);
- if (error != 0)
- return (error);
- error = securelevel_gt(td->td_ucred, 0);
- if (error != 0)
- return (error);
-
td->td_frame->tf_rflags |= PSL_IOPL;
-
return (0);
}
-/* ARGSUSED */
int
-ioclose(struct cdev *dev __unused, int flags __unused, int fmt __unused,
- struct thread *td)
+iodev_close(struct thread *td)
{
+
td->td_frame->tf_rflags &= ~PSL_IOPL;
-
return (0);
}
/* ARGSUSED */
int
-ioioctl(struct cdev *dev __unused, u_long cmd __unused, caddr_t data __unused,
- int fflag __unused, struct thread *td __unused)
+iodev_ioctl(u_long cmd __unused, caddr_t data __unused)
{
- return (ENXIO);
+ return (ENOIOCTL);
}
==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#38 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.688 2010/03/27 23:53:47 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $");
/*
* Manages physical address maps.
@@ -236,6 +236,7 @@
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 boolean_t pmap_is_referenced_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);
static void pmap_pde_attr(pd_entry_t *pde, int cache_bits);
@@ -283,7 +284,7 @@
vm_offset_t newaddr = addr;
newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
- return newaddr;
+ return (newaddr);
}
/********************/
@@ -294,7 +295,7 @@
static __inline vm_pindex_t
pmap_pde_pindex(vm_offset_t va)
{
- return va >> PDRSHIFT;
+ return (va >> PDRSHIFT);
}
@@ -353,7 +354,7 @@
pml4e = pmap_pml4e(pmap, va);
if ((*pml4e & PG_V) == 0)
- return NULL;
+ return (NULL);
return (pmap_pml4e_to_pdpe(pml4e, va));
}
@@ -375,7 +376,7 @@
pdpe = pmap_pdpe(pmap, va);
if (pdpe == NULL || (*pdpe & PG_V) == 0)
- return NULL;
+ return (NULL);
return (pmap_pdpe_to_pde(pdpe, va));
}
@@ -397,13 +398,28 @@
pde = pmap_pde(pmap, va);
if (pde == NULL || (*pde & PG_V) == 0)
- return NULL;
+ return (NULL);
if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */
return ((pt_entry_t *)pde);
return (pmap_pde_to_pte(pde, va));
}
+static __inline void
+pmap_resident_count_inc(pmap_t pmap, int count)
+{
+
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+ pmap->pm_stats.resident_count += count;
+}
+
+static __inline void
+pmap_resident_count_dec(pmap_t pmap, int count)
+{
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+ pmap->pm_stats.resident_count -= count;
+}
+
PMAP_INLINE pt_entry_t *
vtopte(vm_offset_t va)
{
@@ -777,7 +793,6 @@
SYSCTL_ULONG(_vm_pmap_pdpe, OID_AUTO, demotions, CTLFLAG_RD,
&pmap_pdpe_demotions, 0, "1GB page demotions");
-
/***************************************************
* Low level helper routines.....
***************************************************/
@@ -1184,15 +1199,20 @@
{
pd_entry_t pde, *pdep;
pt_entry_t pte;
+ vm_paddr_t pa;
vm_page_t m;
+ pa = 0;
m = NULL;
- vm_page_lock_queues();
PMAP_LOCK(pmap);
+retry:
pdep = pmap_pde(pmap, va);
if (pdep != NULL && (pde = *pdep)) {
if (pde & PG_PS) {
if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) {
+ if (vm_page_pa_tryrelock(pmap, (pde & PG_PS_FRAME) |
+ (va & PDRMASK), &pa))
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list