Date: Wed, 29 Apr 2009 08:22:16 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 161286 for review Message-ID: <200904290822.n3T8MGgV040259@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=161286 Change 161286 by scottl@scottl-deimos on 2009/04/29 08:21:46 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_interface.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/sys_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_exception.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_reg.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_sigtramp.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/endian.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/frame.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/metadata.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pc/bios.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/proc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/reg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/segments.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/signal.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/sysarch.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/locore.S#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/files.at91#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA.hints#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/vmparam.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biossmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/smbios.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#86 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_signal.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#26 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#28 edit .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#18 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#15 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#23 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar.c#8 delete .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar_isa.c#4 delete .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar_pci.c#4 delete .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_arregs.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r300_cmdbuf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r300_reg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_nvm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_cbus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_edreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_edvar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_epreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_epvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/machfb.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/access601.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/amd64-elf.raid.o.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/array.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/command.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/global.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/gui_lib.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/hptintf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/hptproc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/i386-elf.raid.o.uu#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/ioctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mvOs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mvSata.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/mvStorageDev.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/osbsd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/raid5n.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/readme.txt#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/vdevice.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/if_ic.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/LICENSE#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/README#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82599.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/joy/joy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbd/kbdreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbdmux/kbdmux.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malohal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/axphy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mse/mse.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb_pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/if_plip.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_ray.c#10 delete .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_raydbg.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_raymib.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_rayreg.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_rayvar.h#5 delete .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rpreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr.c#8 delete .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr_isa.c#4 delete .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr_pci.c#5 delete .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_srregs.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/tdfx/tdfx_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_freebsd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_sw_transfer.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_sw_transfer.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_share.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_share.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/busdma_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/endian.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/metadata.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pc/bios.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/signal.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/smp.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/ucontext.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/vmparam.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/busdma_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/isa/isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_time.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_smp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_sem.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sockbuf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vnode_if.src#12 integrate .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#25 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ar/Makefile#5 delete .. //depot/projects/scottl-camlock/src/sys/modules/ath/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ixgbe/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mii/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/sync_ar/Makefile#4 delete .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/sync_sr/Makefile#4 delete .. //depot/projects/scottl-camlock/src/sys/modules/nfsclient/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfssvc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/ray/Makefile#3 delete .. //depot/projects/scottl-camlock/src/sys/modules/sr/Makefile#5 delete .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/bsd_comp.c#8 delete .. //depot/projects/scottl-camlock/src/sys/net/ethernet.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_arc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_atm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_atmsubr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_dead.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if_disc.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_faith.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_mib.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ppp.c#15 delete .. //depot/projects/scottl-camlock/src/sys/net/if_ppp.h#3 delete .. //depot/projects/scottl-camlock/src/sys/net/if_pppvar.h#6 delete .. //depot/projects/scottl-camlock/src/sys/net/if_sl.c#11 delete .. //depot/projects/scottl-camlock/src/sys/net/if_slvar.h#4 delete .. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/iso88025.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/ppp_comp.h#3 delete .. //depot/projects/scottl-camlock/src/sys/net/ppp_deflate.c#5 delete .. //depot/projects/scottl-camlock/src/sys/net/ppp_tty.c#9 delete .. //depot/projects/scottl-camlock/src/sys/net/radix_mpath.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/slip.h#3 delete .. //depot/projects/scottl-camlock/src/sys/net/vnet.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_superg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_superg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/at_control.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/igmp_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_gif.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_var.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_dummy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_irc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_mod.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_mod.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_nbt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_pptp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_skinny.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/pim_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/vinet.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/scope6.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_outputfl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/nfs/nfs_nfssvc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/nfs/nfssvc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_socket.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_syscalls.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/olpt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/uio_machdep.c#2 delete .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/swtch.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/intr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/intr_machdep.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/param.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pte.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/sf_buf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/sysarch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/trap_aim.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/atpic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_real.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cpcht.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cpchtvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/autoconf.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/bus_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/elf_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/uio_machdep.c#7 branch .. //depot/projects/scottl-camlock/src/sys/rpc/svc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/param.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/elf_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/acl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/elf_common.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/imgact_elf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kerneldump.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/malloc.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/sys/queue.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/smp.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/dinode.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/inode.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extern.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_reserv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_unix.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/xen/reboot.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_switch.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.1 2009/03/17 00:48:11 jkim Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.4 2009/04/02 01:46:57 jkim Exp $ */ #include <machine/asmacros.h> @@ -64,12 +64,15 @@ /* Fetch PCB. */ movq WAKEUP_CTX(xpcb), %r11 - /* Restore segment registers. */ - mov WAKEUP_PCB(DS), %ds - mov WAKEUP_PCB(ES), %es - mov WAKEUP_XPCB(SS), %ss - mov WAKEUP_PCB(FS), %fs - mov WAKEUP_PCB(GS), %gs + /* Force kernel segment registers. */ + movl $KDSEL, %eax + movw %ax, %ds + movw %ax, %es + movw %ax, %ss + movl $KUF32SEL, %eax + movw %ax, %fs + movl $KUG32SEL, %eax + movw %ax, %gs movl $MSR_FSBASE, %ecx movl WAKEUP_PCB(FSBASE), %eax @@ -123,9 +126,19 @@ /* Restore descriptor tables. */ lidt WAKEUP_XPCB(IDT) lldt WAKEUP_XPCB(LDT) + +#define SDT_SYSTSS 9 +#define SDT_SYSBSY 11 + + /* Clear "task busy" bit and reload TR. */ + movq PCPU(TSS), %rax + andb $(~SDT_SYSBSY | SDT_SYSTSS), 5(%rax) movw WAKEUP_XPCB(TR), %ax ltr %ax +#undef SDT_SYSTSS +#undef SDT_SYSBSY + /* Restore other callee saved registers. */ movq WAKEUP_PCB(R15), %r15 movq WAKEUP_PCB(R14), %r14 ==== //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakecode.S#2 (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/acpica/acpi_wakecode.S,v 1.2 2009/03/23 22:35:30 jkim Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_wakecode.S,v 1.3 2009/04/02 00:23:56 jkim Exp $ */ #define LOCORE @@ -223,6 +223,12 @@ bootgdt: .long 0x00000000 .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 + .long 0x00000000 bootcode64: .long 0x0000ffff @@ -261,6 +267,8 @@ wakeup_gdt: .word 0 .quad 0 + + ALIGN_DATA wakeup_efer: .quad 0 wakeup_pat: ==== //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.24 2009/03/23 22:35:30 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.25 2009/04/02 00:23:56 jkim Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,7 +78,6 @@ int acpi_restorecpu(struct xpcb *, vm_offset_t); int acpi_savecpu(struct xpcb *); -static void acpi_reset_tss(int cpu); static void acpi_alloc_wakeup_handler(void); static void acpi_stop_beep(void *); @@ -116,8 +115,6 @@ stopxpcbs[cpu].xpcb_gdt.rd_base); WAKECODE_FIXUP(wakeup_cpu, int, cpu); - acpi_reset_tss(cpu); - /* do an INIT IPI: assert RESET */ lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id); @@ -220,19 +217,6 @@ } #endif -static void -acpi_reset_tss(int cpu) -{ - uint32_t *tss; - - /* - * We have to clear "task busy" bit in TSS to restore - * task register later. Otherwise, ltr causes GPF. - */ - tss = (uint32_t *)&gdt[NGDT * cpu + GPROC0_SEL] + 1; - *tss &= ~((SDT_SYSBSY ^ SDT_SYSTSS) << 8); -} - int acpi_sleep_machdep(struct acpi_softc *sc, int state) { @@ -289,8 +273,6 @@ stopxpcbs[0].xpcb_gdt.rd_base); WAKECODE_FIXUP(wakeup_cpu, int, 0); - acpi_reset_tss(0); - /* Call ACPICA to enter the desired sleep state */ if (state == ACPI_STATE_S4 && sc->acpi_s4bios) status = AcpiEnterSleepStateS4bios(); ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#10 (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.111 2009/03/17 00:48:11 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.112 2009/04/01 13:09:26 kib Exp $ */ /* @@ -219,10 +219,8 @@ movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ call cpustop_handler + jmp doreti - POP_FRAME - iretq - /* * Executed by a CPU when it receives an IPI_SUSPEND from another CPU. */ @@ -251,6 +249,5 @@ call smp_rendezvous_action movq lapic, %rax movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ - POP_FRAME /* Why not doreti? */ - iretq + jmp doreti #endif /* SMP */ ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,7 +95,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -606,7 +605,10 @@ vendaddr = (vm_offset_t)buf + buflen; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904290822.n3T8MGgV040259>