PERFORCE change 136528 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Feb 29 23:00:56 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=136528
Change 136528 by marcel at marcel_xcllnt on 2008/02/29 22:59:51
IFC @136526 (time to upgrade my Netra :-)
Affected files ...
.. //depot/projects/usiii/amd64/amd64/busdma_machdep.c#3 integrate
.. //depot/projects/usiii/amd64/amd64/dump_machdep.c#3 integrate
.. //depot/projects/usiii/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/usiii/amd64/conf/GENERIC#5 integrate
.. //depot/projects/usiii/amd64/conf/NOTES#4 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_machdep.c#2 integrate
.. //depot/projects/usiii/arm/arm/genassym.c#2 integrate
.. //depot/projects/usiii/arm/arm/locore.S#3 integrate
.. //depot/projects/usiii/arm/arm/swtch.S#3 integrate
.. //depot/projects/usiii/arm/include/_bus.h#2 integrate
.. //depot/projects/usiii/arm/include/asmacros.h#4 integrate
.. //depot/projects/usiii/arm/include/atomic.h#3 integrate
.. //depot/projects/usiii/arm/include/sysarch.h#2 integrate
.. //depot/projects/usiii/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/usiii/boot/Makefile#2 integrate
.. //depot/projects/usiii/boot/common/bootstrap.h#2 integrate
.. //depot/projects/usiii/boot/common/load_elf.c#2 integrate
.. //depot/projects/usiii/boot/i386/boot2/boot2.c#3 integrate
.. //depot/projects/usiii/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/usiii/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/usiii/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/usiii/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/usiii/boot/ofw/libofw/ofw_console.c#2 integrate
.. //depot/projects/usiii/boot/pc98/btx/btx/Makefile#2 integrate
.. //depot/projects/usiii/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/usiii/boot/pc98/libpc98/Makefile#2 integrate
.. //depot/projects/usiii/boot/pc98/libpc98/biosdisk.c#3 integrate
.. //depot/projects/usiii/boot/powerpc/Makefile#3 integrate
.. //depot/projects/usiii/boot/powerpc/ofw/Makefile#2 integrate
.. //depot/projects/usiii/boot/powerpc/ofw/conf.c#2 integrate
.. //depot/projects/usiii/boot/powerpc/uboot/Makefile#1 branch
.. //depot/projects/usiii/boot/powerpc/uboot/conf.c#1 branch
.. //depot/projects/usiii/boot/powerpc/uboot/help.uboot#1 branch
.. //depot/projects/usiii/boot/powerpc/uboot/ldscript.powerpc#1 branch
.. //depot/projects/usiii/boot/powerpc/uboot/metadata.c#1 branch
.. //depot/projects/usiii/boot/powerpc/uboot/start.S#1 branch
.. //depot/projects/usiii/boot/powerpc/uboot/version#1 branch
.. //depot/projects/usiii/boot/uboot/Makefile#1 branch
.. //depot/projects/usiii/boot/uboot/common/Makefile.inc#1 branch
.. //depot/projects/usiii/boot/uboot/common/main.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/Makefile#1 branch
.. //depot/projects/usiii/boot/uboot/lib/api_public.h#1 branch
.. //depot/projects/usiii/boot/uboot/lib/console.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/copy.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/devicename.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/disk.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/elf_freebsd.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/glue.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/glue.h#1 branch
.. //depot/projects/usiii/boot/uboot/lib/libuboot.h#1 branch
.. //depot/projects/usiii/boot/uboot/lib/module.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/net.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/reboot.c#1 branch
.. //depot/projects/usiii/boot/uboot/lib/time.c#1 branch
.. //depot/projects/usiii/cam/cam_periph.c#2 integrate
.. //depot/projects/usiii/cam/cam_xpt.c#4 integrate
.. //depot/projects/usiii/cam/scsi/scsi_ses.c#2 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/usiii/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/usiii/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/usiii/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/usiii/conf/Makefile.arm#2 integrate
.. //depot/projects/usiii/conf/NOTES#6 integrate
.. //depot/projects/usiii/conf/files#5 integrate
.. //depot/projects/usiii/conf/files.amd64#4 integrate
.. //depot/projects/usiii/conf/files.i386#4 integrate
.. //depot/projects/usiii/conf/files.powerpc#4 integrate
.. //depot/projects/usiii/conf/files.sparc64#4 integrate
.. //depot/projects/usiii/conf/kern.post.mk#2 integrate
.. //depot/projects/usiii/conf/ldscript.powerpc#2 integrate
.. //depot/projects/usiii/conf/options#5 integrate
.. //depot/projects/usiii/conf/options.powerpc#3 integrate
.. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/usiii/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/usiii/dev/acpica/acpi_thermal.c#4 integrate
.. //depot/projects/usiii/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/usiii/dev/amr/amrreg.h#3 integrate
.. //depot/projects/usiii/dev/atkbdc/psm.c#2 integrate
.. //depot/projects/usiii/dev/bce/if_bce.c#3 integrate
.. //depot/projects/usiii/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/usiii/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/usiii/dev/ciss/ciss.c#4 integrate
.. //depot/projects/usiii/dev/coretemp/coretemp.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/usiii/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_tcb.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_version.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_l2t.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_l2t.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_multiq.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/usiii/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/usiii/dev/cxgb/sys/cxgb_support.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/sys/mbufq.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/sys/uipc_mvec.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/usiii/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/usiii/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/usiii/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/usiii/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete
.. //depot/projects/usiii/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch
.. //depot/projects/usiii/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/usiii/dev/em/LICENSE#2 integrate
.. //depot/projects/usiii/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_80003es2lan.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82541.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82543.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_82575.c#3 delete
.. //depot/projects/usiii/dev/em/e1000_82575.h#3 delete
.. //depot/projects/usiii/dev/em/e1000_api.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_api.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_manage.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/usiii/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/usiii/dev/em/e1000_regs.h#3 integrate
.. //depot/projects/usiii/dev/em/if_em.c#4 integrate
.. //depot/projects/usiii/dev/em/if_em.h#4 integrate
.. //depot/projects/usiii/dev/hptiop/hptiop.c#2 integrate
.. //depot/projects/usiii/dev/hptiop/hptiop.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/usiii/dev/hptrr/array.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/him.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/himfuncs.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/hptintf.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/usiii/dev/hptrr/hptrr_config.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/hptrr_os_bsd.c#2 integrate
.. //depot/projects/usiii/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/usiii/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/usiii/dev/hptrr/ldm.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/list.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/os_bsd.h#2 integrate
.. //depot/projects/usiii/dev/hptrr/osm.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/usiii/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_api.c#1 branch
.. //depot/projects/usiii/dev/igb/e1000_api.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/usiii/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/usiii/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/usiii/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/usiii/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/usiii/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/usiii/dev/igb/if_igb.c#1 branch
.. //depot/projects/usiii/dev/igb/if_igb.h#1 branch
.. //depot/projects/usiii/dev/md/md.c#4 integrate
.. //depot/projects/usiii/dev/msk/if_msk.c#4 integrate
.. //depot/projects/usiii/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/usiii/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/usiii/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/usiii/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/usiii/dev/mxge/rss_eth_z8e.h#2 integrate
.. //depot/projects/usiii/dev/mxge/rss_ethp_z8e.h#2 integrate
.. //depot/projects/usiii/dev/ral/rt2560.c#5 integrate
.. //depot/projects/usiii/dev/ral/rt2560reg.h#2 integrate
.. //depot/projects/usiii/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/usiii/dev/rr232x/LICENSE#2 delete
.. //depot/projects/usiii/dev/rr232x/README#2 delete
.. //depot/projects/usiii/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/usiii/dev/rr232x/array.h#2 delete
.. //depot/projects/usiii/dev/rr232x/him.h#2 delete
.. //depot/projects/usiii/dev/rr232x/himfuncs.h#2 delete
.. //depot/projects/usiii/dev/rr232x/hptintf.h#2 delete
.. //depot/projects/usiii/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/usiii/dev/rr232x/ldm.h#2 delete
.. //depot/projects/usiii/dev/rr232x/list.h#2 delete
.. //depot/projects/usiii/dev/rr232x/os_bsd.c#2 delete
.. //depot/projects/usiii/dev/rr232x/os_bsd.h#2 delete
.. //depot/projects/usiii/dev/rr232x/osm.h#2 delete
.. //depot/projects/usiii/dev/rr232x/osm_bsd.c#2 delete
.. //depot/projects/usiii/dev/rr232x/rr232x_config.c#2 delete
.. //depot/projects/usiii/dev/rr232x/rr232x_config.h#2 delete
.. //depot/projects/usiii/dev/sk/if_sk.c#4 integrate
.. //depot/projects/usiii/dev/sk/if_skreg.h#2 integrate
.. //depot/projects/usiii/dev/syscons/syscons.h#4 integrate
.. //depot/projects/usiii/dev/ti/if_ti.c#4 integrate
.. //depot/projects/usiii/dev/twe/twe.c#2 integrate
.. //depot/projects/usiii/dev/usb/ehci.c#3 integrate
.. //depot/projects/usiii/dev/usb/ubsa.c#2 integrate
.. //depot/projects/usiii/dev/usb/ucom.c#2 integrate
.. //depot/projects/usiii/dev/usb/umass.c#3 integrate
.. //depot/projects/usiii/dev/usb/usbdevs#5 integrate
.. //depot/projects/usiii/dev/usb/usbdi.c#2 integrate
.. //depot/projects/usiii/dev/usb/uscanner.c#3 integrate
.. //depot/projects/usiii/fs/coda/TODO#2 integrate
.. //depot/projects/usiii/fs/coda/cnode.h#3 integrate
.. //depot/projects/usiii/fs/coda/coda_fbsd.c#2 integrate
.. //depot/projects/usiii/fs/coda/coda_io.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_kernel.h#2 delete
.. //depot/projects/usiii/fs/coda/coda_namecache.c#2 delete
.. //depot/projects/usiii/fs/coda/coda_namecache.h#3 delete
.. //depot/projects/usiii/fs/coda/coda_opstats.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_pioctl.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_psdev.c#3 integrate
.. //depot/projects/usiii/fs/coda/coda_psdev.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/usiii/fs/coda/coda_subr.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_venus.c#2 integrate
.. //depot/projects/usiii/fs/coda/coda_venus.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_vfsops.c#4 integrate
.. //depot/projects/usiii/fs/coda/coda_vfsops.h#2 integrate
.. //depot/projects/usiii/fs/coda/coda_vnops.c#3 integrate
.. //depot/projects/usiii/fs/coda/coda_vnops.h#2 integrate
.. //depot/projects/usiii/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/usiii/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/usiii/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/usiii/fs/ntfs/ntfs_subr.c#3 integrate
.. //depot/projects/usiii/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/usiii/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/usiii/fs/nwfs/nwfs_node.c#3 integrate
.. //depot/projects/usiii/fs/pseudofs/pseudofs_vncache.c#3 integrate
.. //depot/projects/usiii/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/usiii/fs/smbfs/smbfs_node.c#3 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/usiii/fs/unionfs/union_vfsops.c#4 integrate
.. //depot/projects/usiii/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/usiii/gdb/gdb_main.c#2 integrate
.. //depot/projects/usiii/geom/geom_disk.c#2 integrate
.. //depot/projects/usiii/geom/linux_lvm/g_linux_lvm.c#1 branch
.. //depot/projects/usiii/geom/linux_lvm/g_linux_lvm.h#1 branch
.. //depot/projects/usiii/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate
.. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate
.. //depot/projects/usiii/i386/conf/GENERIC#5 integrate
.. //depot/projects/usiii/i386/conf/NOTES#4 integrate
.. //depot/projects/usiii/i386/cpufreq/est.c#2 integrate
.. //depot/projects/usiii/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/usiii/i386/i386/dump_machdep.c#3 integrate
.. //depot/projects/usiii/i386/i386/geode.c#3 integrate
.. //depot/projects/usiii/i386/i386/identcpu.c#2 integrate
.. //depot/projects/usiii/i386/i386/initcpu.c#2 integrate
.. //depot/projects/usiii/i386/i386/minidump_machdep.c#3 integrate
.. //depot/projects/usiii/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/usiii/ia64/conf/GENERIC#5 integrate
.. //depot/projects/usiii/ia64/ia64/locore.S#2 integrate
.. //depot/projects/usiii/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/usiii/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/usiii/ia64/include/md_var.h#2 integrate
.. //depot/projects/usiii/kern/init_sysent.c#3 integrate
.. //depot/projects/usiii/kern/kern_descrip.c#4 integrate
.. //depot/projects/usiii/kern/kern_exit.c#4 integrate
.. //depot/projects/usiii/kern/kern_ktrace.c#5 integrate
.. //depot/projects/usiii/kern/kern_lock.c#4 integrate
.. //depot/projects/usiii/kern/kern_mib.c#4 integrate
.. //depot/projects/usiii/kern/kern_module.c#3 integrate
.. //depot/projects/usiii/kern/kern_mutex.c#4 integrate
.. //depot/projects/usiii/kern/kern_rwlock.c#4 integrate
.. //depot/projects/usiii/kern/kern_tc.c#3 integrate
.. //depot/projects/usiii/kern/kern_timeout.c#5 integrate
.. //depot/projects/usiii/kern/subr_autoconf.c#2 integrate
.. //depot/projects/usiii/kern/subr_lock.c#5 integrate
.. //depot/projects/usiii/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/usiii/kern/subr_turnstile.c#3 integrate
.. //depot/projects/usiii/kern/syscalls.c#3 integrate
.. //depot/projects/usiii/kern/syscalls.master#4 integrate
.. //depot/projects/usiii/kern/systrace_args.c#3 integrate
.. //depot/projects/usiii/kern/sysv_shm.c#3 integrate
.. //depot/projects/usiii/kern/uipc_shm.c#2 integrate
.. //depot/projects/usiii/kern/uipc_sockbuf.c#4 integrate
.. //depot/projects/usiii/kern/uipc_socket.c#4 integrate
.. //depot/projects/usiii/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/usiii/kern/vfs_bio.c#5 integrate
.. //depot/projects/usiii/kern/vfs_cache.c#5 integrate
.. //depot/projects/usiii/kern/vfs_default.c#3 integrate
.. //depot/projects/usiii/kern/vfs_lookup.c#5 integrate
.. //depot/projects/usiii/kern/vfs_mount.c#5 integrate
.. //depot/projects/usiii/kern/vfs_subr.c#5 integrate
.. //depot/projects/usiii/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/usiii/kern/vnode_if.src#3 integrate
.. //depot/projects/usiii/libkern/cmpdi2.c#1 branch
.. //depot/projects/usiii/libkern/quad.h#2 integrate
.. //depot/projects/usiii/modules/Makefile#6 integrate
.. //depot/projects/usiii/modules/coda/Makefile#2 integrate
.. //depot/projects/usiii/modules/coda5/Makefile#2 integrate
.. //depot/projects/usiii/modules/cxgb/Makefile#4 integrate
.. //depot/projects/usiii/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/usiii/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/usiii/modules/cxgb/tom/Makefile#2 integrate
.. //depot/projects/usiii/modules/em/Makefile#2 integrate
.. //depot/projects/usiii/modules/geom/Makefile#3 integrate
.. //depot/projects/usiii/modules/geom/geom_eli/Makefile#2 integrate
.. //depot/projects/usiii/modules/geom/geom_linux_lvm/Makefile#1 branch
.. //depot/projects/usiii/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/usiii/modules/igb/Makefile#1 branch
.. //depot/projects/usiii/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/usiii/modules/rr232x/Makefile#2 delete
.. //depot/projects/usiii/modules/sound/driver/emu10kx/Makefile#3 integrate
.. //depot/projects/usiii/modules/zfs/Makefile#3 integrate
.. //depot/projects/usiii/net/route.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/usiii/netgraph/netflow/netflow.c#3 integrate
.. //depot/projects/usiii/netgraph/netflow/ng_netflow.c#3 integrate
.. //depot/projects/usiii/netgraph/ng_base.c#4 integrate
.. //depot/projects/usiii/netgraph/ng_bpf.c#3 integrate
.. //depot/projects/usiii/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/usiii/netgraph/ng_pppoe.c#5 integrate
.. //depot/projects/usiii/netgraph/ng_tee.c#2 integrate
.. //depot/projects/usiii/netinet/in_rmx.c#3 integrate
.. //depot/projects/usiii/netinet/ip_carp.c#3 integrate
.. //depot/projects/usiii/netinet/ip_dummynet.c#4 integrate
.. //depot/projects/usiii/netinet/ip_fw.h#3 integrate
.. //depot/projects/usiii/netinet/ip_fw2.c#6 integrate
.. //depot/projects/usiii/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/usiii/netinet/ip_id.c#3 integrate
.. //depot/projects/usiii/netinet/sctp_output.c#4 integrate
.. //depot/projects/usiii/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/usiii/netinet/tcp_var.h#6 integrate
.. //depot/projects/usiii/netncp/ncp_conn.c#3 integrate
.. //depot/projects/usiii/netsmb/smb_conn.c#3 integrate
.. //depot/projects/usiii/netsmb/smb_iod.c#3 integrate
.. //depot/projects/usiii/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/usiii/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/usiii/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/usiii/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/usiii/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/usiii/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/usiii/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/usiii/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/usiii/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/usiii/nfsclient/nfsm_subs.h#2 integrate
.. //depot/projects/usiii/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/usiii/pc98/cbus/sio.c#4 integrate
.. //depot/projects/usiii/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/usiii/powerpc/aim/locore.S#2 integrate
.. //depot/projects/usiii/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/usiii/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/usiii/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/usiii/powerpc/conf/NOTES#5 integrate
.. //depot/projects/usiii/powerpc/fpu/fpu_add.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_arith.h#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_compare.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_div.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_emu.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_emu.h#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_explode.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_extern.h#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_implode.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_instr.h#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_mul.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_sqrt.c#1 branch
.. //depot/projects/usiii/powerpc/fpu/fpu_subr.c#1 branch
.. //depot/projects/usiii/powerpc/include/bootinfo.h#2 integrate
.. //depot/projects/usiii/powerpc/include/float.h#2 integrate
.. //depot/projects/usiii/powerpc/include/hid.h#2 integrate
.. //depot/projects/usiii/powerpc/include/intr_machdep.h#2 integrate
.. //depot/projects/usiii/powerpc/include/metadata.h#2 integrate
.. //depot/projects/usiii/powerpc/include/openpicreg.h#2 integrate
.. //depot/projects/usiii/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/usiii/powerpc/include/spr.h#2 integrate
.. //depot/projects/usiii/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/usiii/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/usiii/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/usiii/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/usiii/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/usiii/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/usiii/powerpc/powerpc/pic_if.m#2 integrate
.. //depot/projects/usiii/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/usiii/security/audit/audit.c#4 integrate
.. //depot/projects/usiii/security/audit/audit_arg.c#3 integrate
.. //depot/projects/usiii/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/usiii/security/audit/audit_bsm_klib.c#4 integrate
.. //depot/projects/usiii/security/audit/audit_private.h#2 integrate
.. //depot/projects/usiii/security/audit/audit_worker.c#4 integrate
.. //depot/projects/usiii/sparc64/include/md_var.h#2 integrate
.. //depot/projects/usiii/sparc64/sparc64/ata_machdep.c#1 branch
.. //depot/projects/usiii/sys/buf.h#3 integrate
.. //depot/projects/usiii/sys/conf.h#3 integrate
.. //depot/projects/usiii/sys/ipc.h#2 integrate
.. //depot/projects/usiii/sys/ktrace.h#2 integrate
.. //depot/projects/usiii/sys/lock.h#3 integrate
.. //depot/projects/usiii/sys/lockmgr.h#4 integrate
.. //depot/projects/usiii/sys/module.h#2 integrate
.. //depot/projects/usiii/sys/param.h#5 integrate
.. //depot/projects/usiii/sys/priv.h#4 integrate
.. //depot/projects/usiii/sys/proc.h#5 integrate
.. //depot/projects/usiii/sys/rwlock.h#2 integrate
.. //depot/projects/usiii/sys/shm.h#2 integrate
.. //depot/projects/usiii/sys/socket.h#4 integrate
.. //depot/projects/usiii/sys/socketvar.h#3 integrate
.. //depot/projects/usiii/sys/syscall.h#3 integrate
.. //depot/projects/usiii/sys/syscall.mk#3 integrate
.. //depot/projects/usiii/sys/syscallsubr.h#3 integrate
.. //depot/projects/usiii/sys/sysproto.h#3 integrate
.. //depot/projects/usiii/sys/user.h#5 integrate
.. //depot/projects/usiii/sys/vnode.h#4 integrate
.. //depot/projects/usiii/tools/embed_mfs.sh#1 branch
.. //depot/projects/usiii/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/usiii/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/usiii/vm/vm_object.c#6 integrate
Differences ...
==== //depot/projects/usiii/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.84 2007/11/27 17:28:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -598,14 +598,14 @@
* Count the number of bounce pages
* needed in order to complete this transfer
*/
- vaddr = trunc_page((vm_offset_t)buf);
+ vaddr = (vm_offset_t)buf;
vendaddr = (vm_offset_t)buf + buflen;
while (vaddr < vendaddr) {
paddr = pmap_kextract(vaddr);
if (run_filter(dmat, paddr) != 0)
map->pagesneeded++;
- vaddr += PAGE_SIZE;
+ vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
}
CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
}
==== //depot/projects/usiii/amd64/amd64/dump_machdep.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.13 2008/01/28 19:04:06 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,6 +177,7 @@
uint64_t pgs;
size_t counter, sz, chunk;
int i, c, error, twiddle;
+ u_int maxdumppgs;
error = 0; /* catch case in which chunk size is 0 */
counter = 0; /* Update twiddle every 16MB */
@@ -184,13 +185,16 @@
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
+ maxdumppgs = di->maxiosize / PAGE_SIZE;
+ if (maxdumppgs == 0) /* seatbelt */
+ maxdumppgs = 1;
printf(" chunk %d: %ldMB (%ld pages)", seqnr, PG2MB(pgs), pgs);
while (pgs) {
chunk = pgs;
- if (chunk > MAXDUMPPGS)
- chunk = MAXDUMPPGS;
+ if (chunk > maxdumppgs)
+ chunk = maxdumppgs;
sz = chunk << PAGE_SHIFT;
counter += sz;
if (counter >> 24) {
==== //depot/projects/usiii/amd64/amd64/minidump_machdep.c#3 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,11 @@
{
size_t len;
int error, i, c;
+ u_int maxdumpsz;
+ maxdumpsz = di->maxiosize;
+ if (maxdumpsz == 0) /* seatbelt */
+ maxdumpsz = PAGE_SIZE;
error = 0;
if ((sz % PAGE_SIZE) != 0) {
printf("size not page aligned\n");
@@ -143,7 +147,7 @@
return (error);
}
while (sz) {
- len = (MAXDUMPPGS * PAGE_SIZE) - fragsz;
+ len = maxdumpsz - fragsz;
if (len > sz)
len = sz;
counter += len;
@@ -165,7 +169,7 @@
fragsz += len;
pa += len;
sz -= len;
- if (fragsz == (MAXDUMPPGS * PAGE_SIZE)) {
+ if (fragsz == maxdumpsz) {
error = blk_flush(di);
if (error)
return (error);
==== //depot/projects/usiii/amd64/conf/GENERIC#5 (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.491 2008/01/07 21:40:09 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.493 2008/02/19 06:30:49 ru Exp $
cpu HAMMER
ident GENERIC
@@ -30,7 +30,7 @@
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
-options SCTP # Stream Control Transmission Protocol
+options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
@@ -116,7 +116,6 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device ch # SCSI media changers
@@ -133,7 +132,6 @@
device dpt # DPT Smartcache III, IV - See NOTES for options
device hptmv # Highpoint RocketRAID 182x
device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
-device rr232x # Highpoint RocketRAID 232x
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
==== //depot/projects/usiii/amd64/conf/NOTES#4 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.75 2008/02/03 07:07:30 scottl Exp $
#
#
@@ -381,11 +381,6 @@
device hptrr
#
-# Highpoint RocketRAID 232x. This is software RAID but with hardware
-# acceleration assistance for RAID_5.
-device rr232x
-
-#
# Highpoint RocketRaid 3xxx series SATA RAID
device hptiop
==== //depot/projects/usiii/amd64/linux32/linux32_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.46 2008/02/11 19:35:03 jkim Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -907,21 +907,22 @@
PROC_UNLOCK(p);
}
- /* This gives us our maximum stack size */
- if (linux_args->len > STACK_SIZE - GUARD_SIZE)
- bsd_args.len = linux_args->len;
- else
- bsd_args.len = STACK_SIZE - GUARD_SIZE;
-
/*
- * This gives us a new BOS. If we're using VM_STACK, then
- * mmap will just map the top SGROWSIZ bytes, and let
- * the stack grow down to the limit at BOS. If we're
- * not using VM_STACK we map the full stack, since we
- * don't have a way to autogrow it.
+ * This gives us our maximum stack size and a new BOS.
+ * If we're using VM_STACK, then mmap will just map
+ * the top SGROWSIZ bytes, and let the stack grow down
+ * to the limit at BOS. If we're not using VM_STACK
+ * we map the full stack, since we don't have a way
+ * to autogrow it.
*/
- bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
- bsd_args.len;
+ if (linux_args->len > STACK_SIZE - GUARD_SIZE) {
+ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
+ bsd_args.len = linux_args->len;
+ } else {
+ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
+ (STACK_SIZE - GUARD_SIZE - linux_args->len);
+ bsd_args.len = STACK_SIZE - GUARD_SIZE;
+ }
} else {
bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
bsd_args.len = linux_args->len;
==== //depot/projects/usiii/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.10 2007/08/08 09:27:52 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -102,6 +102,8 @@
ASSYM(P_FLAG, offsetof(struct proc, p_flag));
ASSYM(ARM_TP_ADDRESS, ARM_TP_ADDRESS);
+ASSYM(ARM_RAS_START, ARM_RAS_START);
+ASSYM(ARM_RAS_END, ARM_RAS_END);
ASSYM(PAGE_SIZE, PAGE_SIZE);
ASSYM(PDESIZE, PDESIZE);
ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL);
==== //depot/projects/usiii/arm/arm/locore.S#3 (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.17 2007/09/27 20:52:17 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.18 2008/02/05 10:23:42 raj Exp $");
/* What size should this really be ? It is only used by initarm() */
#define INIT_ARM_STACK_SIZE 2048
@@ -69,7 +69,7 @@
#if defined (FLASHADDR) && defined(LOADERRAMADDR)
/* Check if we're running from flash. */
ldr r7, =FLASHADDR
- /*
+ /*
* If we're running with MMU disabled, test against the
* physical address instead.
*/
@@ -88,7 +88,7 @@
bls from_ram
do_copy:
ldr r9, =KERNBASE
- adr r1, _start
+ adr r1, _start
ldr r0, Lreal_start
ldr r2, Lend
sub r2, r2, r0
@@ -105,7 +105,7 @@
adr r7, Lunmapped
bic r7, r7, #0xff000000
orr r7, r7, #PHYSADDR
-
+
disable_mmu:
/* Disable MMU for a while */
@@ -170,7 +170,7 @@
ldr pc, .Lvirt_done
virt_done:
- mov fp, #0 /* trace back starts here */
+ mov fp, #0 /* trace back starts here */
bl _C_LABEL(initarm) /* Off we go */
/* init arm will return the new stack pointer. */
@@ -180,7 +180,7 @@
adr r0, .Lmainreturned
b _C_LABEL(panic)
- /* NOTEACHED */
+ /* NOTREACHED */
#ifdef STARTUP_PAGETABLE_ADDR
#define MMU_INIT(va,pa,n_sec,attr) \
.word n_sec ; \
@@ -229,9 +229,6 @@
.text
.align 0
-#ifndef OFW
- /* OFW based systems will used OF_boot() */
-
.Lcpufuncs:
.word _C_LABEL(cpufuncs)
@@ -260,7 +257,7 @@
mov r2, #0
/*
- * MMU & IDC off, 32 bit program & data space
+ * MMU & IDC off, 32 bit program & data space
* Hurl ourselves into the ROM
*/
mov r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE)
@@ -285,7 +282,6 @@
.Lcpu_reset_needs_v4_MMU_disable:
.word _C_LABEL(cpu_reset_needs_v4_MMU_disable)
-#endif /* OFW */
#ifdef IPKDB
/*
==== //depot/projects/usiii/arm/arm/swtch.S#3 (text+ko) ====
@@ -83,7 +83,7 @@
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.21 2007/10/13 12:05:03 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.22 2008/02/05 10:22:33 raj Exp $");
/*
@@ -205,7 +205,7 @@
/* Set the new tp */
ldr r6, [r5, #(TD_MD + MD_TP)]
- mov r5, #ARM_TP_ADDRESS
+ ldr r5, =ARM_TP_ADDRESS
strt r6, [r5]
/* Hook in a new pcb */
@@ -263,7 +263,7 @@
* them for the new process.
*/
/* Store the old tp */
- mov r3, #ARM_TP_ADDRESS
+ ldr r3, =ARM_TP_ADDRESS
ldrt r9, [r3]
str r9, [r0, #(TD_MD + MD_TP)]
==== //depot/projects/usiii/arm/include/_bus.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
-% * Copyright (c) 2005 M. Warner Losh.
+ * Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
+ * $FreeBSD: src/sys/arm/include/_bus.h,v 1.2 2008/02/26 11:45:32 rwatson Exp $
*/
#ifndef ARM_INCLUDE__BUS_H
==== //depot/projects/usiii/arm/include/asmacros.h#4 (text+ko) ====
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.7 2007/12/02 12:49:28 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.8 2008/02/05 10:22:33 raj Exp $
*/
#ifndef _MACHINE_ASMACROS_H_
@@ -68,10 +68,10 @@
mov r0, r0; /* NOP for previous instruction */ \
mrs r0, spsr_all; /* Put the SPSR on the stack */ \
str r0, [sp, #-4]!; \
- mov r0, #0xe0000004; \
+ ldr r0, =ARM_RAS_START; \
mov r1, #0; \
str r1, [r0]; \
- mov r0, #0xe0000008; \
+ ldr r0, =ARM_RAS_END; \
mov r1, #0xffffffff; \
str r1, [r0];
@@ -119,11 +119,11 @@
add r0, sp, #(4*13); /* Adjust the stack pointer */ \
stmia r0, {r13-r14}^; /* Push the user mode registers */ \
mov r0, r0; /* NOP for previous instruction */ \
- ldr r5, =0xe0000004; /* Check if there's any RAS */ \
+ ldr r5, =ARM_RAS_START; /* Check if there's any RAS */ \
ldr r3, [r5]; \
cmp r3, #0; /* Is the update needed ? */ \
ldrgt lr, [r0, #16]; \
- ldrgt r1, =0xe0000008; \
+ ldrgt r1, =ARM_RAS_END; \
ldrgt r4, [r1]; /* Get the end of the RAS */ \
movgt r2, #0; /* Reset the magic addresses */ \
strgt r2, [r5]; \
==== //depot/projects/usiii/arm/include/atomic.h#3 (text+ko) ====
@@ -33,18 +33,20 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/atomic.h,v 1.23 2007/12/02 12:49:28 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/atomic.h,v 1.24 2008/02/05 10:22:33 raj Exp $
*/
#ifndef _MACHINE_ATOMIC_H_
#define _MACHINE_ATOMIC_H_
-
-
#ifndef _LOCORE
#include <sys/types.h>
+#ifndef _KERNEL
+#include <machine/sysarch.h>
+#endif
+
#ifndef I32_bit
#define I32_bit (1 << 7) /* IRQ disable */
#endif
@@ -71,9 +73,6 @@
: "cc" ); \
} while(0)
-#define ARM_RAS_START 0xe0000004
-#define ARM_RAS_END 0xe0000008
-
static __inline uint32_t
__swp(uint32_t val, volatile uint32_t *ptr)
{
@@ -145,28 +144,24 @@
static __inline u_int32_t
atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval)
{
- register int done, ras_start;
+ register int done, ras_start = ARM_RAS_START;
__asm __volatile("1:\n"
"adr %1, 1b\n"
- "mov %0, #0xe0000004\n"
"str %1, [%0]\n"
- "mov %0, #0xe0000008\n"
"adr %1, 2f\n"
- "str %1, [%0]\n"
+ "str %1, [%0, #4]\n"
"ldr %1, [%2]\n"
"cmp %1, %3\n"
"streq %4, [%2]\n"
"2:\n"
"mov %1, #0\n"
- "mov %0, #0xe0000004\n"
"str %1, [%0]\n"
"mov %1, #0xffffffff\n"
- "mov %0, #0xe0000008\n"
- "str %1, [%0]\n"
+ "str %1, [%0, #4]\n"
"moveq %1, #1\n"
"movne %1, #0\n"
- : "=r" (ras_start), "=r" (done)
+ : "+r" (ras_start), "=r" (done)
,"+r" (p), "+r" (cmpval), "+r" (newval) : : "memory");
return (done);
}
@@ -174,106 +169,90 @@
static __inline void
atomic_add_32(volatile u_int32_t *p, u_int32_t val)
{
- int ras_start, start;
+ int start, ras_start = ARM_RAS_START;
__asm __volatile("1:\n"
"adr %1, 1b\n"
- "mov %0, #0xe0000004\n"
"str %1, [%0]\n"
- "mov %0, #0xe0000008\n"
"adr %1, 2f\n"
- "str %1, [%0]\n"
+ "str %1, [%0, #4]\n"
"ldr %1, [%2]\n"
"add %1, %1, %3\n"
"str %1, [%2]\n"
"2:\n"
- "mov %0, #0xe0000004\n"
"mov %1, #0\n"
"str %1, [%0]\n"
"mov %1, #0xffffffff\n"
- "mov %0, #0xe0000008\n"
- "str %1, [%0]\n"
- : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)
+ "str %1, [%0, #4]\n"
+ : "+r" (ras_start), "=r" (start), "+r" (p), "+r" (val)
: : "memory");
}
static __inline void
atomic_subtract_32(volatile u_int32_t *p, u_int32_t val)
{
- int ras_start, start;
+ int start, ras_start = ARM_RAS_START;
__asm __volatile("1:\n"
"adr %1, 1b\n"
- "mov %0, #0xe0000004\n"
"str %1, [%0]\n"
- "mov %0, #0xe0000008\n"
"adr %1, 2f\n"
- "str %1, [%0]\n"
+ "str %1, [%0, #4]\n"
"ldr %1, [%2]\n"
"sub %1, %1, %3\n"
"str %1, [%2]\n"
"2:\n"
- "mov %0, #0xe0000004\n"
"mov %1, #0\n"
"str %1, [%0]\n"
"mov %1, #0xffffffff\n"
- "mov %0, #0xe0000008\n"
- "str %1, [%0]\n"
+ "str %1, [%0, #4]\n"
- : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)
+ : "+r" (ras_start), "=r" (start), "+r" (p), "+r" (val)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list