Date: Sun, 7 May 2006 22:04:25 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 96790 for review Message-ID: <200605072204.k47M4P51046717@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=96790 Change 96790 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/07 22:04:06 IFC Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/alpha/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/conf/NOTES#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/pci/apecs_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/pci/lca_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/arm/xscale/i80321/obio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/lib.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/lib.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 delete .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/kmacy_sun4v/src/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/cam.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/NOTES#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.alpha#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.amd64#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.i386#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.ia64#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.pc98#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.alpha#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.amd64#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.i386#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.ia64#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/conf/options.pc98#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/db_thread.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ddb/ddb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/ppc/ppcvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_ebus.c#4 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/puc_sbus.c#4 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/puc/pucvar.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/README#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sab/sab.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/sab/sab82532reg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_bus_puc.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/serdev_if.m#2 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_rman.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/puc/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/kmacy_sun4v/src/sys/modules/sio/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/modules/sk/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/bpf.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/net/route.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netgraph/netflow/netflow.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/frag6.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/netnatm/natm_pcb.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/nfsserver/nfsrvcache.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pc98/cbus/ppc.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pc98/cbus/ppcreg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/kmacy_sun4v/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/pci/if_sk.c#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pci/if_skreg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pci/xmaciireg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/pci/yukonreg.h#3 delete .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/powerpc/psim/iobus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/bufobj.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/bus.h#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/lock.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/mac_policy.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/module.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/mount.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/param.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/rman.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/turnstile.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/sys/vnode.h#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/alpha/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/Makefile,v 1.1 2000/12/31 23:26:34 mjacob Exp $ +# $FreeBSD: src/sys/alpha/Makefile,v 1.2 2006/05/07 18:12:18 netchild Exp $ # Makefile for alpha tags file @@ -15,8 +15,7 @@ SALPHA= ${SYS}/alpha/mcbus/*.[ch] ${SYS}/alpha/tlsb/*.[ch] \ ${SYS}/alpha/alpha/*.[ch] ${SYS}/alpha/pci/*.[ch] \ ${SYS}/alpha/include/*.[ch] ${SYS}/alpha/isa/*.[ch] \ - ${SYS}/alpha/tc/*.[ch] ${SYS}/alpha/osf1/*.[ch] \ - ${SYS}/alpha/linux/*.[ch] + ${SYS}/alpha/tc/*.[ch] ${SYS}/alpha/osf1/*.[ch] AALPHA= ${SYS}/alpha/alpha/*.s tags:: ==== //depot/projects/kmacy_sun4v/src/sys/alpha/conf/DEFAULTS#3 (text+ko) ==== @@ -1,11 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.4 2006/04/28 21:21:50 marcel Exp $ machine alpha # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/kmacy_sun4v/src/sys/alpha/conf/GENERIC#3 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.193 2006/04/24 08:44:33 delphij Exp $ cpu EV4 cpu EV5 @@ -70,8 +70,6 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current @@ -106,6 +104,8 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion ==== //depot/projects/kmacy_sun4v/src/sys/alpha/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.157 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.158 2006/05/07 18:12:18 netchild Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -62,10 +62,3 @@ # Enable OSF/1 ABI emulation options COMPAT_OSF1 - -# Enable Linux ABI emulation (requires COMPAT_OSF1) -options COMPAT_LINUX - -# Enable the linux-like proc filesystem support (requires COMPAT_LINUX -# and PSEUDOFS) -options LINPROCFS ==== //depot/projects/kmacy_sun4v/src/sys/alpha/isa/isa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.40 2006/05/02 23:27:15 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -224,22 +224,21 @@ } } - if (type == SYS_RES_IRQ) - res = rman_reserve_resource(&isa_irq_rman, start, start, 1, - 0, child); - else - res = rman_reserve_resource(&isa_drq_rman, start, start, 1, - 0, child); - - if (res && !passthrough) { + res = rman_reserve_resource( + (type == SYS_RES_IRQ) ? &isa_irq_rman : &isa_drq_rman, + start, start, 1, 0, child); + if (res == NULL) + return (NULL); + + rman_set_rid(res, *rid); + if (!passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); rle->end = rman_get_end(res); rle->count = 1; rle->res = res; } - - return res; + return (res); } int ==== //depot/projects/kmacy_sun4v/src/sys/alpha/linux/linux_sysvec.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.99 2006/03/18 18:24:38 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.100 2006/05/05 16:10:44 ambrisko Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,6 +69,7 @@ #endif SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); +SET_DECLARE(linux_device_handler_set, struct linux_device_handler); void osendsig(sig_t catcher, ksiginfo_t *kp, sigset_t *mask); @@ -227,6 +228,7 @@ Elf64_Brandinfo **brandinfo; int error; struct linux_ioctl_handler **lihp; + struct linux_device_handler **ldhp; error = 0; @@ -239,6 +241,8 @@ if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_register_handler(*lihp); + SET_FOREACH(ldhp, linux_device_handler_set) + linux_device_register_handler(*ldhp); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -258,6 +262,8 @@ if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) linux_ioctl_unregister_handler(*lihp); + SET_FOREACH(ldhp, linux_device_handler_set) + linux_device_unregister_handler(*ldhp); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/kmacy_sun4v/src/sys/alpha/pci/apecs_pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/kmacy_sun4v/src/sys/alpha/pci/lca_pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/kmacy_sun4v/src/sys/alpha/pci/pcibus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.39 2006/04/22 19:04:21 marcel Exp $"); #include "opt_isa.h" @@ -96,7 +96,7 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + return (isa_alloc_intr(0, 0, irqs[chan])); } int @@ -230,9 +230,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +254,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rstart = rman_get_start(rv); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rstart); ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/apic_vector.S#4 (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.108 2006/03/13 23:55:31 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ */ /* @@ -171,6 +171,25 @@ iretq /* + * Invalidate cache. + */ + .text + SUPERALIGN_TEXT +IDTVEC(invlcache) + pushq %rax + + wbinvd + + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ + + lock + incl smp_tlb_wait + + popq %rax + iretq + +/* * Handler for IPIs sent via the per-cpu IPI bitmap. */ .text ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -703,9 +703,10 @@ error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags, &lastaddr, dmat->segments, &nsegs, 1); + CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", + __func__, dmat, dmat->flags, error, nsegs + 1); + if (error == EINPROGRESS) { - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", - __func__, dmat, dmat->flags, error); return (error); } @@ -714,8 +715,13 @@ else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error 0 nsegs %d", - __func__, dmat, dmat->flags, nsegs + 1); + /* + * Return ENOMEM to the caller so that it can pass it up the stack. + * This error only happens when NOWAIT is set, so deferal is disabled. + */ + if (error == ENOMEM) + return (error); + return (0); } ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/cons.h> +#include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/kerneldump.h> #include <vm/vm.h> @@ -40,6 +41,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -272,6 +278,10 @@ size_t hdrsz; int error; + if (do_minidump) { + minidumpsys(di); + return; + } bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,6 +96,8 @@ typedef u_char bool_t; +static void fpu_clean_state(void); + int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, @@ -407,6 +409,8 @@ PCPU_SET(fpcurthread, curthread); pcb = PCPU_GET(curpcb); + fpu_clean_state(); + if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* * This is the first time this thread has used the FPU, @@ -474,6 +478,7 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { + fpu_clean_state(); fxrstor(addr); intr_restore(s); } else { @@ -484,6 +489,37 @@ } /* + * On AuthenticAMD processors, the fxrstor instruction does not restore + * the x87's stored last instruction pointer, last data pointer, and last + * opcode values, except in the rare case in which the exception summary + * (ES) bit in the x87 status word is set to 1. + * + * In order to avoid leaking this information across processes, we clean + * these values by performing a dummy load before executing fxrstor(). + */ +static double dummy_variable = 0.0; +static void +fpu_clean_state(void) +{ + u_short status; + + /* + * Clear the ES bit in the x87 status word if it is currently + * set, in order to avoid causing a fault in the upcoming load. + */ + fnstsw(&status); + if (status & 0x80) + fnclex(); + + /* + * Load the dummy variable into the x87 stack. This mangles + * the x87 stack, but we don't care since we're about to call + * fxrstor() anyway. + */ + __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); +} + +/* * This really sucks. We want the acpi version only, but it requires * the isa_if.h file in order to get the definitions. */ ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); #include "opt_cpu.h" @@ -233,7 +233,7 @@ "\014<b11>" "\015<b12>" "\016CX16" /* CMPXCHG16B Instruction */ - "\017<b14>" + "\017XTPR" /* Send Task Priority Messages*/ "\020<b15>" "\021<b16>" "\022<b17>" @@ -360,7 +360,8 @@ else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && (cpu_high >= 4)) { cpuid_count(4, 0, regs); - cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + if ((regs[0] & 0x1f) != 0) + cmp = ((regs[0] >> 26) & 0x3f) + 1; } if (cmp > 1) printf("\n Cores per package: %d", cmp); ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.275 2006/05/01 22:06:59 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -183,6 +183,7 @@ mp_topology(void) { struct cpu_group *group; + u_int regs[4]; int logical_cpus; int apic_id; int groups; @@ -195,6 +196,13 @@ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; if (logical_cpus <= 1) return; + /* Nothing to do if reported cores are physical cores. */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { + cpuid_count(4, 0, regs); + if ((regs[0] & 0x1f) != 0 && + logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) + return; + } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { @@ -385,8 +393,8 @@ * are available, use them. */ if (cpu_high >= 4) { - /* Ask the processor about up to 32 caches. */ - for (i = 0; i < 32; i++) { + /* Ask the processor about the L1 cache. */ + for (i = 0; i < 1; i++) { cpuid_count(4, i, p); threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1; if (hyperthreading_cpus < threads_per_cache) @@ -506,6 +514,9 @@ while (!aps_ready) ia32_pause(); + /* Initialize the PAT MSR. */ + pmap_init_pat(); + /* set up CPU registers and state */ cpu_setregs(); @@ -867,6 +878,14 @@ } void +smp_cache_flush(void) +{ + + if (smp_started) + smp_tlb_shootdown(IPI_INVLCACHE, 0, 0); +} + +void smp_invltlb(void) { ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -340,7 +340,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { rman_set_bustag(rv, AMD64_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { ==== //depot/projects/kmacy_sun4v/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); /* * Manages physical address maps. @@ -181,7 +181,7 @@ static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ -static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPDPphys; /* phys addr of kernel level 3 */ u_int64_t KPML4phys; /* phys addr of kernel level 4 */ static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ @@ -551,9 +551,54 @@ *CMAP1 = 0; invltlb(); + + /* Initialize the PAT MSR. */ + pmap_init_pat(); } /* + * Setup the PAT MSR. + */ +void +pmap_init_pat(void) +{ + uint64_t pat_msr; + + /* Bail if this CPU doesn't implement PAT. */ + if (!(cpu_feature & CPUID_PAT)) + panic("no PAT??"); + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605072204.k47M4P51046717>