PERFORCE change 95417 for review
Kip Macy
kmacy at FreeBSD.org
Mon Apr 17 05:23:48 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=95417
Change 95417 by kmacy at kmacy_storage:sun4v_rwbuf on 2006/04/17 05:23:18
IFC
Affected files ...
.. //depot/projects/kmacy_sun4v/src/sys/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/alpha/clock.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/alpha/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/include/cpu.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/include/kdb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/include/pcpu.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_dummy.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_proto.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_syscall.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_sysent.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_sysvec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/syscalls.master#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/gdb_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/io_apic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/apicvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/asmacros.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/bus.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/gdb_machdep.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/intr_machdep.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/kdb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/mptable.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/pmap.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/include/trap.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/isa/atpic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/amd64/pci/pci_bus.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/in_cksum.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/trap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/undefined.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_pio.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_pioreg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_pmc.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_pmcreg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_pmcvar.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_rtc.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_rtcreg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_ssc.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_sscreg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_st.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_twi.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91_usartreg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91rm92reg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/files.at91#2 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/kb920x_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/ohci_atmelarm.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/include/asmacros.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/include/in_cksum.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/include/pmap.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/i80321_aau.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/i80321_dma.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/alpha/common/Makefile.common#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/README#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/lib.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/lib.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/main.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/xmodem.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/xmodem.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/inc/AT91RM9200.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/boot/forth/beastie.4th#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/boot2/boot1.S#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/gatea20.c#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/libi386.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/smbios.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/loader/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/ia64/ski/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/pc98/libpc98/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/pc98/libpc98/gatea20.c#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/boot/pc98/loader/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/powerpc/loader/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/boot/sparc64/loader/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/bsm/audit.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/coda/coda.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_ioctl.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_ipc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_mib.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_sysctl.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_uid16.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/compat/svr4/svr4_stream.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/NOTES#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.alpha#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.i386#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.ia64#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/files.sparc64#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/options#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/options.arm#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/options.i386#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/conf/options.pc98#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/contrib/pf/net/if_pflog.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/crypto/via/padlock.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ddb/db_command.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ddb/ddb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/acpi_support/acpi_asus.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_cmbat.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_dock.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/aha/aha_isa.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/aha/aha_mca.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr_linux.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amrvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/bce/if_bce.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/bce/if_bcefw.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/bce/if_bcereg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ce/tau32-ddk.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ce/tau32-ddk.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/dc/if_dcreg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/de/dc21040reg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/de/if_de.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/de/if_devar.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/drm-preprocess.sh#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/drm.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/drm_agpsupport.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/i915_dma.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/i915_drm.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/i915_drv.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/i915_irq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/i915_mem.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/mga_drv.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/r300_cmdbuf.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/r300_reg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/radeon_drm.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/radeon_state.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/savage_bci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/savage_state.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/sis_ds.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/sis_ds.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/drm/sis_mm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/LICENSE#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/README#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em_hw.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em_hw.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/en/midway.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/exca/exca.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ieee488/upd7210.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iicbus/if_ic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iicbus/iic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iicbus/iicbb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iicbus/iicsmb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iir/iir.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iir/iir.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iir/iir_pci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ipw/if_ipwreg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ipw/if_ipwvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwireg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwivar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/kbd/kbd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/kbdmux/kbdmux.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/md/md.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/mfi/mfi.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/mfi/mfi_disk.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/mfi/mfi_ioctl.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/mfi/mfi_pci.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/mfi/mfireg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/mfi/mfivar.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/patm/if_patm_attach.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/pccbb/pccbbreg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ppbus/lpt.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ppbus/ppbconf.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppcvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_ebus.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_sbus.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/if_ral.c#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/if_ral_pccard.c#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/if_ral_pci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/if_ralreg.h#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/if_ralvar.h#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2560.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2560reg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2560var.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2661.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2661reg.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/ral/rt2661var.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/safe/safe.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_bfe.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_bfe_ebus.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_bfe_macio.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_bfe_sbus.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_bus.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_core.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_dev_sab82532.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_dev_z8530.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/scc/scc_if.m#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/isa/ad1816.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/ich.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pcm/channel.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pcm/dsp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pcm/sound.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pcm/vchan.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/tdfx/tdfx_linux.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/tdfx/tdfx_pci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus_ebus.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus_scc.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_core.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_cpu.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/ubsec/ubsec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/hid.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ohci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/uhci.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/uplcom.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usb_port.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usb_subr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usbdivar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/vkbd/vkbd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/dev/xe/if_xe.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/fs/devfs/devfs.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb_cons.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb_int.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/gdb/gdb_main.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/eli/g_eli.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_bsd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_ccd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_ctl.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_io.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_slice.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_subr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/geom_vfs.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/label/g_label_ufs.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/mirror/g_mirror.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/mirror/g_mirror_ctl.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/raid3/g_raid3.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/vinum/geom_vinum.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/vinum/geom_vinum_state.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/ext2fs/ext2_bitops.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/conf/PAE#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/conf/XBOX#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/exception.s#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/geode.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/io_apic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/include/apicvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/include/atomic.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/include/kdb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/include/xbox.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/isa/atpic.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/isa/npx.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_dummy.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/i386/xbox/xboxfb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ia64/include/kdb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/isa/syscons_isa.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/isofs/cd9660/cd9660_rrip.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/imgact_aout.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_acct.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_alq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_cpu.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_event.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_exit.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mac.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_tc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_time.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/md5c.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/serdev_if.m#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_kdb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_prf.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/syscalls.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/syscalls.master#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_mqueue.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_proto.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_socket2.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_cluster.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_default.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/3dfx/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/3dfx_linux/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/modules/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi_dock/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/modules/acpi/acpi_video/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/ata/atausb/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/bce/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/modules/ce/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/coda5/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/cp/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/crypto/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/de/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/dummynet/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/if_bridge/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/if_gif/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/if_ppp/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/ipfilter/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/ipfw/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/iwi/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/kbdmux/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/mfi/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/modules/netgraph/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/pf/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/pflog/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/ral/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/scc/Makefile#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/modules/smbfs/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/modules/uart/Makefile#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/bridgestp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_arc.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_bridge.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_bridgevar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_media.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_ppp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_tap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/if_vlan.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/ppp_deflate.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/raw_cb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/raw_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/route.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_node.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatalk/ddp_pcb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatalk/ddp_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatm/atm_aal5.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatm/atm_proto.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatm/atm_socket.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatm/atm_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netatm/atm_var.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netgraph/ng_tcpmss.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_carp.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_sack.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/frag6.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_pcb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/ip6_mroute.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/ipsec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/mld6.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/udp6_output.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/ipsec.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/ipsec.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/ipsec_mbuf.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/key.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/key_var.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/keydb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/keysock.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/xform.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/xform_ipcomp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipsec/xform_tcp.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/README#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/ipx_input.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/ipx_ip.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/ipx_pcb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/ipx_pcb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/ipx_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netipx/spx_usrreq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netkey/keysock.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netnatm/natm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netsmb/smb_crypt.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/netsmb/smb_smb.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsserver/nfs_serv.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/opencrypto/crypto.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/pci/dc21040reg.h#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/pci/if_de.c#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/pci/if_devar.h#3 delete
.. //depot/projects/kmacy_sun4v/src/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/posix4/ksched.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/posix4/p1003_1b.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/powerpc/include/bus.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/powerpc/powerpc/mmu_if.m#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_ioctl.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_pipe.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_private.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_syscalls.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_trigger.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/audit/audit_worker.c#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/fhc/clkbrd.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/fhc/clkbrdreg.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/asi.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/kdb.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/tick.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/trap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/_types.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/aio.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/bio.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/buf.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/cdefs.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/clock.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/disk.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/event.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/filedesc.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/gmon.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/hash.h#1 branch
.. //depot/projects/kmacy_sun4v/src/sys/sys/linker.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/mac.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/md5.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/mount.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/param.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/pmckern.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/pmclog.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/proc.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/protosw.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/queue.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/serial.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/signalvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/socketvar.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/sx.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/syscall.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/syscall.mk#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/syscallsubr.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/sysctl.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/sysproto.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/timers.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/umtx.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/sys/vnode.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_extern.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/softdep.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_inode.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_lookup.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_quota.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufsmount.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/pmap.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/swap_pager.h#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_fault.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_mmap.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_object.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_page.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_pageq.c#3 integrate
.. //depot/projects/kmacy_sun4v/src/sys/vm/vnode_pager.c#3 integrate
Differences ...
==== //depot/projects/kmacy_sun4v/src/sys/Makefile#3 (text+ko) ====
@@ -1,7 +1,9 @@
-# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $
+# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $
+
+.include <bsd.own.mk>
# The boot loader
-.if !defined(NO_BOOT)
+.if ${MK_BOOT} != "no"
.if ${MACHINE_ARCH} != "arm"
SUBDIR= boot
.endif
==== //depot/projects/kmacy_sun4v/src/sys/alpha/alpha/clock.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.45 2006/03/28 21:20:11 jhb Exp $");
#include "opt_clock.h"
@@ -49,6 +49,7 @@
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/queue.h>
+#include <sys/smp.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -89,8 +90,6 @@
device_t clockdev;
int clockinitted;
-int tickfix;
-int tickfixinterval;
int adjkerntz; /* local offset from GMT in seconds */
int disable_rtc_set; /* disable resettodr() if != 0 */
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
@@ -103,15 +102,8 @@
#define TIMER_FREQ 1193182
#endif
u_int32_t timer_freq = TIMER_FREQ;
-int timer0_max_count;
-static u_int32_t i8254_lastcount;
-static u_int32_t i8254_offset;
-static int i8254_ticked;
-static int clkintr_pending = 0;
-
extern int cycles_per_sec;
-extern int ncpus;
static timecounter_get_t i8254_get_timecount;
static timecounter_get_t alpha_get_timecount;
@@ -128,7 +120,7 @@
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
0, /* no poll_pps */
- ~0u, /* counter_mask */
+ 0xffff, /* counter_mask */
0, /* frequency */
"i8254" /* name */
};
@@ -142,22 +134,6 @@
/* static u_char timer0_state; */
static u_char timer2_state;
-/*
- * Algorithm for missed clock ticks from Linux/alpha.
- */
-
-/*
- * Shift amount by which scaled_ticks_per_cycle is scaled. Shifting
- * by 48 gives us 16 bits for HZ while keeping the accuracy good even
- * for large CPU clock rates.
- */
-#define FIX_SHIFT 48
-
-static u_int64_t scaled_ticks_per_cycle;
-static u_int32_t max_cycles_per_tick;
-static u_int32_t last_time;
-
-static void handleclock(int usermode, uintfptr_t pc);
static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc,
u_int32_t *timer);
static void set_timer_freq(u_int freq, int intr_freq);
@@ -176,6 +152,7 @@
calibrate_clocks(cycles_per_sec, &pcc, &freq);
cycles_per_sec = pcc;
+ set_cputicker(read_cycle_count, cycles_per_sec, 0);
/*
* XXX: TurboLaser doesn't have an i8254 counter.
@@ -206,7 +183,6 @@
freq, timer_freq);
}
set_timer_freq(timer_freq, hz);
- i8254_timecounter.tc_frequency = timer_freq;
out:
#ifdef EVCNT_COUNTERS
@@ -235,21 +211,12 @@
void
cpu_initclocks()
{
- u_int32_t freq;
if (clockdev == NULL)
panic("cpu_initclocks: no clock attached");
tick = 1000000 / hz; /* number of microseconds between interrupts */
- tickfix = 1000000 - (hz * tick);
- if (tickfix) {
- int ftp;
- ftp = min(ffs(tickfix), ffs(hz));
- tickfix >>= (ftp - 1);
- tickfixinterval = hz >> (ftp - 1);
- }
-
/*
* Establish the clock interrupt; it's a special case.
*
@@ -262,24 +229,18 @@
* hardclock, which would then fall over because p->p_stats
* isn't set at that time.
*/
- freq = cycles_per_sec;
- last_time = alpha_rpcc();
- scaled_ticks_per_cycle = ((u_int64_t)hz << FIX_SHIFT) / freq;
- max_cycles_per_tick = 2*freq / hz;
/*
* XXX: TurboLaser doesn't have an i8254 counter.
* XXX: A replacement is needed, and another method
* XXX: of determining this would be nice.
*/
- if (hwrpb->rpb_type != ST_DEC_21000) {
+ if (hwrpb->rpb_type != ST_DEC_21000)
tc_init(&i8254_timecounter);
- platform.clockintr = handleclock;
- } else
- platform.clockintr = hardclock;
+ platform.clockintr = hardclock;
- if (ncpus == 1) {
- alpha_timecounter.tc_frequency = freq;
+ if (mp_ncpus == 1) {
+ alpha_timecounter.tc_frequency = cycles_per_sec;
tc_init(&alpha_timecounter);
}
@@ -375,7 +336,7 @@
if (count == 0)
goto fail;
if (count > prev_count)
- tot_count += prev_count - (count - timer0_max_count);
+ tot_count += prev_count - (count - 0xffff);
else
tot_count += prev_count - count;
prev_count = count;
@@ -410,40 +371,16 @@
static void
set_timer_freq(u_int freq, int intr_freq)
{
- int new_timer0_max_count;
mtx_lock_spin(&clock_lock);
timer_freq = freq;
- new_timer0_max_count = TIMER_DIV(intr_freq);
- if (new_timer0_max_count != timer0_max_count) {
- timer0_max_count = new_timer0_max_count;
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
- outb(TIMER_CNTR0, timer0_max_count & 0xff);
- outb(TIMER_CNTR0, timer0_max_count >> 8);
- }
+ i8254_timecounter.tc_frequency = timer_freq;
+ outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
+ outb(TIMER_CNTR0, 0);
+ outb(TIMER_CNTR0, 0);
mtx_unlock_spin(&clock_lock);
}
-static void
-handleclock(int usermode, uintfptr_t pc)
-{
-
- KASSERT(hwrpb->rpb_type != ST_DEC_21000,
- ("custom clock handler called on TurboLaser"));
- if (timecounter->tc_get_timecount == i8254_get_timecount) {
- mtx_lock_spin(&clock_lock);
- if (i8254_ticked)
- i8254_ticked = 0;
- else {
- i8254_offset += timer0_max_count;
- i8254_lastcount = 0;
- }
- clkintr_pending = 0;
- mtx_unlock_spin(&clock_lock);
- }
- hardclock(usermode, pc);
-}
-
void
cpu_startprofclock(void)
{
@@ -609,29 +546,8 @@
static unsigned
i8254_get_timecount(struct timecounter *tc)
{
- u_int count;
- u_int high, low;
- mtx_lock_spin(&clock_lock);
-
- /* Select timer0 and latch counter value. */
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH);
-
- low = inb(TIMER_CNTR0);
- high = inb(TIMER_CNTR0);
- count = timer0_max_count - ((high << 8) | low);
- if (count < i8254_lastcount ||
- (!i8254_ticked && (clkintr_pending ||
- ((count < 20) && (inb(IO_ICU1) & 1)))
- )) {
- i8254_ticked = 1;
- i8254_offset += timer0_max_count;
- }
- i8254_lastcount = count;
- count += i8254_offset;
-
- mtx_unlock_spin(&clock_lock);
- return (count);
+ return (0xffff - get_8254_ctr());
}
static unsigned
@@ -640,6 +556,30 @@
return alpha_rpcc();
}
+/*
+ * The RPCC register actually consists of two halves. The lower half
+ * is a raw 32-bit counter that wraps. The upper half is defined in
+ * the Digital UNIX PAL as being a raw per-process cycle count mod 2^32
+ * that is updated on each call to swpctx. In order to produce a 64-bit
+ * counter, we just use the lower half and simulate the upper 32-bits.
+ * The architecture guarantees that there will always be at least one
+ * clock interrupt in between overlaps in the lower half, so as long as
+ * we call this function every clock interrupt we should not miss any
+ * overlaps.
+ */
+uint64_t
+read_cycle_count(void)
+{
+ unsigned pcc_cnt;
+
+ /* Assert a critical section? */
+ pcc_cnt = alpha_rpcc() & 0xffffffff;
+ if (pcc_cnt < PCPU_GET(last_pcc_cnt))
+ PCPU_SET(pcc_base, PCPU_GET(pcc_base) + 1);
+ PCPU_SET(last_pcc_cnt, pcc_cnt);
+ return (pcc_cnt | ((uint64_t)PCPU_GET(pcc_base) << 32));
+}
+
int
acquire_timer2(int mode)
{
==== //depot/projects/kmacy_sun4v/src/sys/alpha/alpha/pmap.c#3 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.189 2006/04/12 04:22:50 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -696,21 +696,6 @@
* Low level helper routines.....
***************************************************/
-
-
-/*
- * this routine defines the region(s) of memory that should
- * not be tested for the modified bit.
- */
-static PMAP_INLINE int
-pmap_track_modified(vm_offset_t va)
-{
- if ((va < kmi.clean_sva) || (va >= kmi.clean_eva))
- return 1;
- else
- return 0;
-}
-
/*
* Routine: pmap_extract
* Function:
@@ -1346,10 +1331,8 @@
("get_pv_entry: wired pte %#lx", tpte));
if ((tpte & PG_FOR) == 0)
vm_page_flag_set(m, PG_REFERENCED);
- if ((tpte & PG_FOW) == 0) {
- if (pmap_track_modified(va))
- vm_page_dirty(m);
- }
+ if ((tpte & PG_FOW) == 0)
+ vm_page_dirty(m);
pmap_invalidate_page(pmap, va);
TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
@@ -1449,10 +1432,8 @@
pmap->pm_stats.resident_count -= 1;
if (oldpte & PG_MANAGED) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list