PERFORCE change 120672 for review
Rui Paulo
rpaulo at FreeBSD.org
Thu May 31 15:40:27 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=120672
Change 120672 by rpaulo at rpaulo_epsilon on 2007/05/31 15:40:02
IFC
Affected files ...
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/include/specialreg.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_support.s#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/genassym.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA.hints#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/arm/include/vmparam.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/ep80219_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_ata.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425var.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/Makefile#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/dconsole.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/firewire.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/fwohci.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/fwohci.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/fwohcireg.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/smbios.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/conf.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/main.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/README.quirks#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/cam/cam.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_all.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/kern_windrv.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/vnode.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.pc98#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/kern.mk#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/dnlc.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/Osd/OsdHardware.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_dock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_ctl_defs.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_sge_defs.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_tcb.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_version.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/jhash.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_include.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/sys/mbufq.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/sys/uipc_mvec.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/ulp/toecore/toedev.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons_crom.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/de/if_devar.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/README#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/en/midway.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewire.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/hptmv/ioctl.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/lmc/if_lmc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/md/md.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/bridge.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcbr_if.m#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcbrvar.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcbus_if.m#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcreg.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcvar.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/eth_z8e.dat.gz.uu#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_lro.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_mcp.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/random/yarrow.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sk/if_sk.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/ess.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/solo.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/spicds.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/spicds.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/via8233.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union_vnops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_bit.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_bmap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_dir.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_ialloc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_inode.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_log.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_log_recover.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_rtalloc.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_vnodeops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/conf/GENERIC#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/identcpu.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/support.s#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/trap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/ibcs2/imgact_coff.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/proc.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/specialreg.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/vmparam.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_support.s#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/exception.S#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/locore.S#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/trap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/include/ia64_cpu.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/include/vmparam.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_acct.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_clock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_conf.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_descrip.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_event.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_exec.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_ktrace.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_linker.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_malloc.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mib.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mtxpool.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_resource.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sx.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/link_elf.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/link_elf_obj.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_bus.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_mbpool.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_prof.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_witness.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sys_pipe.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/tty_cons.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_sockbuf.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_cache.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_lookup.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_vnops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vnode_if.src#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/cxgb/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/linux/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/mxge/mxge/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/zfs/Makefile#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/ethernet.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_bridge.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_ethersubr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/route.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_base.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_nat.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_nat.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp.h#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_constants.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_peeloff.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_structs.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_uio.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_usrreq.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/key.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netncp/ncp_conn.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/ncr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/vmparam.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_private.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_syscalls.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_worker.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/smp.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mp_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/bus_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tsb.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tte_hash.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/acct.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/conf.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/filedesc.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/lock_profile.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/sx.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/syslimits.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/systm.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/vmmeter.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/vnode.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_quota.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#4 integrate
Differences ...
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -649,6 +649,8 @@
* Compute the segment size, and adjust counts.
*/
sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK);
+ if (sgsize > dmat->maxsegsz)
+ sgsize = dmat->maxsegsz;
if (buflen < sgsize)
sgsize = buflen;
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/elf_machdep.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@
"/libexec/ld-elf.so.1",
&elf64_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -97,7 +97,7 @@
"/usr/libexec/ld-elf.so.1",
&elf64_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/identcpu.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $");
#include "opt_cpu.h"
@@ -236,7 +236,7 @@
"\015<b12>"
"\016CX16" /* CMPXCHG16B Instruction */
"\017xTPR" /* Send Task Priority Messages*/
- "\020<b15>"
+ "\020PDCM" /* Perf/Debug Capability MSR */
"\021<b16>"
"\022<b17>"
"\023DCA" /* Direct Cache Access */
@@ -342,13 +342,8 @@
}
if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor,
- "AuthenticAMD") == 0) {
+ "AuthenticAMD") == 0)
cpu_feature &= ~CPUID_HTT;
- if (bootverbose)
- printf("\nHTT bit cleared - FreeBSD"
- " does not have licensing issues"
- " requiring it.\n");
- }
/*
* If this CPU supports HTT or CMP then mention the
==== //depot/projects/soc2007/rpaulo-macbook/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.585 2007/05/18 07:10:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $");
/*
* Manages physical address maps.
@@ -1149,7 +1149,7 @@
*/
m->right = *free;
*free = m;
- VMCNT_DEC(wire_count, 1);
+ VMCNT_SUB(wire_count, 1);
return 1;
}
@@ -1459,7 +1459,7 @@
pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */
m->wire_count--;
- VMCNT_DEC(wire_count, 1);
+ VMCNT_SUB(wire_count, 1);
vm_page_free_zero(m);
PMAP_LOCK_DESTROY(pmap);
}
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#2 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $
*/
#include "opt_ddb.h"
@@ -671,49 +671,6 @@
incl %eax
ret
-/*****************************************************************************/
-/* linux_futex support */
-/*****************************************************************************/
-
-futex_fault:
- movq $0,PCB_ONFAULT(%rcx)
- movq $-EFAULT,%rax
- ret
-
-ENTRY(futex_xchgl)
- movq PCPU(CURPCB),%rcx
- movq $futex_fault,PCB_ONFAULT(%rcx)
-
- movq $VM_MAXUSER_ADDRESS-4,%rax
- cmpq %rax,%rsi
- ja futex_fault
-
-#ifdef SMP
- lock
-#endif
- xchgl %edi,(%rsi)
- movl %edi,(%rdx)
- xorl %eax,%eax
- movq %rax,PCB_ONFAULT(%rcx)
- ret
-
-ENTRY(futex_addl)
- movq PCPU(CURPCB),%rcx
- movq $futex_fault,PCB_ONFAULT(%rcx)
-
- movq $VM_MAXUSER_ADDRESS-4,%rax
- cmpq %rax,%rsi
- ja futex_fault
-
-#ifdef SMP
- lock
-#endif
- xaddl %edi,(%rsi)
- movl %edi,(%rdx)
- xorl %eax,%eax
- movq %rax,PCB_ONFAULT(%rcx)
- ret
-
/*
* Support for BB-profiling (gcc -a). The kernbb program will extract
* the data from the kernel.
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.315 2007/03/26 21:45:44 kris Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $");
/*
* AMD64 Trap and System call handling
@@ -468,7 +468,6 @@
* Otherwise, debugger traps "can't happen".
*/
#ifdef KDB
- /* XXX Giant */
if (kdb_trap(type, 0, frame))
goto out;
#endif
==== //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#3 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.477 2007/05/10 01:39:50 kevlo Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $
cpu HAMMER
ident GENERIC
@@ -285,3 +285,6 @@
device firewire # FireWire bus code
device sbp # SCSI over FireWire (Requires scbus and da)
device fwe # Ethernet over FireWire (non-standard!)
+device fwip # IP over FireWire (RFC 2734,3146)
+device dcons # Dumb console driver
+device dcons_crom # Configuration ROM for dcons
==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/specialreg.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.38 2007/03/20 20:22:45 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -123,6 +123,7 @@
#define CPUID2_CNXTID 0x00000400
#define CPUID2_CX16 0x00002000
#define CPUID2_XTPR 0x00004000
+#define CPUID2_PDCM 0x00008000
#define CPUID2_DCA 0x00040000
/*
==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $");
/*
* ARM bus dma support routines
@@ -799,6 +799,8 @@
* Compute the segment size, and adjust counts.
*/
sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK);
+ if (sgsize > dmat->maxsegsz)
+ sgsize = dmat->maxsegsz;
if (buflen < sgsize)
sgsize = buflen;
==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/elf_machdep.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.6 2005/12/26 21:23:56 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@
"/libexec/ld-elf.so.1",
&elf32_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -97,7 +97,7 @@
"/usr/libexec/ld-elf.so.1",
&elf32_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/genassym.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -41,7 +41,6 @@
#include <machine/cpu.h>
#include <machine/proc.h>
#include <machine/cpufunc.h>
-#include <machine/pcb.h>
#include <machine/pte.h>
#include <machine/intr.h>
#include <machine/sysarch.h>
==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.30 2007/01/17 00:53:05 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.31 2007/05/23 13:19:00 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,12 +55,11 @@
#include <machine/cpu.h>
#include <machine/pcb.h>
#include <machine/sysarch.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <vm/vm.h>
+#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
==== //depot/projects/soc2007/rpaulo-macbook/arm/at91/kb920x_machdep.c#2 (text) ====
@@ -48,7 +48,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.21 2007/03/27 06:29:19 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.22 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -77,7 +77,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA#2 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.3 2007/02/26 02:04:24 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.4 2007/05/24 16:27:48 sam Exp $
machine arm
ident AVILA
@@ -30,7 +30,7 @@
options STARTUP_PAGETABLE_ADDR=0x10000000
include "../xscale/ixp425/std.avila"
#To statically compile in device wiring instead of /boot/device.hints
-#hints "GENERIC.hints" #Default places to look for devices.
+hints "AVILA.hints" #Default places to look for devices.
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
@@ -137,3 +137,13 @@
#device crypto
#device cryptodev
#device hifn # NB: Soekris minipci card known to work
+
+#device usb
+#options USB_DEBUG
+#device uhci
+#device ohci
+#device ehci
+#device ugen
+#device umass
+#device scbus # SCSI bus (required for SCSI)
+#device da # Direct Access (disks)
==== //depot/projects/soc2007/rpaulo-macbook/arm/include/vmparam.h#3 (text+ko) ====
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $
+ * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $
*/
#ifndef _MACHINE_VMPARAM_H_
@@ -48,31 +48,12 @@
#define KERNBASE 0xc0000000
/*
- * Override the default pager_map size, there's not enough KVA.
- */
-
-/*
* max number of non-contig chunks of physical RAM you can have
*/
#define VM_PHYSSEG_MAX 32
/*
- * when converting a physical address to a vm_page structure, we
- * want to use a binary search on the chunks of physical memory
- * to find our RAM
- */
-
-#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-
-/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* The physical address space is densely populated.
*/
#define VM_PHYSSEG_DENSE
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/ep80219_machdep.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.6 2007/05/03 09:51:12 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.7 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq31244_machdep.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.27 2007/05/03 09:51:12 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.28 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_ata.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.3 2007/03/14 18:05:04 jhay Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $");
/*
* Compact Flash Support for the Avila Gateworks XScale boards.
@@ -120,17 +120,14 @@
{
struct ata_avila_softc *sc = device_get_softc(dev);
struct ixp425_softc *sa = device_get_softc(device_get_parent(dev));
- u_int32_t alt_t_off, board_type, ide_gpin, ide_irq;
+ u_int32_t alt_t_off, ide_gpin, ide_irq;
- board_type = 0;
sc->sc_dev = dev;
/* NB: borrow from parent */
sc->sc_iot = sa->sc_iot;
sc->sc_exp_ioh = sa->sc_exp_ioh;
- if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0)
- board_type = 1; /* Avila board */
-
- if (board_type == 1) {
+ if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0) {
+ /* Avila board */
if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS1_HWBASE,
IXP425_EXP_BUS_CS1_SIZE, 0, &sc->sc_ioh))
panic("%s: unable to map Expansion Bus CS1 window",
@@ -144,6 +141,7 @@
sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET;
alt_t_off = EXP_TIMING_CS2_OFFSET;
} else {
+ /* Pronghorn */
if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS3_HWBASE,
IXP425_EXP_BUS_CS3_SIZE, 0, &sc->sc_ioh))
panic("%s: unable to map Expansion Bus CS3 window",
@@ -187,11 +185,11 @@
GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPOER,
GPIO_CONF_READ_4(sa, IXP425_GPIO_GPOER) | (1<<ide_gpin));
- /* interrupt is active high */
+ /* set interrupt type */
GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin),
- (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &
- ~GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) |
- GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH));
+ (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~
+ GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) |
+ GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING));
/* clear ISR */
GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1<<ide_gpin));
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.4 2007/05/03 09:51:12 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.5 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/if_npe.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.5 2007/02/10 15:43:58 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -550,11 +550,27 @@
struct npe_softc * sc = device_get_softc(dev);
int unit = device_get_unit(dev);
int error, i;
+ uint32_t imageid;
- /* load NPE firmware and start it running */
- error = ixpnpe_init(sc->sc_npe, "npe_fw", npeconfig[unit].imageid);
- if (error != 0)
- return error;
+ /*
+ * Load NPE firmware and start it running. We assume
+ * that minor version bumps remain compatible so probe
+ * the firmware image starting with the expected version
+ * and then bump the minor version up to the max.
+ */
+ imageid = npeconfig[unit].imageid;
+ for (;;) {
+ error = ixpnpe_init(sc->sc_npe, "npe_fw", imageid);
+ if (error == 0)
+ break;
+ /* ESRCH is returned when the requested image is not present */
+ if (error != ESRCH)
+ return error;
+ /* bump the minor version up to the max possible */
+ if (NPEIMAGE_MINOR(imageid) == 0xff)
+ return error;
+ imageid++;
+ }
if (bus_space_map(sc->sc_iot, npeconfig[unit].regbase,
npeconfig[unit].regsize, 0, &sc->sc_ioh)) {
==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.5 2007/03/14 19:03:07 jhay Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -95,7 +95,7 @@
IXP425_EXP_BUS_CS4_VBASE },
};
-static int
+int
getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase)
{
int i;
@@ -236,17 +236,14 @@
rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0)
panic("ixp425_attach: failed to set up IRQ rman");
- device_add_child(dev, "pcib", 0);
- device_add_child(dev, "ixpclk", 0);
- device_add_child(dev, "ixpwdog", 0);
- device_add_child(dev, "ixpiic", 0);
- device_add_child(dev, "uart", 0);
- /* XXX these are optional, what if they are not configured? */
- device_add_child(dev, "ixpqmgr", 0);
- device_add_child(dev, "npe", 0); /* NPE-B */
- device_add_child(dev, "npe", 1); /* NPE-C */
- device_add_child(dev, "ata_avila", 0); /* XXX */
- device_add_child(dev, "led_avila", 0);
+ BUS_ADD_CHILD(dev, 0, "pcib", 0);
+ BUS_ADD_CHILD(dev, 0, "ixpclk", 0);
+ BUS_ADD_CHILD(dev, 0, "ixpiic", 0);
+ /* XXX move to hints? */
+ BUS_ADD_CHILD(dev, 0, "ixpwdog", 0);
+
+ /* attach wired devices via hints */
+ bus_enumerate_hinted_children(dev);
if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE,
0, &sc->sc_gpio_ioh))
@@ -261,6 +258,60 @@
return (0);
}
+static void
+ixp425_hinted_child(device_t bus, const char *dname, int dunit)
+{
+ device_t child;
+ struct ixp425_ivar *ivar;
+
+ child = BUS_ADD_CHILD(bus, 0, dname, dunit);
+ ivar = IXP425_IVAR(child);
+ resource_int_value(dname, dunit, "addr", &ivar->addr);
+ resource_int_value(dname, dunit, "irq", &ivar->irq);
+}
+
+static device_t
+ixp425_add_child(device_t dev, int order, const char *name, int unit)
+{
+ device_t child;
+ struct ixp425_ivar *ivar;
+
+ child = device_add_child_ordered(dev, order, name, unit);
+ if (child == NULL)
+ return NULL;
+ ivar = malloc(sizeof(struct ixp425_ivar), M_DEVBUF, M_NOWAIT);
+ if (ivar == NULL) {
+ device_delete_child(dev, child);
+ return NULL;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list