PERFORCE change 181020 for review

Ivor Prebeg iprebeg at FreeBSD.org
Thu Jul 15 22:14:54 UTC 2010


http://p4web.freebsd.org/@@181020?ac=10

Change 181020 by iprebeg at iprebeg_nxlab_login on 2010/07/15 22:14:21

	Integrate

Affected files ...

.. //depot/projects/vimage/src/share/man/man3/pthread_join.3#3 integrate
.. //depot/projects/vimage/src/share/man/man4/Makefile#23 integrate
.. //depot/projects/vimage/src/share/man/man4/ata.4#4 integrate
.. //depot/projects/vimage/src/share/man/man4/ath.4#8 integrate
.. //depot/projects/vimage/src/share/man/man4/bwi.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/fdt.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/fdtbus.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/siftr.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/simplebus.4#1 branch
.. //depot/projects/vimage/src/share/man/man5/rc.conf.5#15 integrate
.. //depot/projects/vimage/src/share/man/man9/Makefile#15 integrate
.. //depot/projects/vimage/src/share/man/man9/alloc_unr.9#3 integrate
.. //depot/projects/vimage/src/share/man/man9/vm_page_alloc.9#3 integrate
.. //depot/projects/vimage/src/sys/amd64/acpica/Makefile#2 delete
.. //depot/projects/vimage/src/sys/amd64/acpica/acpi_wakecode.S#4 integrate
.. //depot/projects/vimage/src/sys/amd64/acpica/genwakecode.sh#2 delete
.. //depot/projects/vimage/src/sys/amd64/acpica/genwakedata.sh#2 delete
.. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#17 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#29 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#42 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#24 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#40 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/NOTES#25 integrate
.. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#13 integrate
.. //depot/projects/vimage/src/sys/amd64/include/clock.h#8 integrate
.. //depot/projects/vimage/src/sys/amd64/include/cpu.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pmap.h#13 integrate
.. //depot/projects/vimage/src/sys/amd64/include/segments.h#5 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#11 integrate
.. //depot/projects/vimage/src/sys/arm/arm/machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91_aicreg.h#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91_pio_sam9.h#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91_pit.c#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91_pitreg.h#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#8 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91_pmcreg.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91sam9.c#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91sam9_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/at91sam9g20reg.h#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/board_hl201.c#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/files.at91sam9#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/if_macb.c#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/if_macbreg.h#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/if_macbvar.h#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/std.at91sam9#1 branch
.. //depot/projects/vimage/src/sys/arm/at91/std.hl201#1 branch
.. //depot/projects/vimage/src/sys/arm/conf/HL201#1 branch
.. //depot/projects/vimage/src/sys/arm/conf/HL201.hints#1 branch
.. //depot/projects/vimage/src/sys/arm/include/bootinfo.h#3 delete
.. //depot/projects/vimage/src/sys/arm/include/metadata.h#5 integrate
.. //depot/projects/vimage/src/sys/boot/Makefile#11 integrate
.. //depot/projects/vimage/src/sys/boot/common/Makefile.inc#4 integrate
.. //depot/projects/vimage/src/sys/boot/fdt/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/boot/fdt/dts/mpc8555cds.dts#2 integrate
.. //depot/projects/vimage/src/sys/boot/ficl/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/ia64/common/exec.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/ia64/efi/version#3 integrate
.. //depot/projects/vimage/src/sys/boot/ofw/Makefile.inc#2 integrate
.. //depot/projects/vimage/src/sys/boot/ofw/libofw/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/vimage/src/sys/boot/ofw/libofw/ppc64_elf_freebsd.c#1 branch
.. //depot/projects/vimage/src/sys/boot/powerpc/Makefile.inc#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#6 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/ofw/conf.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/ofw/ldscript.powerpc#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/ofw/metadata.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/uboot/Makefile#6 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate
.. //depot/projects/vimage/src/sys/boot/uboot/Makefile.inc#2 integrate
.. //depot/projects/vimage/src/sys/boot/uboot/common/metadata.c#5 integrate
.. //depot/projects/vimage/src/sys/cam/ata/ata_xpt.c#8 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#28 integrate
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/zfsimpl.h#6 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/misc.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/policy.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sid.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/uio.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/vnode.h#10 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#13 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#9 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#8 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#9 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#8 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#10 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#13 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#13 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#8 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#29 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#28 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_signal.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#28 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_signal.c#7 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_filio.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_proto.h#4 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_syscall.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_syscallnames.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysent.c#4 integrate
.. //depot/projects/vimage/src/sys/conf/Makefile.powerpc#3 integrate
.. //depot/projects/vimage/src/sys/conf/files#86 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#31 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#39 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#26 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#29 integrate
.. //depot/projects/vimage/src/sys/conf/kern.mk#11 integrate
.. //depot/projects/vimage/src/sys/conf/kern.post.mk#10 integrate
.. //depot/projects/vimage/src/sys/conf/kern.pre.mk#19 integrate
.. //depot/projects/vimage/src/sys/conf/kmod.mk#16 integrate
.. //depot/projects/vimage/src/sys/conf/ldscript.mips.64#1 branch
.. //depot/projects/vimage/src/sys/conf/ldscript.powerpc64#1 branch
.. //depot/projects/vimage/src/sys/conf/options.powerpc#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/changes.txt#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/adisasm.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/adwalk.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmextern.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmrestag.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtable.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbdump.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbinfo.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompile.c#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#8 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asldefine.h#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslerror.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslfiles.c#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslglobal.h#8 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmain.c#8 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslopt.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslpredef.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslstartup.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltransform.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dtcompile.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dtfield.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dtio.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dtsubtable.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dttable.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dttemplate.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dttemplate.h#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/dtutils.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbcmds.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbdisply.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbfileio.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbhistry.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbinput.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/disassembler/dmobject.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpe.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeblk.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeinit.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeutil.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evrgnini.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evxface.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evxfevnt.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exdump.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exfldio.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exprep.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exregion.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exsystem.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwgpe.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwsleep.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwvalid.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acconfig.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acdisasm.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acevents.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acexcep.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acglobal.h#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/achware.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/aclocal.h#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acobject.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acoutput.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpixf.h#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpredef.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acstruct.h#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl2.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actypes.h#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acutils.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsaccess.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsalloc.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsdump.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsinit.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsnames.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsparse.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsrepair.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nssearch.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsutils.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/osunixxf.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utglobal.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utmisc.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/uttrack.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#2 delete
.. //depot/projects/vimage/src/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu#1 branch
.. //depot/projects/vimage/src/sys/ddb/db_command.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdHardware.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdMemory.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#30 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_button.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_lid.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.reg#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#21 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#20 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-amd.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-highpoint.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ite.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-jmicron.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#49 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#29 integrate
.. //depot/projects/vimage/src/sys/dev/bktr/bktr_core.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwi.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwi_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/bwn/if_bwn.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/cfi/cfi_bus_fdt.c#1 branch
.. //depot/projects/vimage/src/sys/dev/cfi/cfi_bus_lbc.c#2 delete
.. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#15 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#24 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#36 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#33 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_82575.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_api.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_api.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_hw.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_mbx.c#1 branch
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_mbx.h#1 branch
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_regs.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_vf.c#1 branch
.. //depot/projects/vimage/src/sys/dev/e1000/e1000_vf.h#1 branch
.. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#24 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_igb.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_lem.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/fb/vesa.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/fdt/fdt_common.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/fdt/fdt_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/fdt/fdt_powerpc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/fdt/simplebus.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iicbus.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_smbios.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwnreg.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwnvar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.h#13 integrate
.. //depot/projects/vimage/src/sys/dev/md/md.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#14 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#19 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_pci.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_raid.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/ofw_if.m#4 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/openfirm.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#18 integrate
.. //depot/projects/vimage/src/sys/dev/quicc/quicc_bfe_fdt.c#1 branch
.. //depot/projects/vimage/src/sys/dev/quicc/quicc_bfe_ocp.c#2 delete
.. //depot/projects/vimage/src/sys/dev/sec/sec.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sge/if_sge.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sge/if_sgereg.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/tsec/if_tsec.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/tsec/if_tsec.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/tsec/if_tsec_fdt.c#1 branch
.. //depot/projects/vimage/src/sys/dev/tsec/if_tsec_ocp.c#3 delete
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_cl_share.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_bus_ocp.c#2 delete
.. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_powerpc.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#61 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_run.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clport.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clrpcops.c#9 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clsubs.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#14 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdstate.c#7 integrate
.. //depot/projects/vimage/src/sys/geom/cache/g_cache.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/conf/NOTES#38 integrate
.. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#14 integrate
.. //depot/projects/vimage/src/sys/i386/i386/machdep.c#32 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#40 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/include/clock.h#8 integrate
.. //depot/projects/vimage/src/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmap.h#17 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_sysent.c#11 integrate
.. //depot/projects/vimage/src/sys/ia64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/autoconf.c#3 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#20 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/mca.c#5 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/mp_machdep.c#15 integrate
.. //depot/projects/vimage/src/sys/ia64/include/asm.h#3 integrate
.. //depot/projects/vimage/src/sys/ia64/include/mca.h#5 integrate
.. //depot/projects/vimage/src/sys/ia64/include/md_var.h#9 integrate
.. //depot/projects/vimage/src/sys/ia64/include/profile.h#2 integrate
.. //depot/projects/vimage/src/sys/kern/init_sysent.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/kern_clock.c#27 integrate
.. //depot/projects/vimage/src/sys/kern/kern_clocksource.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_context.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#32 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#38 integrate
.. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#28 integrate
.. //depot/projects/vimage/src/sys/kern/kern_syscalls.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_tc.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thr.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/makesyscalls.sh#10 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#36 integrate
.. //depot/projects/vimage/src/sys/kern/subr_prf.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/subr_trap.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/subr_unit.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/sys_generic.c#21 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/sys_socket.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.master#17 integrate
.. //depot/projects/vimage/src/sys/kern/sysv_shm.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#44 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#38 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#33 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#37 integrate
.. //depot/projects/vimage/src/sys/mips/atheros/ar71xxreg.h#3 integrate
.. //depot/projects/vimage/src/sys/mips/atheros/if_arge.c#4 integrate
.. //depot/projects/vimage/src/sys/mips/atheros/if_argevar.h#2 integrate
.. //depot/projects/vimage/src/sys/mips/conf/XLR64#1 branch
.. //depot/projects/vimage/src/sys/mips/conf/XLRN32#2 integrate
.. //depot/projects/vimage/src/sys/mips/include/_bus_octeon.h#2 delete
.. //depot/projects/vimage/src/sys/mips/include/clock.h#3 integrate
.. //depot/projects/vimage/src/sys/mips/include/cpu.h#6 integrate
.. //depot/projects/vimage/src/sys/mips/include/cpuregs.h#5 integrate
.. //depot/projects/vimage/src/sys/mips/include/db_machdep.h#5 integrate
.. //depot/projects/vimage/src/sys/mips/include/md_var.h#3 integrate
.. //depot/projects/vimage/src/sys/mips/include/pmap.h#12 integrate
.. //depot/projects/vimage/src/sys/mips/include/pte.h#6 integrate
.. //depot/projects/vimage/src/sys/mips/include/runq.h#2 integrate
.. //depot/projects/vimage/src/sys/mips/include/tlb.h#2 integrate
.. //depot/projects/vimage/src/sys/mips/mips/cache_mipsNN.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/mips/cpu.c#6 integrate
.. //depot/projects/vimage/src/sys/mips/mips/db_interface.c#2 integrate
.. //depot/projects/vimage/src/sys/mips/mips/db_trace.c#6 integrate
.. //depot/projects/vimage/src/sys/mips/mips/exception.S#7 integrate
.. //depot/projects/vimage/src/sys/mips/mips/fp.S#4 integrate
.. //depot/projects/vimage/src/sys/mips/mips/locore.S#4 integrate
.. //depot/projects/vimage/src/sys/mips/mips/machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/mips/mips/mpboot.S#4 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pm_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#23 integrate
.. //depot/projects/vimage/src/sys/mips/mips/psraccess.S#4 integrate
.. //depot/projects/vimage/src/sys/mips/mips/support.S#6 integrate
.. //depot/projects/vimage/src/sys/mips/mips/swtch.S#6 integrate
.. //depot/projects/vimage/src/sys/mips/mips/tlb.c#2 integrate
.. //depot/projects/vimage/src/sys/mips/mips/trap.c#9 integrate
.. //depot/projects/vimage/src/sys/mips/mips/vm_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/board.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/board.h#3 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/dev/xlr/rge.c#4 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/iodi.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/on_chip.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/xlr_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/rmi/xlr_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/sibyte/sb_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#62 integrate
.. //depot/projects/vimage/src/sys/modules/acpi/acpi/Makefile#12 integrate
.. //depot/projects/vimage/src/sys/modules/cas/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/em/Makefile#8 integrate
.. //depot/projects/vimage/src/sys/modules/hwpmc/Makefile#6 integrate
.. //depot/projects/vimage/src/sys/modules/igb/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/modules/iwnfw/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/modules/iwnfw/iwn6000/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/iwnfw/iwn6050/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/siftr/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/sound/driver/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#16 integrate
.. //depot/projects/vimage/src/sys/net/pfil.h#7 integrate
.. //depot/projects/vimage/src/sys/net/radix.c#7 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#12 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_ccmp.c#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_tkip.c#11 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_ipfw.c#7 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#14 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_source.c#7 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_source.h#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/dn_heap.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw2.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#46 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#47 integrate
.. //depot/projects/vimage/src/sys/netinet/siftr.c#1 branch
.. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#16 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#45 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsnode.h#10 integrate
.. //depot/projects/vimage/src/sys/pc98/cbus/clock.c#15 delete
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC.hints#4 integrate
.. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#20 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/clock.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/copyinout.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/locore.S#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/locore32.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/locore64.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#17 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#16 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea64.c#11 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mp_cpudep.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/nexus.c#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/platform_chrp.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/slb.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/swtch.S#7 delete
.. //depot/projects/vimage/src/sys/powerpc/aim/swtch32.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/swtch64.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr32.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr64.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/aim/vm_machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/clock.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/locore.S#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/platform_bare.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#21 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/swtch.S#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/vm_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/DEFAULTS#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#31 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC64#1 branch
.. //depot/projects/vimage/src/sys/powerpc/conf/MPC85XX#12 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#15 integrate
.. //depot/projects/vimage/src/sys/powerpc/cpufreq/pcr.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/_align.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/_bus.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/_inttypes.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/_stdint.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/_types.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/asm.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/atomic.h#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/bootinfo.h#4 delete
.. //depot/projects/vimage/src/sys/powerpc/include/bus.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/cpufunc.h#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/db_machdep.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/elf.h#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/fdt.h#1 branch
.. //depot/projects/vimage/src/sys/powerpc/include/frame.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/hid.h#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/intr.h#4 delete
.. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/metadata.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/ocpbus.h#4 delete
.. //depot/projects/vimage/src/sys/powerpc/include/param.h#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pcb.h#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pcpu.h#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#12 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/proc.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/profile.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/psl.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pte.h#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/reg.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/runq.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/slb.h#1 branch
.. //depot/projects/vimage/src/sys/powerpc/include/smp.h#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/spr.h#12 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/sr.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/trap_aim.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/ucontext.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/vmparam.h#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/atpic.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ds1553_bus_fdt.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#3 delete
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/i2c.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/nexus.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.c#10 delete
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.h#6 delete
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/openpic_fdt.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/opic.c#3 delete
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/pci_fdt.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/mpc85xx/pci_ocp.c#6 delete
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_real.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_syscons.c#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/grackle.c#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/hrowpic.c#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/openpic_macio.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/bcopy.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/bus_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/busdma_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#15 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/db_interface.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/db_trace.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/elf32_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/powerpc/elf64_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#10 delete
.. //depot/projects/vimage/src/sys/powerpc/powerpc/exec_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/in_cksum.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#15 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mp_machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/openpic.c#11 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/setjmp.S#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/sigcode.S#2 delete
.. //depot/projects/vimage/src/sys/powerpc/powerpc/sigcode32.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/powerpc/sigcode64.S#1 branch
.. //depot/projects/vimage/src/sys/powerpc/powerpc/stack_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/syncicache.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/sys_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/psim/openpic_iobus.c#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/smp.h#9 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#22 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/DEFAULTS#6 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/sys/cdefs.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/elf_common.h#10 integrate
.. //depot/projects/vimage/src/sys/sys/ktrace.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#69 integrate
.. //depot/projects/vimage/src/sys/sys/pcpu.h#19 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#44 integrate
.. //depot/projects/vimage/src/sys/sys/ptrace.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/signalvar.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.h#16 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.mk#16 integrate
.. //depot/projects/vimage/src/sys/sys/syscallsubr.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/sysctl.h#44 integrate
.. //depot/projects/vimage/src/sys/sys/sysent.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/sysproto.h#17 integrate
.. //depot/projects/vimage/src/sys/sys/systm.h#26 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#13 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#11 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#22 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#20 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/softdep.h#4 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/inode.h#7 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_inode.c#4 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#19 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#22 integrate
.. //depot/projects/vimage/src/sys/vm/vm_contig.c#18 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#26 integrate
.. //depot/projects/vimage/src/sys/vm/vm_map.c#27 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#32 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#32 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.h#18 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#27 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pager.h#5 integrate
.. //depot/projects/vimage/src/sys/x86/isa/atrtc.c#3 integrate
.. //depot/projects/vimage/src/sys/x86/isa/clock.c#6 integrate
.. //depot/projects/vimage/src/sys/x86/x86/local_apic.c#3 integrate
.. //depot/projects/vimage/src/sys/x86/x86/timeevents.c#2 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man3/pthread_join.3#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/share/man/man3/pthread_join.3,v 1.19 2010/01/23 13:08:47 kib Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_join.3,v 1.20 2010/06/29 14:32:01 jhb Exp $
 .\"
 .Dd January 23, 2010
 .Dt PTHREAD_JOIN 3
@@ -116,7 +116,7 @@
 .El
 .Pp
 Additionally, the
-.Fn pthread_join
+.Fn pthread_timedjoin_np
 function will fail if:
 .Bl -tag -width Er
 .It Bq Er ETIMEDOUT
@@ -134,7 +134,7 @@
 .St -p1003.1-96 .
 The
 .Fn pthread_timedjoin_np
-is
+is a
 .Fx
-extension, first appeared in
+extension which first appeared in
 .Fx 6.1 .

==== //depot/projects/vimage/src/share/man/man4/Makefile#23 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.481 2010/06/25 15:32:46 rpaulo Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.484 2010/07/14 13:03:00 raj Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -110,6 +110,8 @@
 	fatm.4 \
 	fd.4 \
 	fdc.4 \
+	fdt.4 \
+	fdtbus.4 \
 	firewire.4 \
 	fpa.4 \
 	fwe.4 \
@@ -356,8 +358,10 @@
 	sge.4 \
 	si.4 \
 	siba.4 \
+	siftr.4 \
+	siis.4 \
+	simplebus.4 \
 	sio.4 \
-	siis.4 \
 	sis.4 \
 	sk.4 \
 	smb.4 \
@@ -526,6 +530,7 @@
 MLINKS+=fd.4 stderr.4 \
 	fd.4 stdin.4 \
 	fd.4 stdout.4
+MLINKS+=fdt.4 FDT.4
 MLINKS+=firewire.4 ieee1394.4
 MLINKS+=fpa.4 fea.4
 MLINKS+=fwe.4 if_fwe.4
@@ -677,8 +682,8 @@
 _atp.4=		atp.4
 .endif
 
-.if exists(${.CURDIR}/man4.${MACHINE_ARCH})
-SUBDIR=	man4.${MACHINE_ARCH}
+.if exists(${.CURDIR}/man4.${MACHINE_CPUARCH})
+SUBDIR=	man4.${MACHINE_CPUARCH}
 .endif
 
 .include <bsd.prog.mk>

==== //depot/projects/vimage/src/share/man/man4/ata.4#4 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" (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/share/man/man4/ata.4,v 1.82 2010/03/03 19:44:43 mav Exp $
+.\" $FreeBSD: src/share/man/man4/ata.4,v 1.83 2010/07/03 14:14:42 mav Exp $
 .\"
-.Dd March 3, 2010
+.Dd July 3, 2010
 .Dt ATA 4
 .Os
 .Sh NAME
@@ -103,6 +103,10 @@
 .It Va hint.atapci.X.msi
 set to 1 to allow Message Signalled Interrupts (MSI) to be used by
 specified PCI ATA controller, if supported.
+.It Va hint.ata.X.devX.mode
+limits initial ATA mode for specified device on specified channel.
+.It Va hint.ata.X.mode
+limits initial ATA mode for every device on specified channel.
 .It Va hint.ata.X.pm_level
 controls SATA interface Power Management for specified channel,
 allowing to save some power by the cost of additional command latency.

==== //depot/projects/vimage/src/share/man/man4/ath.4#8 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: src/share/man/man4/ath.4,v 1.52 2010/03/21 17:53:54 sam Exp $
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.53 2010/07/13 16:16:41 maxim Exp $
 .\"/
 .Dd March 21, 2010
 .Dt ATH 4
@@ -198,7 +198,7 @@
 The Atheros Hardware Access Layer was unable to configure the hardware
 as requested.
 The status code is explained in the HAL include file
-.Pa sys/contrib/dev/ath/ah.h .
+.Pa sys/dev/ath/ath_hal/ah.h .
 .It "ath%d: failed to allocate descriptors: %d"
 The driver was unable to allocate contiguous memory for the transmit
 and receive descriptors.
@@ -227,7 +227,7 @@
 The Atheros Hardware Access Layer was unable to reset the hardware
 as requested.
 The status code is explained in the HAL include file
-.Pa sys/contrib/dev/ath/ah.h .
+.Pa sys/dev/ath/ath_hal/ah.h .
 This should not happen.
 .It "ath%d: unable to start recv logic"
 The driver was unable to restart frame reception.

==== //depot/projects/vimage/src/share/man/man4/bwi.4#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/bwi.4,v 1.1 2009/05/16 10:42:00 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/bwi.4,v 1.2 2010/07/01 00:33:50 weongyo Exp $
 .\"
-.Dd May 16, 2009
+.Dd June 30, 2009
 .Dt BWI 4
 .Os
 .Sh NAME
@@ -82,6 +82,7 @@
 .It "Buffalo WLI-PCI-G54S	BCM4306	PCI	b/g"
 .It "Compaq R4035 onboard	BCM4306	PCI	b/g"
 .It "Dell Wireless 1470	BCM4318	Mini PCI	b/g"
+.It "Dell Truemobile 1300 r2	BCM4306	Mini PCI	b/g"
 .It "Dell Truemobile 1400	BCM4309	Mini PCI	b/g"
 .It "HP nx6125	BCM4319	PCI	b/g"
 .It "Linksys WPC54G Ver 3	BCM4318	CardBus	b/g"

==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#15 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.377 2010/04/26 15:31:58 ume Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.379 2010/07/13 16:47:29 simon Exp $
 .\"
-.Dd April 27, 2010
+.Dd July 13, 2010
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1151,9 +1151,10 @@
 .Li em0.101
 on
 .Li em0
-with the vlan tag 101:
+with the vlan tag 101 and the optional the IPv4 address 192.0.2.1/24:
 .Bd -literal
 vlans_em0="101"
+ifconfig_em0_101="inet 192.0.2.1/24"
 .Ed
 .Pp
 To create a vlan device named

==== //depot/projects/vimage/src/share/man/man9/Makefile#15 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.368 2010/01/19 20:36:15 jhb Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.369 2010/07/05 16:23:55 jh Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -374,6 +374,7 @@
 	zone.9
 
 MLINKS=	alloc_unr.9 alloc_unrl.9 \
+	alloc_unr.9 alloc_unr_specific.9 \
 	alloc_unr.9 delete_unrhdr.9 \
 	alloc_unr.9 free_unr.9 \
 	alloc_unr.9 new_unrhdr.9

==== //depot/projects/vimage/src/share/man/man9/alloc_unr.9#3 (text+ko) ====

@@ -22,15 +22,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/alloc_unr.9,v 1.4 2010/02/07 20:36:23 gavin Exp $
+.\" $FreeBSD: src/share/man/man9/alloc_unr.9,v 1.5 2010/07/05 16:23:55 jh Exp $
 .\"
-.Dd February 7, 2010
+.Dd July 5, 2010
 .Dt ALLOC_UNR 9
 .Os
 .Sh NAME
 .Nm new_unrhdr ,
 .Nm delete_unrhdr ,
 .Nm alloc_unr ,
+.Nm alloc_unr_specific ,
 .Nm free_unr
 .Nd "kernel unit number allocator"
 .Sh SYNOPSIS
@@ -43,6 +44,8 @@
 .Fn alloc_unr "struct unrhdr *uh"
 .Ft int
 .Fn alloc_unrl "struct unrhdr *uh"
+.Ft int
+.Fn alloc_unr_specific "struct unrhdr *uh" "u_int item"
 .Ft void
 .Fn free_unr "struct unrhdr *uh" "u_int item"
 .Sh DESCRIPTION
@@ -81,6 +84,13 @@
 Same as
 .Fn alloc_unr
 except that mutex is assumed to be already locked and thus is not used.
+.It Fn alloc_unr_specific uh item
+Allocate a specific unit number.
+This function allocates memory and thus may sleep.
+The allocated unit number is returned on success.
+If the specified number is already allocated or out of the range,
+.Li \-1
+is returned.
 .It Fn free_unr uh item
 Free a previously allocated unit number.
 This function may require allocating memory, and thus it can sleep.

==== //depot/projects/vimage/src/share/man/man9/vm_page_alloc.9#3 (text+ko) ====

@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/vm_page_alloc.9,v 1.7 2010/02/27 17:11:15 kib Exp $
+.\" $FreeBSD: src/share/man/man9/vm_page_alloc.9,v 1.8 2010/07/03 18:25:37 alc Exp $
 .\"
-.Dd February 27, 2010
+.Dd July 3, 2010
 .Dt VM_PAGE_ALLOC 9
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .In vm/vm.h
 .In vm/vm_page.h
 .Ft vm_page_t
-.Fn vm_page_alloc "vm_object_t object" "vm_pindex_t pindex" "int page_req"
+.Fn vm_page_alloc "vm_object_t object" "vm_pindex_t pindex" "int req"
 .Sh DESCRIPTION
 The
 .Fn vm_page_alloc
@@ -51,16 +51,15 @@
 The page returned is inserted into the object, unless
 .Dv VM_ALLOC_NOOBJ
 is specified in the
-.Fa page_req ,
-but is not inserted into a pmap.
-The page may exists in the vm object cache, in which case it will
+.Fa req .
+The page may exist in the vm object cache, in which case it will
 be reactivated instead, moving from the cache into the object page list.
 .Pp
 .Fn vm_page_alloc
 will not sleep.
 .Pp
 Its arguments are:
-.Bl -tag -width ".Fa page_req"
+.Bl -tag -width ".Fa object"
 .It Fa object
 The VM object to allocate the page for.
 The
@@ -70,40 +69,48 @@
 is not specified.
 .It Fa pindex
 The index into the object at which the page should be inserted.
-.It Fa page_req
-A flag indicating how the page should be allocated.
+.It Fa req
+The bitwise-inclusive OR of a class and any optional flags indicating
+how the page should be allocated.
+.Pp
+Exactly one of the following classes must be specified:
 .Bl -tag -width ".Dv VM_ALLOC_INTERRUPT"
 .It Dv VM_ALLOC_NORMAL
 The page should be allocated with no special treatment.

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list