Date: Mon, 8 Jan 2007 18:58:40 GMT From: Alex Lyashkov <als@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 112682 for review Message-ID: <200701081858.l08IweSS056017@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=112682 Change 112682 by als@als_head on 2007/01/08 18:58:14 update to today`s HEAD. Affected files ... .. //depot/projects/jail2/sys/Makefile#4 integrate .. //depot/projects/jail2/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/jail2/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/jail2/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/jail2/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/jail2/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/jail2/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/jail2/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/jail2/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/jail2/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/jail2/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/jail2/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/jail2/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/jail2/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/jail2/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/jail2/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/jail2/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/jail2/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/jail2/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/jail2/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/jail2/sys/arm/at91/files.at91#4 integrate .. //depot/projects/jail2/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/jail2/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/jail2/sys/arm/conf/BWCT#1 branch .. //depot/projects/jail2/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/jail2/sys/arm/include/atomic.h#3 integrate .. //depot/projects/jail2/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/jail2/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/projects/jail2/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/main.c#5 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/jail2/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/jail2/sys/boot/common/loader.8#4 integrate .. //depot/projects/jail2/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/jail2/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/jail2/sys/bsm/audit.h#4 integrate .. //depot/projects/jail2/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/jail2/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/jail2/sys/bsm/audit_record.h#6 integrate .. //depot/projects/jail2/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/jail2/sys/cam/cam_periph.c#3 integrate .. //depot/projects/jail2/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/jail2/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/jail2/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/jail2/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/jail2/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/jail2/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/jail2/sys/conf/NOTES#10 integrate .. //depot/projects/jail2/sys/conf/files#10 integrate .. //depot/projects/jail2/sys/conf/files.amd64#8 integrate .. //depot/projects/jail2/sys/conf/files.arm#4 integrate .. //depot/projects/jail2/sys/conf/files.i386#7 integrate .. //depot/projects/jail2/sys/conf/files.pc98#5 integrate .. //depot/projects/jail2/sys/conf/files.powerpc#5 integrate .. //depot/projects/jail2/sys/conf/files.sparc64#3 integrate .. //depot/projects/jail2/sys/conf/files.sun4v#5 integrate .. //depot/projects/jail2/sys/conf/kern.mk#3 integrate .. //depot/projects/jail2/sys/conf/kern.post.mk#5 integrate .. //depot/projects/jail2/sys/conf/options#9 integrate .. //depot/projects/jail2/sys/conf/options.arm#5 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/jail2/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/jail2/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/jail2/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/jail2/sys/ddb/db_ps.c#5 integrate .. //depot/projects/jail2/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/jail2/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/jail2/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/jail2/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/jail2/sys/dev/aha/aha.c#3 integrate .. //depot/projects/jail2/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/jail2/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/jail2/sys/dev/amd/amd.c#3 integrate .. //depot/projects/jail2/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/jail2/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/jail2/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/jail2/sys/dev/asr/asr.c#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/jail2/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/jail2/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/jail2/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/jail2/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/jail2/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/jail2/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/jail2/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/jail2/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/jail2/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/jail2/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/jail2/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/jail2/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/jail2/sys/dev/en/midway.c#3 integrate .. //depot/projects/jail2/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/jail2/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/jail2/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/jail2/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/jail2/sys/dev/flash/at45d.c#1 branch .. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/jail2/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/jail2/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/jail2/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/jail2/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/jail2/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/jail2/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/jail2/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/jail2/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iic.h#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/jail2/sys/dev/iicbus/iicbus_if.m#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/jail2/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/jail2/sys/dev/isp/isp.c#6 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/jail2/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/jail2/sys/dev/isp/ispmbox.h#5 integrate .. //depot/projects/jail2/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/jail2/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/jail2/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/jail2/sys/dev/le/am7990.c#2 integrate .. //depot/projects/jail2/sys/dev/le/am79900.c#2 integrate .. //depot/projects/jail2/sys/dev/le/lance.c#2 integrate .. //depot/projects/jail2/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/jail2/sys/dev/md/md.c#3 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/jail2/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/jail2/sys/dev/mii/acphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/jail2/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/jail2/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/jail2/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/jail2/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/miidevs#4 integrate .. //depot/projects/jail2/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/jail2/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/pnaphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/qsphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/rlswitch.c#1 branch .. //depot/projects/jail2/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/jail2/sys/dev/mly/mly.c#3 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/jail2/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/jail2/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/jail2/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/jail2/sys/dev/my/if_my.c#3 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/jail2/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/jail2/sys/dev/pci/pci.c#7 integrate .. //depot/projects/jail2/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/jail2/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/jail2/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/jail2/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/jail2/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/jail2/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/jail2/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/jail2/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/jail2/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/jail2/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/jail2/sys/dev/re/if_re.c#6 integrate .. //depot/projects/jail2/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/jail2/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/jail2/sys/dev/trm/trm.c#3 integrate .. //depot/projects/jail2/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi_util.h#3 integrate .. //depot/projects/jail2/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/jail2/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/jail2/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/jail2/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/jail2/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/jail2/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/jail2/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/jail2/sys/fs/unionfs/union_subr.c#2 edit .. //depot/projects/jail2/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/jail2/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/jail2/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/jail2/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/jail2/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/jail2/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/exception.s#2 integrate .. //depot/projects/jail2/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/jail2/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/jail2/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/jail2/sys/i386/i386/trap.c#5 integrate .. //depot/projects/jail2/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/jail2/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/jail2/sys/i386/include/atomic.h#2 integrate .. //depot/projects/jail2/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/jail2/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/jail2/sys/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/jail2/sys/i386/isa/clock.c#4 integrate .. //depot/projects/jail2/sys/i386/isa/icu.h#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux.h#4 integrate .. //depot/projects/jail2/sys/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/jail2/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/jail2/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/jail2/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/jail2/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/jail2/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/jail2/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/jail2/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/jail2/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/jail2/sys/isa/pnpparse.c#2 integrate .. //depot/projects/jail2/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/jail2/sys/kern/init_main.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_clock.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/jail2/sys/kern/kern_fork.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_idle.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_intr.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_kse.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_mac.c#5 delete .. //depot/projects/jail2/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_poll.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_proc.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_resource.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_sig.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_subr.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_switch.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_synch.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_thr.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_thread.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_time.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/jail2/sys/kern/ksched.c#2 integrate .. //depot/projects/jail2/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/jail2/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/jail2/sys/kern/sched_core.c#4 integrate .. //depot/projects/jail2/sys/kern/sched_ule.c#5 integrate .. //depot/projects/jail2/sys/kern/subr_lock.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_prf.c#6 integrate .. //depot/projects/jail2/sys/kern/subr_rman.c#4 integrate .. //depot/projects/jail2/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_trap.c#3 integrate .. //depot/projects/jail2/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/jail2/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/jail2/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/jail2/sys/kern/tty.c#8 integrate .. //depot/projects/jail2/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/jail2/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/jail2/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/jail2/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_export.c#3 integrate .. //depot/projects/jail2/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/jail2/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/jail2/sys/modules/Makefile#7 integrate .. //depot/projects/jail2/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/jail2/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/isp/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/msk/Makefile#1 branch .. //depot/projects/jail2/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/jail2/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/jail2/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/jail2/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/jail2/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/jail2/sys/net/bridgestp.c#6 integrate .. //depot/projects/jail2/sys/net/bridgestp.h#4 integrate .. //depot/projects/jail2/sys/net/ethernet.h#3 integrate .. //depot/projects/jail2/sys/net/if.c#8 integrate .. //depot/projects/jail2/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/jail2/sys/net/if_bridge.c#9 integrate .. //depot/projects/jail2/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/jail2/sys/net/if_enc.c#3 integrate .. //depot/projects/jail2/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/jail2/sys/net/if_llc.h#2 integrate .. //depot/projects/jail2/sys/net/if_media.h#2 integrate .. //depot/projects/jail2/sys/net/if_ppp.c#6 integrate .. //depot/projects/jail2/sys/net/if_pppvar.h#3 integrate .. //depot/projects/jail2/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/jail2/sys/net/if_vlan.c#7 integrate .. //depot/projects/jail2/sys/net/netisr.c#2 integrate .. //depot/projects/jail2/sys/net/ppp_tty.c#4 integrate .. //depot/projects/jail2/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/jail2/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/jail2/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/jail2/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/jail2/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/jail2/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/jail2/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/jail2/sys/netinet/igmp.c#3 integrate .. //depot/projects/jail2/sys/netinet/in.h#2 integrate .. //depot/projects/jail2/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/jail2/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/jail2/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/jail2/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/jail2/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/jail2/sys/netinet/ip_output.c#7 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/jail2/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctputil.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctputil.h#4 integrate .. //depot/projects/jail2/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/jail2/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/jail2/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/jail2/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/jail2/sys/netinet6/frag6.c#3 integrate .. //depot/projects/jail2/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/jail2/sys/netinet6/in6.c#6 integrate .. //depot/projects/jail2/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/jail2/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/jail2/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/jail2/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/jail2/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/jail2/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/jail2/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/jail2/sys/netinet6/mld6.c#3 integrate .. //depot/projects/jail2/sys/netinet6/nd6.c#7 integrate .. //depot/projects/jail2/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/jail2/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/jail2/sys/netinet6/scope6.c#2 integrate .. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/jail2/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/jail2/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/jail2/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/jail2/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/jail2/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/jail2/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/jail2/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/jail2/sys/pci/agp_intel.c#2 integrate .. //depot/projects/jail2/sys/pci/agpreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_pcn.c#3 integrate .. //depot/projects/jail2/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/jail2/sys/pci/if_rl.c#3 integrate .. //depot/projects/jail2/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/jail2/sys/pci/if_xl.c#4 integrate .. //depot/projects/jail2/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/jail2/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/jail2/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/mmu_oea.c#5 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit.c#5 integrate .. //depot/projects/jail2/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/jail2/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/jail2/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/jail2/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/jail2/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/jail2/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/jail2/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/jail2/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/jail2/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/jail2/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/jail2/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/jail2/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/jail2/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/jail2/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/jail2/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/jail2/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/jail2/sys/sparc64/include/param.h#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/jail2/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/jail2/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/hv_api.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/tsb.h#3 integrate .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/jail2/sys/sys/copyright.h#3 integrate .. //depot/projects/jail2/sys/sys/file.h#2 integrate .. //depot/projects/jail2/sys/sys/interrupt.h#2 integrate .. //depot/projects/jail2/sys/sys/lock_profile.h#2 integrate .. //depot/projects/jail2/sys/sys/mac_policy.h#6 delete .. //depot/projects/jail2/sys/sys/mount.h#5 integrate .. //depot/projects/jail2/sys/sys/mouse.h#2 integrate .. //depot/projects/jail2/sys/sys/mutex.h#4 integrate .. //depot/projects/jail2/sys/sys/param.h#8 integrate .. //depot/projects/jail2/sys/sys/pcpu.h#3 integrate .. //depot/projects/jail2/sys/sys/proc.h#6 integrate .. //depot/projects/jail2/sys/sys/rtprio.h#4 integrate .. //depot/projects/jail2/sys/sys/runq.h#2 integrate .. //depot/projects/jail2/sys/sys/sched.h#5 integrate .. //depot/projects/jail2/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/jail2/sys/sys/soundcard.h#4 integrate .. //depot/projects/jail2/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/jail2/sys/sys/sysent.h#3 integrate .. //depot/projects/jail2/sys/sys/systm.h#8 integrate .. //depot/projects/jail2/sys/sys/uio.h#2 integrate .. //depot/projects/jail2/sys/sys/umtx.h#6 integrate .. //depot/projects/jail2/sys/sys/unpcb.h#3 integrate .. //depot/projects/jail2/sys/sys/vmmeter.h#3 integrate .. //depot/projects/jail2/sys/sys/vnode.h#4 integrate .. //depot/projects/jail2/sys/sys/watchdog.h#2 integrate .. //depot/projects/jail2/sys/vm/swap_pager.c#5 integrate .. //depot/projects/jail2/sys/vm/uma.h#2 integrate .. //depot/projects/jail2/sys/vm/uma_core.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_glue.c#3 integrate .. //depot/projects/jail2/sys/vm/vm_kern.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_object.c#6 integrate .. //depot/projects/jail2/sys/vm/vm_page.c#8 integrate .. //depot/projects/jail2/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/jail2/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include <bsd.own.mk> @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/jail2/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ */ /* @@ -60,6 +60,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ + movq %rsp, %rsi ; \ movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ @@ -98,7 +99,7 @@ IDTVEC(timerint) PUSH_FRAME FAKE_MCOUNT(TF_RIP(%rsp)) - + movq %rsp, %rdi call lapic_handle_timer MEXITCOUNT jmp doreti ==== //depot/projects/jail2/sys/amd64/amd64/cpu_switch.S#2 (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.154 2005/10/17 23:10:31 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ */ #include <machine/asmacros.h> @@ -206,6 +206,11 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) + movl TD_TID(%rsi), %eax + movq %r8, PCPU(CURPCB) + movl %eax, PCPU(CURTID) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp @@ -217,9 +222,6 @@ movq PCB_RIP(%r8),%rax movq %rax,(%rsp) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ - /* Test if debug registers should be restored. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f ==== //depot/projects/jail2/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $ */ #include "opt_atpic.h" @@ -165,6 +165,7 @@ .globl calltrap .type calltrap,@function calltrap: + movq %rsp, %rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -267,6 +268,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) @@ -363,6 +365,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call trap MEXITCOUNT testl %ebx,%ebx ==== //depot/projects/jail2/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -79,6 +79,7 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); @@ -185,12 +186,12 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); 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_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -190,13 +190,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/jail2/sys/amd64/amd64/local_apic.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.33 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.34 2006/12/17 06:48:39 kmacy Exp $"); #include "opt_hwpmc_hooks.h" @@ -610,18 +610,18 @@ } void -lapic_handle_intr(int vector, struct trapframe frame) +lapic_handle_intr(int vector, struct trapframe *frame) { struct intsrc *isrc; if (vector == -1) panic("Couldn't get vector from ISR!"); isrc = intr_lookup_source(apic_idt_to_irq(vector)); - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, frame); } void -lapic_handle_timer(struct trapframe frame) +lapic_handle_timer(struct trapframe *frame) { struct lapic *la; @@ -654,16 +654,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); else - hardclock_cpu(TRAPF_USERMODE(&frame)); + hardclock_cpu(TRAPF_USERMODE(frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(TRAPF_USERMODE(&frame)); + statclock(TRAPF_USERMODE(frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -671,7 +671,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } critical_exit(); } ==== //depot/projects/jail2/sys/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.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); @@ -1167,6 +1164,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -219,7 +219,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701081858.l08IweSS056017>