PERFORCE change 151453 for review
Marko Zec
zec at FreeBSD.org
Thu Oct 16 13:29:00 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=151453
Change 151453 by zec at zec_tpx32 on 2008/10/16 13:28:21
IFC @ 151449
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_spi.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/intr.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/resource.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/Makefile#4 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/Makefile.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/common/load_elf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#7 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/api_public.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#10 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#12 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#4 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options.arm#2 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_aereg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_aevar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/aha/aha_isa.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/aha/aha_mca.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#9 delete
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-sata.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acard.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-amd.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ati.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ite.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-micron.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-national.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/psm.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/ati_pcigart.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_agpsupport.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_atomic.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_auth.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_context.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_dma.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drawable.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_fops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_ioctl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_linux_list.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_memory.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sysctl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_vm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drm.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_suspend.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/tdfx_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hptiop/hptiop.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jme.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jmereg.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/mii/atphy.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/bridge.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcbrvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcvar.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_mv.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehcivar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ohci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/slhci_pccard.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/u3g.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb/uark.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ubsa.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/umass.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/umct.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_node.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_io.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/portalfs/portal_vnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_vfs.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_firmware.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_sockbuf.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/libkern/qdivrem.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/Makefile#9 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ae/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ata/ata/Makefile#2 delete
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atacore/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atadevel/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atadevel/ata-devel.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/Makefile.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ehci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ohci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/slhci/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/u3g/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/uhci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/wpifw/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/ng_netflow.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/nexusvar.h#2 delete
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pci.c#2 delete
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pci.h#2 delete
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pcibus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_kauai.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/grackle.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/uninorth.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/uninorthvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/psim/iobus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/bufobj.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/proc.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/tty.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/un.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#4 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.258 2008/09/11 18:33:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -280,6 +280,14 @@
*/
bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe));
+ /* If the current thread has the trap bit set (i.e. a debugger had
+ * single stepped the process to the system call), we need to clear
+ * the trap flag from the new frame. Otherwise, the new thread will
+ * receive a (likely unexpected) SIGTRAP when it executes the first
+ * instruction after returning to userland.
+ */
+ td->td_frame->tf_rflags &= ~PSL_T;
+
/*
* Set registers for trampoline to user mode. Leave space for the
* return address on stack. These are the kernel mode register values.
==== //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#7 (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.507 2008/08/20 08:31:58 ed Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.508 2008/10/03 10:31:31 stas Exp $
cpu HAMMER
ident GENERIC
@@ -200,6 +200,7 @@
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
+device ae # Attansic/Atheros L2 FastEthernet
device age # Attansic/Atheros L1 Gigabit Ethernet
device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.17 2008/04/08 09:45:47 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.18 2008/10/14 07:59:23 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -880,4 +880,15 @@
(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \
LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
+/* robust futexes */
+struct linux_robust_list {
+ l_uintptr_t next;
+};
+
+struct linux_robust_list_head {
+ struct linux_robust_list list;
+ l_ulong futex_offset;
+ l_uintptr_t pending_list;
+};
+
#endif /* !_AMD64_LINUX_H_ */
==== //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.38 2008/03/12 15:31:37 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.39 2008/10/13 18:59:59 raj Exp $");
/*
* ARM bus dma support routines
@@ -629,6 +629,8 @@
newmap->allocbuffer = tmpaddr;
cpu_idcache_wbinv_range((vm_offset_t)*vaddr,
dmat->maxsize);
+ cpu_l2cache_wbinv_range((vm_offset_t)*vaddr,
+ dmat->maxsize);
*vaddr = tmpaddr;
} else
newmap->origbuffer = newmap->allocbuffer = NULL;
==== //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.22 2007/11/28 22:55:55 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.23 2008/10/13 18:16:54 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -357,6 +357,66 @@
arm10_setup /* cpu setup */
};
+
+struct cpu_functions feroceon_cpufuncs = {
+ /* CPU functions */
+
+ cpufunc_id, /* id */
+ cpufunc_nullop, /* cpwait */
+
+ /* MMU functions */
+
+ cpufunc_control, /* control */
+ cpufunc_domains, /* Domain */
+ feroceon_setttb, /* Setttb */
+ cpufunc_faultstatus, /* Faultstatus */
+ cpufunc_faultaddress, /* Faultaddress */
+
+ /* TLB functions */
+
+ armv4_tlb_flushID, /* tlb_flushID */
+ arm10_tlb_flushID_SE, /* tlb_flushID_SE */
+ armv4_tlb_flushI, /* tlb_flushI */
+ arm10_tlb_flushI_SE, /* tlb_flushI_SE */
+ armv4_tlb_flushD, /* tlb_flushD */
+ armv4_tlb_flushD_SE, /* tlb_flushD_SE */
+
+ /* Cache operations */
+
+ armv5_ec_icache_sync_all, /* icache_sync_all */
+ armv5_ec_icache_sync_range, /* icache_sync_range */
+
+ armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */
+ feroceon_dcache_wbinv_range, /* dcache_wbinv_range */
+ feroceon_dcache_inv_range, /* dcache_inv_range */
+ feroceon_dcache_wb_range, /* dcache_wb_range */
+
+ armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */
+ feroceon_idcache_wbinv_range, /* idcache_wbinv_all */
+
+ feroceon_l2cache_wbinv_all, /* l2cache_wbinv_all */
+ feroceon_l2cache_wbinv_range, /* l2cache_wbinv_range */
+ feroceon_l2cache_inv_range, /* l2cache_inv_range */
+ feroceon_l2cache_wb_range, /* l2cache_wb_range */
+
+ /* Other functions */
+
+ cpufunc_nullop, /* flush_prefetchbuf */
+ armv4_drain_writebuf, /* drain_writebuf */
+ cpufunc_nullop, /* flush_brnchtgt_C */
+ (void *)cpufunc_nullop, /* flush_brnchtgt_E */
+
+ (void *)cpufunc_nullop, /* sleep */
+
+ /* Soft functions */
+
+ cpufunc_null_fixup, /* dataabt_fixup */
+ cpufunc_null_fixup, /* prefetchabt_fixup */
+
+ arm10_context_switch, /* context_switch */
+
+ arm10_setup /* cpu setup */
+};
#endif /* CPU_ARM9E || CPU_ARM10 */
#ifdef CPU_ARM10
@@ -933,9 +993,36 @@
}
#endif /* CPU_ARM9 */
#if defined(CPU_ARM9E) || defined(CPU_ARM10)
- if (cputype == CPU_ID_ARM926EJS ||
- cputype == CPU_ID_ARM1026EJS) {
- cpufuncs = armv5_ec_cpufuncs;
+ if (cputype == CPU_ID_ARM926EJS || cputype == CPU_ID_ARM1026EJS ||
+ cputype == CPU_ID_MV88FR131 || cputype == CPU_ID_MV88FR571_VD ||
+ cputype == CPU_ID_MV88FR571_41) {
+ if (cputype == CPU_ID_MV88FR131 ||
+ cputype == CPU_ID_MV88FR571_VD ||
+ cputype == CPU_ID_MV88FR571_41) {
+
+ cpufuncs = feroceon_cpufuncs;
+ /*
+ * Workaround for Marvell MV78100 CPU: Cache prefetch
+ * mechanism may affect the cache coherency validity,
+ * so it needs to be disabled.
+ *
+ * Refer to errata document MV-S501058-00C.pdf (p. 3.1
+ * L2 Prefetching Mechanism) for details.
+ */
+ if (cputype == CPU_ID_MV88FR571_VD ||
+ cputype == CPU_ID_MV88FR571_41) {
+ feroceon_control_ext(0xffffffff,
+ FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
+ FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN |
+ FC_L2_PREF_DIS);
+ } else {
+ feroceon_control_ext(0xffffffff,
+ FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
+ FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN);
+ }
+ } else
+ cpufuncs = armv5_ec_cpufuncs;
+
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
get_cachetype_cp15();
pmap_pte_init_generic();
==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -215,6 +215,7 @@
{
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
cpu_tlb_flushID();
return (0);
}
==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.21 2008/08/04 14:37:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $");
#include <machine/asm.h>
#include <sys/param.h>
#include <sys/elf32.h>
@@ -73,6 +73,8 @@
#endif
#ifdef CPU_XSCALE_81342
#define cpu_l2cache_wbinv_all xscalec3_l2cache_purge
+#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
+#define cpu_l2cache_wbinv_all feroceon_l2cache_wbinv_all
#else
#define cpu_l2cache_wbinv_all()
#endif
==== //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.12 2008/10/13 18:59:59 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -79,7 +79,9 @@
ASSYM(CF_CONTROL, offsetof(struct cpu_functions, cf_control));
ASSYM(CF_CONTEXT_SWITCH, offsetof(struct cpu_functions, cf_context_switch));
ASSYM(CF_DCACHE_WB_RANGE, offsetof(struct cpu_functions, cf_dcache_wb_range));
+ASSYM(CF_L2CACHE_WB_RANGE, offsetof(struct cpu_functions, cf_l2cache_wb_range));
ASSYM(CF_IDCACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_idcache_wbinv_all));
+ASSYM(CF_L2CACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_l2cache_wbinv_all));
ASSYM(CF_TLB_FLUSHID_SE, offsetof(struct cpu_functions, cf_tlb_flushID_SE));
ASSYM(CF_ICACHE_SYNC, offsetof(struct cpu_functions, cf_icache_sync_all));
==== //depot/projects/vimage-commit2/src/sys/arm/arm/identcpu.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.13 2008/05/23 04:03:53 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.14 2008/10/13 18:16:54 raj Exp $");
#include <sys/systm.h>
#include <sys/param.h>
#include <sys/malloc.h>
@@ -75,7 +75,8 @@
CPU_CLASS_ARM10EJ,
CPU_CLASS_SA1,
CPU_CLASS_XSCALE,
- CPU_CLASS_ARM11J
+ CPU_CLASS_ARM11J,
+ CPU_CLASS_MARVELL
};
static const char * const generic_steppings[16] = {
@@ -304,6 +305,15 @@
{ CPU_ID_ARM1136JSR1, CPU_CLASS_ARM11J, "ARM1136J-S R1",
generic_steppings },
+ { CPU_ID_MV88FR131, CPU_CLASS_MARVELL, "Feroceon 88FR131",
+ generic_steppings },
+
+ { CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD",
+ generic_steppings },
+
+ { CPU_ID_MV88FR571_41, CPU_CLASS_MARVELL, "Early Feroceon 88FR571",
+ generic_steppings },
+
{ 0, CPU_CLASS_NONE, NULL, NULL }
};
==== //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#2 (text+ko) ====
@@ -37,7 +37,7 @@
#include <machine/asm.h>
#include <machine/armreg.h>
#include <machine/pte.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.19 2008/04/08 10:24:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.21 2008/10/14 10:11:14 raj Exp $");
/* What size should this really be ? It is only used by initarm() */
#define INIT_ARM_STACK_SIZE 2048
@@ -66,6 +66,13 @@
ENTRY_NP(btext)
ASENTRY_NP(_start)
+
+/*
+ * Move metadata ptr to r12 (ip)
+ */
+
+ mov ip, r0
+
#if defined (FLASHADDR) && defined(LOADERRAMADDR)
/* Check if we're running from flash. */
ldr r7, =FLASHADDR
@@ -170,6 +177,8 @@
ldr pc, .Lvirt_done
virt_done:
+ mov r0, ip /* Load argument: metadata ptr */
+
mov fp, #0 /* trace back starts here */
bl _C_LABEL(initarm) /* Off we go */
@@ -245,6 +254,8 @@
ldr r0, .Lcpufuncs
mov lr, pc
ldr pc, [r0, #CF_IDCACHE_WBINV_ALL]
+ mov lr, pc
+ ldr pc, [r0, #CF_L2CACHE_WBINV_ALL]
/*
* Load the cpu_reset_needs_v4_MMU_disable flag to determine if it's
==== //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#3 (text+ko) ====
@@ -147,10 +147,11 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.104 2008/10/13 18:59:59 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/ktr.h>
#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/msgbuf.h>
@@ -1196,27 +1197,104 @@
}
static PMAP_INLINE void
+pmap_l2cache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
+{
+ vm_size_t rest;
+ pd_entry_t *pde;
+ pt_entry_t *ptep;
+
+ rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+ while (len > 0) {
+ CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d "
+ "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+ if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+ cpu_l2cache_wb_range(va, rest);
+
+ len -= rest;
+ va += rest;
+
+ rest = MIN(PAGE_SIZE, len);
+ }
+}
+
+static PMAP_INLINE void
pmap_idcache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
{
- if (pmap_is_current(pm))
+ if (pmap_is_current(pm)) {
cpu_idcache_wbinv_range(va, len);
+ pmap_l2cache_wbinv_range(pm, va, len);
+ }
}
static PMAP_INLINE void
-pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len,
- boolean_t do_inv, boolean_t rd_only)
+pmap_l2cache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len)
+{
+ vm_size_t rest;
+ pd_entry_t *pde;
+ pt_entry_t *ptep;
+
+ rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+ while (len > 0) {
+ CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
+ "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+ if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+ cpu_l2cache_wb_range(va, rest);
+
+ len -= rest;
+ va += rest;
+
+ rest = MIN(PAGE_SIZE, len);
+ }
+}
+
+static PMAP_INLINE void
+pmap_l2cache_inv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
{
+ vm_size_t rest;
+ pd_entry_t *pde;
+ pt_entry_t *ptep;
+
+ rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+ while (len > 0) {
+ CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
+ "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+ if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+ cpu_l2cache_inv_range(va, rest);
+
+ len -= rest;
+ va += rest;
+ rest = MIN(PAGE_SIZE, len);
+ }
+}
+
+static PMAP_INLINE void
+pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv,
+ boolean_t rd_only)
+{
+ CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x "
+ "len 0x%x ", pm, pm == pmap_kernel(), va, len);
+ CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only);
+
if (pmap_is_current(pm)) {
if (do_inv) {
- if (rd_only)
+ if (rd_only) {
cpu_dcache_inv_range(va, len);
- else
+ pmap_l2cache_inv_range(pm, va, len);
+ }
+ else {
cpu_dcache_wbinv_range(va, len);
+ pmap_l2cache_wbinv_range(pm, va, len);
+ }
} else
- if (!rd_only)
+ if (!rd_only) {
cpu_dcache_wb_range(va, len);
+ pmap_l2cache_wb_range(pm, va, len);
+ }
}
}
@@ -1224,16 +1302,20 @@
pmap_idcache_wbinv_all(pmap_t pm)
{
- if (pmap_is_current(pm))
+ if (pmap_is_current(pm)) {
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
+ }
}
static PMAP_INLINE void
pmap_dcache_wbinv_all(pmap_t pm)
{
- if (pmap_is_current(pm))
+ if (pmap_is_current(pm)) {
cpu_dcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
+ }
}
/*
@@ -2169,6 +2251,8 @@
PTE_SYNC(pdep);
cpu_dcache_wbinv_range((vm_offset_t)pdep,
sizeof(*pdep));
+ cpu_l2cache_wbinv_range((vm_offset_t)pdep,
+ sizeof(*pdep));
rv = 1;
}
} else {
@@ -2185,6 +2269,8 @@
PTE_SYNC(ptep);
cpu_dcache_wbinv_range((vm_offset_t)ptep,
sizeof(*ptep));
+ cpu_l2cache_wbinv_range((vm_offset_t)ptep,
+ sizeof(*ptep));
rv = 1;
}
}
@@ -2337,6 +2423,7 @@
}
cpu_dcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
cpu_tlb_flushID();
cpu_cpwait();
@@ -2373,6 +2460,7 @@
mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF);
pmap_init_l1(l1, kernel_l1pt);
cpu_dcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
virtual_avail = round_page(virtual_avail);
virtual_end = lastaddr;
@@ -2402,6 +2490,7 @@
struct pcb *pcb;
pmap_idcache_wbinv_all(pmap);
+ cpu_l2cache_wbinv_all();
pmap_tlb_flushID(pmap);
cpu_cpwait();
if (vector_page < KERNBASE) {
@@ -2589,6 +2678,7 @@
* rarely
*/
cpu_dcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
cpu_tlb_flushD();
cpu_cpwait();
kernel_vm_end = pmap_curmaxkvaddr;
@@ -2614,6 +2704,7 @@
vm_page_lock_queues();
PMAP_LOCK(pmap);
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) {
if (pv->pv_flags & PVF_WIRED) {
/* The page is wired, cannot remove it now. */
@@ -2726,6 +2817,7 @@
(uint32_t) pte, opte, *pte));
if (l2pte_valid(opte)) {
cpu_dcache_wbinv_range(va, PAGE_SIZE);
+ cpu_l2cache_wbinv_range(va, PAGE_SIZE);
cpu_tlb_flushD_SE(va);
cpu_cpwait();
} else {
@@ -2784,6 +2876,7 @@
opte = *pte;
if (l2pte_valid(opte)) {
cpu_dcache_wbinv_range(va, PAGE_SIZE);
+ cpu_l2cache_wbinv_range(va, PAGE_SIZE);
cpu_tlb_flushD_SE(va);
cpu_cpwait();
*pte = 0;
@@ -3052,6 +3145,9 @@
u_int flags;
int flush;
+ CTR4(KTR_PMAP, "pmap_protect: pmap %p sva 0x%08x eva 0x%08x prot %x",
+ pm, sva, eva, prot);
+
if ((prot & VM_PROT_READ) == 0) {
pmap_remove(pm, sva, eva);
return;
@@ -3286,9 +3382,11 @@
*/
if (pmap_is_current(pmap) &&
(oflags & PVF_NC) == 0 &&
- (opte & L2_S_PROT_W) != 0 &&
- (prot & VM_PROT_WRITE) == 0)
+ (opte & L2_S_PROT_W) != 0 &&
+ (prot & VM_PROT_WRITE) == 0) {
cpu_dcache_wb_range(va, PAGE_SIZE);
+ pmap_l2cache_wb_range(pmap, va, PAGE_SIZE);
+ }
} else {
/*
* New mapping, or changing the backing page
@@ -3777,11 +3875,15 @@
total++;
if (is_exec) {
cpu_idcache_wbinv_range(sva,
- PAGE_SIZE);
+ PAGE_SIZE);
+ cpu_l2cache_wbinv_range(sva,
+ PAGE_SIZE);
cpu_tlb_flushID_SE(sva);
} else if (is_refd) {
cpu_dcache_wbinv_range(sva,
- PAGE_SIZE);
+ PAGE_SIZE);
+ cpu_l2cache_wbinv_range(sva,
+ PAGE_SIZE);
cpu_tlb_flushD_SE(sva);
}
} else if (total == PMAP_REMOVE_CLEAN_LIST_SIZE) {
@@ -3789,6 +3891,7 @@
* for a current pmap
*/
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
flushall = 1;
total++;
}
@@ -3842,29 +3945,29 @@
if (off || size != PAGE_SIZE) {
bzero(dstpg + off, size);
cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size);
+ cpu_l2cache_wbinv_range((vm_offset_t)(dstpg + off), size);
} else {
bzero_page((vm_offset_t)dstpg);
cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
+ cpu_l2cache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
}
#else
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list