PERFORCE change 149663 for review
Marius Strobl
marius at FreeBSD.org
Fri Sep 12 14:40:19 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=149663
Change 149663 by marius at flak on 2008/09/12 14:39:15
IFC @149569
Affected files ...
.. //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.c#4 integrate
.. //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.h#4 integrate
.. //depot/projects/usiii/amd64/amd64/cpu_switch.S#4 integrate
.. //depot/projects/usiii/amd64/amd64/genassym.c#7 integrate
.. //depot/projects/usiii/amd64/amd64/machdep.c#9 integrate
.. //depot/projects/usiii/amd64/amd64/mp_machdep.c#5 integrate
.. //depot/projects/usiii/amd64/amd64/trap.c#6 integrate
.. //depot/projects/usiii/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/usiii/amd64/include/pcb.h#4 integrate
.. //depot/projects/usiii/amd64/include/pcpu.h#4 integrate
.. //depot/projects/usiii/amd64/include/segments.h#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_genassym.c#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_locore.s#2 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_machdep.c#4 integrate
.. //depot/projects/usiii/amd64/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/usiii/arm/at91/at91.c#5 integrate
.. //depot/projects/usiii/arm/at91/at91_mci.c#3 integrate
.. //depot/projects/usiii/arm/at91/at91_ssc.c#2 integrate
.. //depot/projects/usiii/arm/at91/if_ate.c#5 integrate
.. //depot/projects/usiii/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/usiii/arm/conf/KB920X#6 integrate
.. //depot/projects/usiii/arm/conf/NSLU#2 integrate
.. //depot/projects/usiii/boot/common/dev_net.c#4 integrate
.. //depot/projects/usiii/boot/common/devopen.c#2 integrate
.. //depot/projects/usiii/boot/forth/loader.conf#6 integrate
.. //depot/projects/usiii/boot/powerpc/uboot/Makefile#2 integrate
.. //depot/projects/usiii/boot/powerpc/uboot/metadata.c#3 delete
.. //depot/projects/usiii/boot/powerpc/uboot/start.S#2 integrate
.. //depot/projects/usiii/boot/sparc64/loader/main.c#5 integrate
.. //depot/projects/usiii/boot/uboot/common/Makefile.inc#2 integrate
.. //depot/projects/usiii/boot/uboot/common/main.c#3 integrate
.. //depot/projects/usiii/boot/uboot/common/metadata.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/Makefile#3 integrate
.. //depot/projects/usiii/boot/uboot/lib/console.c#3 integrate
.. //depot/projects/usiii/boot/uboot/lib/elf_freebsd.c#3 integrate
.. //depot/projects/usiii/boot/uboot/lib/glue.c#4 integrate
.. //depot/projects/usiii/boot/uboot/lib/glue.h#3 integrate
.. //depot/projects/usiii/boot/uboot/lib/net.c#4 integrate
.. //depot/projects/usiii/boot/uboot/lib/reboot.c#3 integrate
.. //depot/projects/usiii/boot/uboot/lib/time.c#3 integrate
.. //depot/projects/usiii/bsm/audit_kevents.h#4 integrate
.. //depot/projects/usiii/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate
.. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate
.. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#9 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#9 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#9 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#9 integrate
.. //depot/projects/usiii/compat/freebsd32/syscalls.master#9 integrate
.. //depot/projects/usiii/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/usiii/compat/linux/linux_file.c#7 integrate
.. //depot/projects/usiii/compat/linux/linux_getcwd.c#4 integrate
.. //depot/projects/usiii/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/usiii/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/usiii/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/usiii/compat/ndis/subr_ndis.c#6 integrate
.. //depot/projects/usiii/compat/svr4/svr4_fcntl.c#5 integrate
.. //depot/projects/usiii/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/usiii/conf/NOTES#14 integrate
.. //depot/projects/usiii/conf/files.i386#10 integrate
.. //depot/projects/usiii/conf/files.mips#2 integrate
.. //depot/projects/usiii/conf/files.pc98#6 integrate
.. //depot/projects/usiii/conf/files.powerpc#8 integrate
.. //depot/projects/usiii/conf/files.sparc64#9 integrate
.. //depot/projects/usiii/conf/files.sun4v#5 integrate
.. //depot/projects/usiii/conf/options#15 integrate
.. //depot/projects/usiii/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/usiii/contrib/dev/ath/COPYRIGHT#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/README#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/ah_desc.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/ah_devid.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/ah_soc.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap30.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap43.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap51.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/ap61.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/wackelf.c#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ath/public/wisoc.inc#1 branch
.. //depot/projects/usiii/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch
.. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate
.. //depot/projects/usiii/contrib/dev/ath/version.h#2 integrate
.. //depot/projects/usiii/dev/acpi_support/acpi_fujitsu.c#2 integrate
.. //depot/projects/usiii/dev/asmc/asmc.c#3 integrate
.. //depot/projects/usiii/dev/asmc/asmcvar.h#3 integrate
.. //depot/projects/usiii/dev/ata/ata-chipset.c#10 integrate
.. //depot/projects/usiii/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/usiii/dev/ath/if_athvar.h#5 integrate
.. //depot/projects/usiii/dev/bce/if_bce.c#7 integrate
.. //depot/projects/usiii/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/usiii/dev/bge/if_bge.c#12 integrate
.. //depot/projects/usiii/dev/bm/if_bm.c#2 integrate
.. //depot/projects/usiii/dev/cas/if_casreg.h#2 edit
.. //depot/projects/usiii/dev/ciss/ciss.c#7 integrate
.. //depot/projects/usiii/dev/ciss/cissreg.h#3 integrate
.. //depot/projects/usiii/dev/cpuctl/cpuctl.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#7 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_ioctl.h#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/toecore/toedev.c#2 integrate
.. //depot/projects/usiii/dev/dc/if_dc.c#6 integrate
.. //depot/projects/usiii/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/usiii/dev/drm/ati_pcigart.c#3 integrate
.. //depot/projects/usiii/dev/drm/drm_bufs.c#3 integrate
.. //depot/projects/usiii/dev/drm/drm_drv.c#4 integrate
.. //depot/projects/usiii/dev/drm/drm_lock.c#3 integrate
.. //depot/projects/usiii/dev/drm/drm_pci.c#3 integrate
.. //depot/projects/usiii/dev/drm/i915_dma.c#4 integrate
.. //depot/projects/usiii/dev/drm/mach64_dma.c#3 integrate
.. //depot/projects/usiii/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/usiii/dev/e1000/if_igb.h#2 integrate
.. //depot/projects/usiii/dev/esp/esp_sbus.c#4 integrate
.. //depot/projects/usiii/dev/esp/ncr53c9x.c#3 integrate
.. //depot/projects/usiii/dev/esp/ncr53c9xreg.h#2 integrate
.. //depot/projects/usiii/dev/esp/ncr53c9xvar.h#3 integrate
.. //depot/projects/usiii/dev/ex/if_ex_pccard.c#3 integrate
.. //depot/projects/usiii/dev/ic/i8251.h#2 integrate
.. //depot/projects/usiii/dev/ic/i8255.h#1 branch
.. //depot/projects/usiii/dev/ic/ns16550.h#2 integrate
.. //depot/projects/usiii/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/usiii/dev/ichwd/ichwd.h#4 integrate
.. //depot/projects/usiii/dev/iicbus/ds133x.c#2 integrate
.. //depot/projects/usiii/dev/iicbus/ds1672.c#2 integrate
.. //depot/projects/usiii/dev/ipmi/ipmi.c#2 integrate
.. //depot/projects/usiii/dev/ipmi/ipmi_kcs.c#3 integrate
.. //depot/projects/usiii/dev/ipmi/ipmivars.h#2 integrate
.. //depot/projects/usiii/dev/jme/if_jme.c#2 integrate
.. //depot/projects/usiii/dev/jme/if_jmereg.h#2 integrate
.. //depot/projects/usiii/dev/k8temp/k8temp.c#5 integrate
.. //depot/projects/usiii/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/usiii/dev/md/md.c#6 integrate
.. //depot/projects/usiii/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/usiii/dev/mii/miidevs#9 integrate
.. //depot/projects/usiii/dev/pccard/pccard_cis.c#3 integrate
.. //depot/projects/usiii/dev/pccard/pccard_cis_quirks.c#3 integrate
.. //depot/projects/usiii/dev/pccard/pccarddevs#5 integrate
.. //depot/projects/usiii/dev/pci/pci_pci.c#5 integrate
.. //depot/projects/usiii/dev/ppc/ppc_isa.c#3 integrate
.. //depot/projects/usiii/dev/re/if_re.c#7 integrate
.. //depot/projects/usiii/dev/si/si.c#3 integrate
.. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/usiii/dev/syscons/syscons.c#8 integrate
.. //depot/projects/usiii/dev/tsec/if_tsec.c#3 integrate
.. //depot/projects/usiii/dev/tsec/if_tsec.h#3 integrate
.. //depot/projects/usiii/dev/tsec/if_tsec_ocp.c#1 branch
.. //depot/projects/usiii/dev/uart/uart.h#4 integrate
.. //depot/projects/usiii/dev/uart/uart_bus_isa.c#2 integrate
.. //depot/projects/usiii/dev/uart/uart_cpu_pc98.c#2 integrate
.. //depot/projects/usiii/dev/usb/ehci_pci.c#7 integrate
.. //depot/projects/usiii/dev/usb/if_zyd.c#11 integrate
.. //depot/projects/usiii/dev/usb/if_zydreg.h#4 integrate
.. //depot/projects/usiii/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/usiii/dev/usb/ucom.c#5 integrate
.. //depot/projects/usiii/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/usiii/dev/usb/ufoma.c#3 integrate
.. //depot/projects/usiii/dev/usb/uhci_pci.c#4 integrate
.. //depot/projects/usiii/dev/usb/uipaq.c#7 integrate
.. //depot/projects/usiii/dev/usb/umodem.c#3 integrate
.. //depot/projects/usiii/dev/usb/uplcom.c#4 integrate
.. //depot/projects/usiii/dev/usb/usb_quirks.c#5 integrate
.. //depot/projects/usiii/dev/usb/usbdevs#14 integrate
.. //depot/projects/usiii/dev/usb/uvscom.c#2 integrate
.. //depot/projects/usiii/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/usiii/dev/wi/if_wi_pccard.c#4 integrate
.. //depot/projects/usiii/dev/wpi/if_wpi.c#8 integrate
.. //depot/projects/usiii/dev/xen/blkback/blkback.c#2 integrate
.. //depot/projects/usiii/fs/cd9660/cd9660_vnops.c#3 integrate
.. //depot/projects/usiii/fs/coda/coda_venus.c#3 integrate
.. //depot/projects/usiii/fs/coda/coda_venus.h#3 integrate
.. //depot/projects/usiii/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/usiii/fs/devfs/devfs_vnops.c#9 integrate
.. //depot/projects/usiii/fs/fdescfs/fdesc_vnops.c#6 integrate
.. //depot/projects/usiii/fs/hpfs/hpfs_vnops.c#3 integrate
.. //depot/projects/usiii/fs/msdosfs/msdosfs_fat.c#4 integrate
.. //depot/projects/usiii/fs/msdosfs/msdosfs_vnops.c#7 integrate
.. //depot/projects/usiii/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/usiii/fs/nwfs/nwfs_vnops.c#3 integrate
.. //depot/projects/usiii/fs/portalfs/portal_vnops.c#3 integrate
.. //depot/projects/usiii/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/usiii/fs/smbfs/smbfs_io.c#4 integrate
.. //depot/projects/usiii/fs/smbfs/smbfs_node.c#6 integrate
.. //depot/projects/usiii/fs/smbfs/smbfs_vnops.c#4 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_fifoops.c#2 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_fifoops.h#2 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_subr.c#6 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_vfsops.c#5 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.h#2 integrate
.. //depot/projects/usiii/fs/unionfs/union_subr.c#7 integrate
.. //depot/projects/usiii/fs/unionfs/union_vfsops.c#6 integrate
.. //depot/projects/usiii/fs/unionfs/union_vnops.c#6 integrate
.. //depot/projects/usiii/geom/geom_dev.c#4 integrate
.. //depot/projects/usiii/geom/journal/g_journal.c#4 integrate
.. //depot/projects/usiii/geom/part/g_part.c#6 integrate
.. //depot/projects/usiii/geom/part/g_part.h#5 integrate
.. //depot/projects/usiii/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate
.. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate
.. //depot/projects/usiii/i386/conf/NOTES#9 integrate
.. //depot/projects/usiii/i386/conf/XEN#2 integrate
.. //depot/projects/usiii/i386/cpufreq/est.c#9 integrate
.. //depot/projects/usiii/i386/cpufreq/powernow.c#3 integrate
.. //depot/projects/usiii/i386/cpufreq/smist.c#3 integrate
.. //depot/projects/usiii/i386/i386/bpf_jit_machdep.c#4 integrate
.. //depot/projects/usiii/i386/i386/bpf_jit_machdep.h#4 integrate
.. //depot/projects/usiii/i386/i386/local_apic.c#6 integrate
.. //depot/projects/usiii/i386/i386/machdep.c#8 integrate
.. //depot/projects/usiii/i386/ibcs2/imgact_coff.c#5 integrate
.. //depot/projects/usiii/i386/include/pmc_mdep.h#3 integrate
.. //depot/projects/usiii/i386/include/xen/xenpmap.h#3 integrate
.. //depot/projects/usiii/i386/include/xen/xenvar.h#3 integrate
.. //depot/projects/usiii/i386/isa/isa.c#3 integrate
.. //depot/projects/usiii/i386/linux/linux_genassym.c#2 integrate
.. //depot/projects/usiii/i386/linux/linux_locore.s#2 integrate
.. //depot/projects/usiii/i386/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/usiii/i386/xen/locore.s#3 integrate
.. //depot/projects/usiii/i386/xen/mp_machdep.c#1 branch
.. //depot/projects/usiii/i386/xen/mptable.c#1 branch
.. //depot/projects/usiii/i386/xen/pmap.c#3 integrate
.. //depot/projects/usiii/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/usiii/kern/imgact_shell.c#2 integrate
.. //depot/projects/usiii/kern/init_sysent.c#9 integrate
.. //depot/projects/usiii/kern/kern_exec.c#10 integrate
.. //depot/projects/usiii/kern/kern_exit.c#8 integrate
.. //depot/projects/usiii/kern/kern_linker.c#7 integrate
.. //depot/projects/usiii/kern/kern_lock.c#9 integrate
.. //depot/projects/usiii/kern/kern_mib.c#7 integrate
.. //depot/projects/usiii/kern/kern_mutex.c#5 integrate
.. //depot/projects/usiii/kern/kern_proc.c#10 integrate
.. //depot/projects/usiii/kern/kern_resource.c#6 integrate
.. //depot/projects/usiii/kern/kern_rmlock.c#2 integrate
.. //depot/projects/usiii/kern/kern_rwlock.c#7 integrate
.. //depot/projects/usiii/kern/kern_sig.c#9 integrate
.. //depot/projects/usiii/kern/kern_subr.c#3 integrate
.. //depot/projects/usiii/kern/kern_sx.c#7 integrate
.. //depot/projects/usiii/kern/subr_rman.c#2 integrate
.. //depot/projects/usiii/kern/subr_sleepqueue.c#9 integrate
.. //depot/projects/usiii/kern/subr_smp.c#9 integrate
.. //depot/projects/usiii/kern/subr_turnstile.c#5 integrate
.. //depot/projects/usiii/kern/subr_witness.c#12 integrate
.. //depot/projects/usiii/kern/syscalls.c#9 integrate
.. //depot/projects/usiii/kern/syscalls.master#10 integrate
.. //depot/projects/usiii/kern/tty.c#8 integrate
.. //depot/projects/usiii/kern/tty_compat.c#3 integrate
.. //depot/projects/usiii/kern/tty_inq.c#2 integrate
.. //depot/projects/usiii/kern/tty_outq.c#3 integrate
.. //depot/projects/usiii/kern/tty_pts.c#5 integrate
.. //depot/projects/usiii/kern/tty_ttydisc.c#2 integrate
.. //depot/projects/usiii/kern/uipc_mbuf.c#6 integrate
.. //depot/projects/usiii/kern/uipc_mqueue.c#4 integrate
.. //depot/projects/usiii/kern/uipc_sockbuf.c#6 integrate
.. //depot/projects/usiii/kern/uipc_socket.c#8 integrate
.. //depot/projects/usiii/kern/vfs_default.c#5 integrate
.. //depot/projects/usiii/kern/vfs_lookup.c#7 integrate
.. //depot/projects/usiii/kern/vfs_mount.c#12 integrate
.. //depot/projects/usiii/kern/vfs_subr.c#13 integrate
.. //depot/projects/usiii/kern/vfs_syscalls.c#8 integrate
.. //depot/projects/usiii/kern/vfs_vnops.c#6 integrate
.. //depot/projects/usiii/kern/vnode_if.src#5 integrate
.. //depot/projects/usiii/mips/adm5120/admpci.c#2 integrate
.. //depot/projects/usiii/mips/adm5120/if_admsw.c#2 integrate
.. //depot/projects/usiii/mips/adm5120/if_admswvar.h#2 integrate
.. //depot/projects/usiii/mips/adm5120/obio.c#2 integrate
.. //depot/projects/usiii/mips/adm5120/std.adm5120#2 integrate
.. //depot/projects/usiii/mips/adm5120/uart_bus_adm5120.c#2 integrate
.. //depot/projects/usiii/mips/adm5120/uart_cpu_adm5120.c#2 integrate
.. //depot/projects/usiii/mips/adm5120/uart_dev_adm5120.c#2 integrate
.. //depot/projects/usiii/mips/conf/ADM5120#3 integrate
.. //depot/projects/usiii/mips/conf/IDT#3 integrate
.. //depot/projects/usiii/mips/conf/MALTA#3 integrate
.. //depot/projects/usiii/mips/conf/SENTRY5#3 integrate
.. //depot/projects/usiii/mips/idt/idtpci.c#2 integrate
.. //depot/projects/usiii/mips/idt/if_kr.c#2 integrate
.. //depot/projects/usiii/mips/idt/obio.c#2 integrate
.. //depot/projects/usiii/mips/idt/std.idt#2 integrate
.. //depot/projects/usiii/mips/idt/uart_bus_rc32434.c#2 integrate
.. //depot/projects/usiii/mips/malta/files.malta#2 integrate
.. //depot/projects/usiii/mips/malta/gt.c#2 integrate
.. //depot/projects/usiii/mips/malta/gt_pci.c#2 integrate
.. //depot/projects/usiii/mips/malta/malta_machdep.c#2 integrate
.. //depot/projects/usiii/mips/malta/obio.c#2 integrate
.. //depot/projects/usiii/mips/malta/std.malta#2 integrate
.. //depot/projects/usiii/mips/malta/uart_bus_maltausart.c#2 integrate
.. //depot/projects/usiii/mips/malta/uart_cpu_maltausart.c#2 integrate
.. //depot/projects/usiii/mips/malta/yamon.c#2 integrate
.. //depot/projects/usiii/mips/mips/in_cksum.c#2 integrate
.. //depot/projects/usiii/mips/mips/intr_machdep.c#2 integrate
.. //depot/projects/usiii/mips/sentry5/obio.c#2 integrate
.. //depot/projects/usiii/mips/sentry5/s5_machdep.c#2 integrate
.. //depot/projects/usiii/mips/sentry5/uart_bus_sbusart.c#2 integrate
.. //depot/projects/usiii/mips/sentry5/uart_cpu_sbusart.c#2 integrate
.. //depot/projects/usiii/modules/Makefile#14 integrate
.. //depot/projects/usiii/modules/aha/Makefile#2 integrate
.. //depot/projects/usiii/modules/ahb/Makefile#2 integrate
.. //depot/projects/usiii/modules/an/Makefile#2 integrate
.. //depot/projects/usiii/modules/ar/Makefile#2 integrate
.. //depot/projects/usiii/modules/ath_rate_amrr/Makefile#4 integrate
.. //depot/projects/usiii/modules/ath_rate_onoe/Makefile#4 integrate
.. //depot/projects/usiii/modules/ath_rate_sample/Makefile#4 integrate
.. //depot/projects/usiii/modules/ce/Makefile#2 integrate
.. //depot/projects/usiii/modules/cp/Makefile#2 integrate
.. //depot/projects/usiii/modules/ctau/Makefile#2 integrate
.. //depot/projects/usiii/modules/cx/Makefile#2 integrate
.. //depot/projects/usiii/modules/digi/digi/Makefile#2 integrate
.. //depot/projects/usiii/modules/fatm/Makefile#2 integrate
.. //depot/projects/usiii/modules/hatm/Makefile#2 integrate
.. //depot/projects/usiii/modules/hifn/Makefile#2 integrate
.. //depot/projects/usiii/modules/if_tap/Makefile#2 integrate
.. //depot/projects/usiii/modules/linux/Makefile#2 integrate
.. //depot/projects/usiii/modules/netgraph/sync_ar/Makefile#2 integrate
.. //depot/projects/usiii/modules/netgraph/sync_sr/Makefile#2 integrate
.. //depot/projects/usiii/modules/patm/Makefile#2 integrate
.. //depot/projects/usiii/modules/pf/Makefile#2 integrate
.. //depot/projects/usiii/modules/pflog/Makefile#2 integrate
.. //depot/projects/usiii/modules/rp/Makefile#2 integrate
.. //depot/projects/usiii/modules/safe/Makefile#2 integrate
.. //depot/projects/usiii/modules/sppp/Makefile#2 integrate
.. //depot/projects/usiii/modules/sr/Makefile#2 integrate
.. //depot/projects/usiii/modules/svr4/Makefile#2 integrate
.. //depot/projects/usiii/modules/trm/Makefile#2 integrate
.. //depot/projects/usiii/modules/ubsec/Makefile#2 integrate
.. //depot/projects/usiii/modules/usb/Makefile#2 integrate
.. //depot/projects/usiii/modules/wi/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan/Makefile#4 integrate
.. //depot/projects/usiii/modules/wlan_acl/Makefile#3 integrate
.. //depot/projects/usiii/modules/wlan_amrr/Makefile#3 integrate
.. //depot/projects/usiii/modules/wlan_ccmp/Makefile#3 integrate
.. //depot/projects/usiii/modules/wlan_rssadapt/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_tkip/Makefile#3 integrate
.. //depot/projects/usiii/modules/wlan_wep/Makefile#3 integrate
.. //depot/projects/usiii/modules/wlan_xauth/Makefile#3 integrate
.. //depot/projects/usiii/net/bpf.c#9 integrate
.. //depot/projects/usiii/net/bpf.h#6 integrate
.. //depot/projects/usiii/net/bpf_filter.c#5 integrate
.. //depot/projects/usiii/net/bpf_jitter.c#3 integrate
.. //depot/projects/usiii/net/bpf_jitter.h#3 integrate
.. //depot/projects/usiii/net/ethernet.h#4 integrate
.. //depot/projects/usiii/net/if.h#5 integrate
.. //depot/projects/usiii/net/if_bridge.c#7 integrate
.. //depot/projects/usiii/net/if_ethersubr.c#9 integrate
.. //depot/projects/usiii/net/if_mib.c#3 integrate
.. //depot/projects/usiii/net/if_tap.c#4 integrate
.. //depot/projects/usiii/net/if_tap.h#2 integrate
.. //depot/projects/usiii/net/if_vlan.c#5 integrate
.. //depot/projects/usiii/net/route.c#9 integrate
.. //depot/projects/usiii/net/route.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211.c#9 integrate
.. //depot/projects/usiii/net80211/ieee80211.h#7 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_tkip.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_ddb.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_freebsd.h#6 integrate
.. //depot/projects/usiii/net80211/ieee80211_ht.c#9 integrate
.. //depot/projects/usiii/net80211/ieee80211_ht.h#7 integrate
.. //depot/projects/usiii/net80211/ieee80211_ioctl.c#7 integrate
.. //depot/projects/usiii/net80211/ieee80211_ioctl.h#6 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.c#9 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_phy.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_sta.c#2 integrate
.. //depot/projects/usiii/netgraph/ng_bpf.c#4 integrate
.. //depot/projects/usiii/netgraph/ng_pipe.c#1 branch
.. //depot/projects/usiii/netgraph/ng_pipe.h#1 branch
.. //depot/projects/usiii/netinet/if_ether.c#7 integrate
.. //depot/projects/usiii/netinet/ip_fw.h#6 integrate
.. //depot/projects/usiii/netinet/ip_fw2.c#12 integrate
.. //depot/projects/usiii/netinet/ip_input.c#7 integrate
.. //depot/projects/usiii/netinet/ip_options.c#7 integrate
.. //depot/projects/usiii/netinet/ip_var.h#4 integrate
.. //depot/projects/usiii/netinet/libalias/alias_db.c#4 integrate
.. //depot/projects/usiii/netinet/sctp_indata.c#8 integrate
.. //depot/projects/usiii/netinet/sctp_lock_bsd.h#5 integrate
.. //depot/projects/usiii/netinet/sctp_output.c#9 integrate
.. //depot/projects/usiii/netinet/sctp_pcb.c#10 integrate
.. //depot/projects/usiii/netinet/sctp_sysctl.h#5 integrate
.. //depot/projects/usiii/netinet/sctp_timer.c#6 integrate
.. //depot/projects/usiii/netinet/sctp_timer.h#4 integrate
.. //depot/projects/usiii/netinet/sctp_var.h#7 integrate
.. //depot/projects/usiii/netinet/sctputil.c#8 integrate
.. //depot/projects/usiii/netinet/tcp_debug.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/usiii/netinet/tcp_input.c#10 integrate
.. //depot/projects/usiii/netinet/tcp_offload.c#4 integrate
.. //depot/projects/usiii/netinet/tcp_output.c#8 integrate
.. //depot/projects/usiii/netinet/tcp_subr.c#10 integrate
.. //depot/projects/usiii/netinet/tcp_syncache.c#9 integrate
.. //depot/projects/usiii/netinet/tcp_syncache.h#4 integrate
.. //depot/projects/usiii/netinet/tcp_var.h#9 integrate
.. //depot/projects/usiii/netinet/toedev.h#3 integrate
.. //depot/projects/usiii/netinet/udp_usrreq.c#8 integrate
.. //depot/projects/usiii/netinet6/icmp6.c#6 integrate
.. //depot/projects/usiii/netinet6/mld6.c#4 integrate
.. //depot/projects/usiii/netinet6/nd6_nbr.c#5 integrate
.. //depot/projects/usiii/netinet6/udp6_usrreq.c#8 integrate
.. //depot/projects/usiii/nfs4client/nfs4_vnops.c#6 integrate
.. //depot/projects/usiii/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/usiii/nfsclient/nfs_vfsops.c#11 integrate
.. //depot/projects/usiii/nfsclient/nfs_vnops.c#8 integrate
.. //depot/projects/usiii/nfsserver/nfs_serv.c#7 integrate
.. //depot/projects/usiii/nfsserver/nfs_srvsubs.c#5 integrate
.. //depot/projects/usiii/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/usiii/nlm/nlm_prot_server.c#3 integrate
.. //depot/projects/usiii/pc98/cbus/sio.c#6 integrate
.. //depot/projects/usiii/pc98/conf/GENERIC#12 integrate
.. //depot/projects/usiii/pc98/conf/GENERIC.hints#3 integrate
.. //depot/projects/usiii/pc98/conf/NOTES#5 integrate
.. //depot/projects/usiii/pc98/include/bus.h#3 integrate
.. //depot/projects/usiii/pc98/pc98/busiosubr.c#3 integrate
.. //depot/projects/usiii/powerpc/aim/clock.c#5 integrate
.. //depot/projects/usiii/powerpc/aim/interrupt.c#2 integrate
.. //depot/projects/usiii/powerpc/aim/machdep.c#9 integrate
.. //depot/projects/usiii/powerpc/aim/mmu_oea.c#5 integrate
.. //depot/projects/usiii/powerpc/aim/vm_machdep.c#5 integrate
.. //depot/projects/usiii/powerpc/booke/locore.S#2 integrate
.. //depot/projects/usiii/powerpc/booke/machdep.c#6 integrate
.. //depot/projects/usiii/powerpc/booke/pmap.c#5 integrate
.. //depot/projects/usiii/powerpc/include/cpufunc.h#3 integrate
.. //depot/projects/usiii/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/usiii/powerpc/powerpc/pmap_dispatch.c#5 integrate
.. //depot/projects/usiii/rpc/pmap_prot.h#2 integrate
.. //depot/projects/usiii/rpc/rpcb_prot.c#2 integrate
.. //depot/projects/usiii/security/audit/audit_arg.c#7 integrate
.. //depot/projects/usiii/security/audit/audit_bsm.c#7 integrate
.. //depot/projects/usiii/security/audit/audit_syscalls.c#8 integrate
.. //depot/projects/usiii/security/audit/audit_worker.c#10 integrate
.. //depot/projects/usiii/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/usiii/security/mac_lomac/mac_lomac.c#6 integrate
.. //depot/projects/usiii/sparc64/conf/GENERIC#13 integrate
.. //depot/projects/usiii/sparc64/include/asi.h#3 integrate
.. //depot/projects/usiii/sparc64/include/cache.h#4 integrate
.. //depot/projects/usiii/sparc64/include/clock.h#4 integrate
.. //depot/projects/usiii/sparc64/include/cpu.h#3 integrate
.. //depot/projects/usiii/sparc64/include/cpufunc.h#5 integrate
.. //depot/projects/usiii/sparc64/include/pcpu.h#5 integrate
.. //depot/projects/usiii/sparc64/include/smp.h#4 integrate
.. //depot/projects/usiii/sparc64/include/tick.h#3 integrate
.. //depot/projects/usiii/sparc64/include/tlb.h#5 integrate
.. //depot/projects/usiii/sparc64/include/trap.h#3 integrate
.. //depot/projects/usiii/sparc64/include/tte.h#4 integrate
.. //depot/projects/usiii/sparc64/include/ver.h#3 integrate
.. //depot/projects/usiii/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/usiii/sparc64/sbus/lsi64854.c#2 integrate
.. //depot/projects/usiii/sparc64/sbus/lsi64854var.h#2 integrate
.. //depot/projects/usiii/sparc64/sparc64/autoconf.c#3 integrate
.. //depot/projects/usiii/sparc64/sparc64/cache.c#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/cheetah.c#6 integrate
.. //depot/projects/usiii/sparc64/sparc64/clock.c#5 integrate
.. //depot/projects/usiii/sparc64/sparc64/exception.S#7 integrate
.. //depot/projects/usiii/sparc64/sparc64/genassym.c#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/locore.S#5 integrate
.. //depot/projects/usiii/sparc64/sparc64/machdep.c#7 integrate
.. //depot/projects/usiii/sparc64/sparc64/mp_exception.S#3 integrate
.. //depot/projects/usiii/sparc64/sparc64/mp_locore.S#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/mp_machdep.c#8 integrate
.. //depot/projects/usiii/sparc64/sparc64/pmap.c#8 integrate
.. //depot/projects/usiii/sparc64/sparc64/spitfire.c#5 integrate
.. //depot/projects/usiii/sparc64/sparc64/support.S#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/swtch.S#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/tick.c#6 integrate
.. //depot/projects/usiii/sparc64/sparc64/tlb.c#5 integrate
.. //depot/projects/usiii/sparc64/sparc64/trap.c#7 integrate
.. //depot/projects/usiii/sun4v/include/asi.h#2 integrate
.. //depot/projects/usiii/sun4v/sun4v/clock.c#1 branch
.. //depot/projects/usiii/sys/disk.h#2 integrate
.. //depot/projects/usiii/sys/gpt.h#3 integrate
.. //depot/projects/usiii/sys/ioccom.h#2 integrate
.. //depot/projects/usiii/sys/lock.h#7 integrate
.. //depot/projects/usiii/sys/mount.h#6 integrate
.. //depot/projects/usiii/sys/param.h#13 integrate
.. //depot/projects/usiii/sys/syscall.h#9 integrate
.. //depot/projects/usiii/sys/syscall.mk#9 integrate
.. //depot/projects/usiii/sys/sysproto.h#9 integrate
.. //depot/projects/usiii/sys/systm.h#8 integrate
.. //depot/projects/usiii/sys/termios.h#5 integrate
.. //depot/projects/usiii/sys/tty.h#5 integrate
.. //depot/projects/usiii/sys/ttydevsw.h#2 integrate
.. //depot/projects/usiii/sys/ttydisc.h#2 integrate
.. //depot/projects/usiii/sys/ttyqueue.h#2 integrate
.. //depot/projects/usiii/sys/vimage.h#2 integrate
.. //depot/projects/usiii/sys/vnode.h#8 integrate
.. //depot/projects/usiii/sys/wait.h#2 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_extern.h#2 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_snapshot.c#5 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_softdep.c#7 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_vfsops.c#9 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/usiii/ufs/ufs/ufs_extattr.c#4 integrate
.. //depot/projects/usiii/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/usiii/ufs/ufs/ufs_vnops.c#6 integrate
.. //depot/projects/usiii/vm/swap_pager.c#6 integrate
.. //depot/projects/usiii/vm/vm_mmap.c#8 integrate
.. //depot/projects/usiii/vm/vnode_pager.c#6 integrate
Differences ...
==== //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ====
@@ -23,14 +23,14 @@
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $");
#ifdef _KERNEL
#include "opt_bpf.h"
@@ -107,10 +107,6 @@
*/
emit_func emitm;
- /* Do not compile an empty filter. */
- if (nins == 0)
- return (NULL);
-
/* Allocate the reference table for the jumps */
#ifdef _KERNEL
stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int),
==== //depot/projects/usiii/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ====
@@ -23,12 +23,12 @@
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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.9 2008/08/18 19:14:26 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $
*/
#ifndef _BPF_JIT_MACHDEP_H_
==== //depot/projects/usiii/amd64/amd64/cpu_switch.S#4 (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.162 2008/07/30 11:30:55 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $
*/
#include <machine/asmacros.h>
@@ -109,8 +109,24 @@
movq %rsp,PCB_RSP(%r8)
movq %rbx,PCB_RBX(%r8)
movq %rax,PCB_RIP(%r8)
- movq PCB_FSBASE(%r8),%r9
- movq PCB_GSBASE(%r8),%r10
+
+ /*
+ * Reread fs and gs bases. Explicit fs segment register load
+ * by the usermode code may change actual fs base without
+ * updating pcb_{fs,gs}base.
+ *
+ * %rdx still contains the mtx, save %rdx around rdmsr.
+ */
+ movq %rdx,%r11
+ movl $MSR_FSBASE,%ecx
+ rdmsr
+ shlq $32,%rdx
+ leaq (%rax,%rdx),%r9
+ movl $MSR_KGSBASE,%ecx
+ rdmsr
+ shlq $32,%rdx
+ leaq (%rax,%rdx),%r10
+ movq %r11,%rdx
testl $PCB_32BIT,PCB_FLAGS(%r8)
jnz store_seg
@@ -250,7 +266,7 @@
movl %es,PCB_ES(%r8)
movl %fs,PCB_FS(%r8)
jmp done_store_seg
-2: movq PCB_GS32P(%r8),%rax
+2: movq PCPU(GS32P),%rax
movq (%rax),%rax
movq %rax,PCB_GS32SD(%r8)
jmp 1b
@@ -267,7 +283,7 @@
movl PCB_FS(%r8),%fs
jmp done_load_seg
/* Restore userland %gs while preserving kernel gsbase */
-2: movq PCB_GS32P(%r8),%rax
+2: movq PCPU(GS32P),%rax
movq PCB_GS32SD(%r8),%rcx
movq %rcx,(%rax)
jmp 1b
==== //depot/projects/usiii/amd64/amd64/genassym.c#7 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -147,7 +147,6 @@
ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save));
ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu));
ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault));
-ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p));
ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd));
ASSYM(PCB_SIZE, sizeof(struct pcb));
@@ -199,6 +198,7 @@
ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp));
ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0));
+ASSYM(PC_GS32P, offsetof(struct pcpu, pc_gs32p));
ASSYM(LA_VER, offsetof(struct LAPIC, version));
ASSYM(LA_TPR, offsetof(struct LAPIC, tpr));
==== //depot/projects/usiii/amd64/amd64/machdep.c#9 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.690 2008/09/08 09:59:05 kib Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -734,6 +734,7 @@
pcb->pcb_fsbase = 0;
pcb->pcb_gsbase = 0;
critical_exit();
+ pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT);
load_ds(_udatasel);
load_es(_udatasel);
load_fs(_udatasel);
@@ -802,7 +803,7 @@
* Initialize segments & interrupt table
*/
-struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor table */
+struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor tables */
static struct gate_descriptor idt0[NIDT];
struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */
@@ -869,7 +870,7 @@
/* GPROC0_SEL 6 Proc 0 Tss Descriptor */
{
0x0, /* segment base address */
- sizeof(struct amd64tss)-1,/* length - all address space */
+ sizeof(struct amd64tss)-1,/* length */
SDT_SYSTSS, /* segment type */
SEL_KPL, /* segment descriptor priority level */
1, /* segment descriptor present */
@@ -1346,6 +1347,7 @@
PCPU_SET(curthread, &thread0);
PCPU_SET(curpcb, thread0.td_pcb);
PCPU_SET(tssp, &common_tss[0]);
+ PCPU_SET(gs32p, &gdt[GUGS32_SEL]);
/*
* Initialize mutexes.
==== //depot/projects/usiii/amd64/amd64/mp_machdep.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.291 2008/07/09 19:44:37 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -436,7 +436,8 @@
{
struct pcpu *pc;
u_int64_t msr, cr0;
- int cpu, gsel_tss;
+ int cpu, gsel_tss, x;
+ struct region_descriptor ap_gdt;
/* Set by the startup code for us to use */
cpu = bootAP;
@@ -447,11 +448,17 @@
common_tss[cpu].tss_iobase = sizeof(struct amd64tss);
common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE];
+ /* Prepare private GDT */
gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu];
ssdtosyssd(&gdt_segs[GPROC0_SEL],
- (struct system_segment_descriptor *)&gdt[GPROC0_SEL]);
-
- lgdt(&r_gdt); /* does magic intra-segment return */
+ (struct system_segment_descriptor *)&gdt[NGDT * cpu + GPROC0_SEL]);
+ for (x = 0; x < NGDT; x++) {
+ if (x != GPROC0_SEL && x != (GPROC0_SEL + 1))
+ ssdtosd(&gdt_segs[x], &gdt[NGDT * cpu + x]);
+ }
+ ap_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1;
+ ap_gdt.rd_base = (long) &gdt[NGDT * cpu];
+ lgdt(&ap_gdt); /* does magic intra-segment return */
/* Get per-cpu data */
pc = &__pcpu[cpu];
@@ -463,6 +470,7 @@
pc->pc_curthread = 0;
pc->pc_tssp = &common_tss[cpu];
pc->pc_rsp0 = 0;
+ pc->pc_gs32p = &gdt[NGDT * cpu + GUGS32_SEL];
wrmsr(MSR_FSBASE, 0); /* User value */
wrmsr(MSR_GSBASE, (u_int64_t)pc);
==== //depot/projects/usiii/amd64/amd64/trap.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.327 2008/06/20 05:22:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $");
/*
* AMD64 Trap and System call handling
@@ -692,7 +692,8 @@
code = frame->tf_err;
type = frame->tf_trapno;
- sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)], &softseg);
+ sdtossd(&gdt[NGDT * PCPU_GET(cpuid) + IDXSEL(frame->tf_cs & 0xffff)],
+ &softseg);
if (type <= MAX_TRAP_MSG)
msg = trap_msg[type];
==== //depot/projects/usiii/amd64/ia32/ia32_signal.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $");
#include "opt_compat.h"
@@ -742,5 +742,6 @@
/* Return via doreti so that we can change to a different %cs */
pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT;
+ pcb->pcb_flags &= ~PCB_GS32BIT;
td->td_retval[1] = 0;
}
==== //depot/projects/usiii/amd64/include/pcb.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)pcb.h 5.10 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.65 2008/07/30 11:30:55 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.66 2008/09/08 09:59:05 kib Exp $
*/
#ifndef _AMD64_PCB_H_
@@ -77,7 +77,6 @@
caddr_t pcb_onfault; /* copyin/out fault recovery */
/* 32-bit segment descriptor */
- struct user_segment_descriptor *pcb_gs32p;
struct user_segment_descriptor pcb_gs32sd;
};
==== //depot/projects/usiii/amd64/include/pcpu.h#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/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.51 2008/09/08 09:59:05 kib Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -48,7 +48,8 @@
register_t pc_rsp0; \
register_t pc_scratch_rsp; /* User %rsp in syscall */ \
u_int pc_apic_id; \
- u_int pc_acpi_id /* ACPI CPU id */
+ u_int pc_acpi_id; /* ACPI CPU id */ \
+ struct user_segment_descriptor *pc_gs32p
#ifdef _KERNEL
==== //depot/projects/usiii/amd64/include/segments.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)segments.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/segments.h,v 1.40 2008/09/08 08:58:29 kib Exp $
*/
#ifndef _MACHINE_SEGMENTS_H_
@@ -201,7 +201,7 @@
#define GUDATA_SEL 4 /* User 32/64 bit Data Descriptor */
#define GUCODE_SEL 5 /* User 64 bit Code Descriptor */
#define GPROC0_SEL 6 /* TSS for entering kernel etc */
-/* slot 6 is second half of GPROC0_SEL */
+/* slot 7 is second half of GPROC0_SEL */
#define GUGS32_SEL 8 /* User 32 bit GS Descriptor */
#define NGDT 9
==== //depot/projects/usiii/amd64/linux32/linux32_genassym.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.1 2004/08/16 07:55:06 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.2 2008/09/07 16:39:21 kib Exp $");
#include <sys/param.h>
#include <sys/assym.h>
@@ -9,9 +9,8 @@
ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler));
ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc));
-ASSYM(LINUX_SC_GS, offsetof(struct l_sigcontext, sc_gs));
-ASSYM(LINUX_SC_FS, offsetof(struct l_sigcontext, sc_fs));
ASSYM(LINUX_SC_ES, offsetof(struct l_sigcontext, sc_es));
ASSYM(LINUX_SC_DS, offsetof(struct l_sigcontext, sc_ds));
ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler));
ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc));
+ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext));
==== //depot/projects/usiii/amd64/linux32/linux32_locore.s#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */
+/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.3 2008/09/07 16:39:21 kib Exp $ */
#include "linux32_assym.h" /* system definitions */
#include <machine/asmacros.h> /* miscellaneous asm macros */
@@ -23,8 +23,9 @@
linux_rt_sigcode:
call *LINUX_RT_SIGF_HANDLER(%esp)
leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
- movl LINUX_SC_ES(%ebx),%es
- movl LINUX_SC_DS(%ebx),%ds
+ leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
+ movl LINUX_SC_ES(%ecx),%es
+ movl LINUX_SC_DS(%ecx),%ds
push %eax /* fake ret addr */
movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
int $0x80 /* enter kernel with args */
==== //depot/projects/usiii/amd64/linux32/linux32_machdep.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.47 2008/07/30 11:30:55 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.49 2008/09/08 09:59:05 kib Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -694,7 +694,6 @@
#endif
td2->td_pcb->pcb_gsbase = (register_t)info.base_addr;
td2->td_pcb->pcb_gs32sd = sd;
- td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL];
td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL);
td2->td_pcb->pcb_flags |= PCB_GS32BIT | PCB_32BIT;
}
@@ -1352,9 +1351,8 @@
critical_enter();
td->td_pcb->pcb_gsbase = (register_t)info.base_addr;
- td->td_pcb->pcb_gs32sd = gdt[GUGS32_SEL] = sd;
- td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL];
- td->td_pcb->pcb_flags |= PCB_32BIT;
+ td->td_pcb->pcb_gs32sd = *PCPU_GET(gs32p) = sd;
+ td->td_pcb->pcb_flags |= PCB_32BIT | PCB_GS32BIT;
wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase);
critical_exit();
==== //depot/projects/usiii/amd64/pci/pci_cfgreg.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.112 2008/09/10 18:06:08 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,6 +46,8 @@
CFGMECH_PCIE,
};
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list