PERFORCE change 181147 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sun Jul 18 17:03:47 UTC 2010
http://p4web.freebsd.org/@@181147?ac=10
Change 181147 by gabor at gabor_aspire on 2010/07/18 17:03:13
IFC
Affected files ...
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/compat-43/sigcompat.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/gen/_thread_init.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/gmon/gmon.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/net/sctp_sys_calls.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/posix1e/acl_from_text.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/posix1e/acl_from_text_nfs4.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/posix1e/acl_support.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/Makefile.inc#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/SYS.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/Symbol.map#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/_fpmath.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/arith.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gd_qnan.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/Makefile.inc#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/_ctx_start.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/_set_tp.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/_setjmp.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/fabs.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/flt_rounds.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/fpgetmask.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/fpgetround.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/fpgetsticky.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/fpsetmask.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/fpsetround.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/infinity.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/makecontext.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/modf.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/setjmp.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/signalcontext.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/sigsetjmp.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/gen/syncicache.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/softfloat/milieu.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/softfloat/powerpc-gcc.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/softfloat/softfloat.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/Makefile.inc#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/brk.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/cerror.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/exect.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/pipe.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/ptrace.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/sbrk.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/powerpc64/sys/setlogin.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/sys/ptrace.2#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/acpica/Makefile#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/acpica/genwakecode.sh#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/acpica/genwakedata.sh#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/include/cpu.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/amd64/include/segments.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91_aicreg.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91_pio_sam9.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91_pit.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91_pitreg.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91_pmcreg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91sam9.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91sam9_machdep.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/at91sam9g20reg.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/board_hl201.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/files.at91sam9#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/if_macb.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/if_macbreg.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/if_macbvar.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/std.at91sam9#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/at91/std.hl201#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/conf/HL201#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/conf/HL201.hints#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/include/bootinfo.h#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/fdt/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/fdt/dts/mpc8555cds.dts#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ia64/efi/version#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ofw/Makefile.inc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/ofw/libofw/ppc64_elf_freebsd.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/Makefile.inc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/boot1.chrp/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/ofw/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/ofw/conf.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/ofw/ldscript.powerpc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/ofw/metadata.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/uboot/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/uboot/Makefile.inc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/boot/uboot/common/metadata.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/boot/zfs/zfsimpl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/sys/sid.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/files#4 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/files.amd64#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/files.i386#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/files.pc98#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/files.powerpc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/kern.mk#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/kmod.mk#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/ldscript.mips.64#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/ldscript.powerpc64#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/conf/options.powerpc#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/adwalk.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/dmextern.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/dmrestag.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/dmtable.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dtcompile.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dtcompiler.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dtfield.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dtio.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dtsubtable.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dttable.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dttemplate.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dttemplate.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/compiler/dtutils.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evgpeinit.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evgpeutil.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evxface.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/events/evxfevnt.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/executer/exdump.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/executer/exprep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/executer/exregion.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acevents.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acexcep.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acoutput.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acstruct.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/actbl2.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/osunixxf.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ddb/db_command.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/Osd/OsdHardware.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/Osd/OsdMemory.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/acpi_button.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/acpica/acpi_lid.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/agp/agp.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/aic7xxx/aic79xx.reg#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-amd.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-intel.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-ite.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-promise.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-sis.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ata/chipsets/ata-via.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/bktr/bktr_core.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/bwi/if_bwi_pci.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/bwn/if_bwn.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cfi/cfi_bus_fdt.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cfi/cfi_bus_lbc.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/fdt/fdt_common.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/fdt/fdt_pci.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/fdt/fdt_powerpc.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/fdt/simplebus.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/flash/mx25l.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/hwpmc/hwpmc_core.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ipmi/ipmi_smbios.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/iwn/if_iwn.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/md/md.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ofw/ofw_if.m#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ofw/ofw_standard.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ofw/openfirm.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/ofw/openfirm.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/quicc/quicc_bfe_fdt.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/quicc/quicc_bfe_ocp.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/sec/sec.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/sge/if_sge.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/sge/if_sgereg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/tsec/if_tsec.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/tsec/if_tsec.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/tsec/if_tsec_fdt.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/tsec/if_tsec_ocp.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/twa/tw_cl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/uart/uart_bus_ocp.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/uart/uart_cpu_powerpc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/usb/serial/uplcom.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/dev/usb/wlan/if_run.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfs/nfs_var.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsclient/nfs_clport.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsclient/nfs_clrpcops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsclient/nfs_clstate.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsclient/nfs_clvnops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/geom/cache/g_cache.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/i386/include/clock.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ia64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ia64/ia64/autoconf.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ia64/ia64/mca.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/isa/syscons_isa.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_clocksource.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_tc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/subr_unit.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/atheros/ar71xxreg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/atheros/if_arge.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/atheros/if_argevar.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/conf/XLR64#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/conf/XLRN32#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/_bus_octeon.h#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/asm.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/asmacros.h#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/clock.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/cpu.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/cpuregs.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/db_machdep.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/md_var.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/pte.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/runq.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/include/tlb.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/cache_mipsNN.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/cpu.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/db_interface.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/db_trace.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/exception.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/fp.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/locore.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/mpboot.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/pm_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/psraccess.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/support.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/swtch.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/tlb.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/mips/vm_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/rmi/dev/xlr/rge.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/rmi/iodi.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/rmi/on_chip.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/rmi/xlr_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/rmi/xlr_pci.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/mips/sibyte/sb_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/cas/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/iwnfw/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/iwnfw/iwn6000/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/iwnfw/iwn6050/Makefile#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/net/pfil.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/net/radix.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netgraph/ng_ipfw.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netgraph/ng_source.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netinet/ipfw/dn_heap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netinet/ipfw/ip_fw_log.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netinet/libalias/alias_sctp.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/netinet/siftr.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/pc98/cbus/clock.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/locore32.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/locore64.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/mmu_oea64.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/mp_cpudep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/platform_chrp.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/slb.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/swtch.S#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/swtch32.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/swtch64.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/trap_subr32.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/trap_subr64.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/booke/locore.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/booke/platform_bare.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/booke/swtch.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/booke/vm_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/conf/GENERIC64#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/cpufreq/pcr.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/_align.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/_bus.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/_inttypes.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/_stdint.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/_types.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/asm.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/bootinfo.h#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/bus.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/db_machdep.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/fdt.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/frame.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/hid.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/metadata.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/ocpbus.h#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/pcb.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/proc.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/psl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/pte.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/reg.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/runq.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/slb.h#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/sr.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/trap_aim.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/ucontext.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/atpic.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/ds1553_bus_fdt.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/i2c.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/lbc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/lbc.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/nexus.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/ocpbus.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/ocpbus.h#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/openpic_fdt.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/opic.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/pci_fdt.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/mpc85xx/pci_ocp.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/ofw/ofw_real.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/ofw/ofw_syscons.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/bcopy.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/bus_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/busdma_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/elf32_machdep.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/elf64_machdep.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/elf_machdep.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/exec_machdep.c#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/in_cksum.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/setjmp.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/sigcode.S#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/sigcode32.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/sigcode64.S#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/syncicache.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/powerpc/powerpc/sys_machdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sparc64/include/intr_machdep.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sun4v/include/intr_machdep.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sun4v/sun4v/exception.S#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/cdefs.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/elf_common.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/ktrace.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/param.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/pcpu.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/proc.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/resource.h#4 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/signalvar.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/sysctl.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/systm.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ffs/softdep.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ufs/inode.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/vm/vm_page.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/vm/vm_page.h#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/x86/isa/atrtc.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/x86/isa/clock.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/x86/x86/local_apic.c#2 integrate
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/x86/x86/timeevents.c#2 delete
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/tools/regression/bin/sh/parser/only-redir1.0#1 branch
.. //depot/projects/soc2010/gabor_jobs/irix_jobs/tools/tools/ncpus/biosmptable.c#2 integrate
Differences ...
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.80 2010/06/16 14:13:36 jchandra Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.81 2010/07/10 14:45:03 nwhitehorn Exp $
SHLIBDIR?= /lib
@@ -51,6 +51,7 @@
.include "${.CURDIR}/posix1e/Makefile.inc"
.if ${MACHINE_ARCH} != "amd64" && \
${MACHINE_ARCH} != "ia64" && \
+ ${MACHINE_ARCH} != "powerpc64" && \
${MACHINE_ARCH} != "sparc64" && \
${MACHINE_ARCH} != "mips"
.include "${.CURDIR}/quad/Makefile.inc"
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/compat-43/sigcompat.c#2 (text+ko) ====
@@ -31,10 +31,11 @@
static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/sigcompat.c,v 1.12 2009/11/26 13:49:37 kib Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/sigcompat.c,v 1.13 2010/07/12 10:14:24 kib Exp $");
#include "namespace.h"
#include <sys/param.h>
+#include <errno.h>
#include <signal.h>
#include <string.h>
#include "un-namespace.h"
@@ -111,9 +112,16 @@
xsi_sigpause(int sig)
{
sigset_t set;
+ int error;
- sigemptyset(&set);
- sigaddset(&set, sig);
+ if (!_SIG_VALID(sig)) {
+ errno = EINVAL;
+ return (-1);
+ }
+ error = _sigprocmask(SIG_BLOCK, NULL, &set);
+ if (error != 0)
+ return (error);
+ sigdelset(&set, sig);
return (_sigsuspend(&set));
}
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/gen/_thread_init.c#2 (text+ko) ====
@@ -25,14 +25,15 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.6 2010/03/31 18:37:00 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.7 2010/07/10 14:39:08 nwhitehorn Exp $");
#include <sys/types.h>
void _thread_init_stub(void);
__weak_reference(_thread_init_stub, _thread_init);
-__weak_reference(_thread_autoinit_dummy_decl_stub, _thread_autoinit_dummy_decl);
+__weak_reference_data(_thread_autoinit_dummy_decl_stub,
+ _thread_autoinit_dummy_decl);
int _thread_autoinit_dummy_decl_stub = 0;
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/gmon/gmon.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.25 2010/07/01 00:48:00 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.26 2010/07/10 14:45:03 nwhitehorn Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -50,8 +50,10 @@
#include "libc_private.h"
-#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || (defined(__powerpc__) && !defined(__powerpc64__))
extern char *minbrk __asm (".minbrk");
+#elif defined(__powerpc64__)
+extern char *minbrk __asm ("_minbrk");
#else
extern char *minbrk __asm ("minbrk");
#endif
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/net/sctp_sys_calls.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.16 2010/07/04 08:09:33 brucec Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.18 2010/07/07 11:19:06 rrs Exp $");
#include <stdio.h>
#include <string.h>
#include <errno.h>
@@ -304,7 +304,7 @@
goto out_error;
}
-
+ sa = (struct sockaddr *)((caddr_t)sa + sz);
}
sa = addrs;
/*
@@ -724,6 +724,7 @@
struct sctp_sndrcvinfo *sinfo,
int flags)
{
+ struct sctp_sndrcvinfo __sinfo;
ssize_t ret;
int i, cnt, *aa, saved_errno;
char *buf;
@@ -790,6 +791,10 @@
return (ret);
}
continue_send:
+ if (sinfo == NULL) {
+ sinfo = &__sinfo;
+ memset(&__sinfo, 0, sizeof(__sinfo));
+ }
sinfo->sinfo_assoc_id = sctp_getassocid(sd, addrs);
if (sinfo->sinfo_assoc_id == 0) {
printf("Huh, can't get associd? TSNH!\n");
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/posix1e/acl_from_text.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text.c,v 1.13 2009/11/16 09:28:22 brueffer Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text.c,v 1.15 2010/07/06 17:20:08 trasz Exp $");
#include <sys/types.h>
#include "namespace.h"
@@ -44,7 +44,6 @@
#include "acl_support.h"
-static int _posix1e_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id);
static acl_tag_t acl_string_to_tag(char *tag, char *qualifier);
int _nfs4_acl_entry_from_text(acl_t aclp, char *entry);
@@ -148,8 +147,7 @@
case ACL_USER:
case ACL_GROUP:
- error = _posix1e_acl_name_to_id(t, qualifier,
- &id);
+ error = _acl_name_to_id(t, qualifier, &id);
if (error == -1)
return (-1);
break;
@@ -271,12 +269,9 @@
* XXX NOT THREAD SAFE, RELIES ON GETPWNAM, GETGRNAM
* XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE
* MAY HAVE SIDE-EFFECTS
- *
- * XXX currently doesn't deal correctly with a numeric uid being passed
- * instead of a username. What is correct behavior here? Check chown.
*/
-static int
-_posix1e_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id)
+int
+_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id)
{
struct group *g;
struct passwd *p;
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/posix1e/acl_from_text_nfs4.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text_nfs4.c,v 1.2 2009/06/25 13:08:02 trasz Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text_nfs4.c,v 1.3 2010/07/06 17:20:08 trasz Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -79,16 +79,14 @@
/*
* Parse the qualifier field of ACL entry passed as "str".
* If user or group name cannot be resolved, then the variable
- * referenced by "need_qualifier" is set to 1.
+ * referenced by "need_qualifier" is set to 1; it will be checked
+ * later to figure out whether the appended_id is required.
*/
static int
parse_qualifier(char *str, acl_entry_t entry, int *need_qualifier)
{
int qualifier_length, error;
- id_t id;
- char *end;
- struct passwd *pwd;
- struct group *grp;
+ uid_t id;
acl_tag_t tag;
assert(need_qualifier != NULL);
@@ -101,44 +99,17 @@
return (-1);
}
- /* XXX: Can we assume that valid username never begins with a digit? */
- if (isdigit(str[0])) {
- id = strtod(str, &end);
-
- if (end - str != qualifier_length) {
- warnx("malformed ACL: trailing characters "
- "after numerical id");
- return (-1);
- }
-
- return (acl_set_qualifier(entry, &id));
- }
-
error = acl_get_tag_type(entry, &tag);
if (error)
return (error);
- assert(tag == ACL_USER || tag == ACL_GROUP);
-
- if (tag == ACL_USER) {
- /* XXX: Thread-unsafe. */
- pwd = getpwnam(str);
- if (pwd == NULL) {
- *need_qualifier = 1;
- return (0);
- }
-
- return (acl_set_qualifier(entry, &(pwd->pw_uid)));
- }
-
- /* XXX: Thread-unsafe. */
- grp = getgrnam(str);
- if (grp == NULL) {
+ error = _acl_name_to_id(tag, str, &id);
+ if (error) {
*need_qualifier = 1;
return (0);
}
- return (acl_set_qualifier(entry, &(grp->gr_gid)));
+ return (acl_set_qualifier(entry, &id));
}
static int
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/posix1e/acl_support.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/posix1e/acl_support.h,v 1.8 2010/06/03 14:29:17 trasz Exp $
+ * $FreeBSD: src/lib/libc/posix1e/acl_support.h,v 1.9 2010/07/06 17:20:08 trasz Exp $
*/
/*
* Support functionality for the POSIX.1e ACL interface
@@ -61,5 +61,6 @@
acl_perm_t perm);
char *string_skip_whitespace(char *string);
void string_trim_trailing_whitespace(char *string);
+int _acl_name_to_id(acl_tag_t tag, char *name, uid_t *id);
#endif
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/stdlib/malloc.c#2 (text+ko) ====
@@ -158,7 +158,7 @@
#define MALLOC_DSS
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.193 2010/02/28 22:57:13 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.194 2010/07/10 14:45:03 nwhitehorn Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -249,8 +249,13 @@
# define LG_SIZEOF_PTR 2
# define NO_TLS
#endif
-#ifdef __powerpc__
+#ifdef __powerpc64__
+# define LG_QUANTUM 4
+# define LG_SIZEOF_PTR 3
+# define TLS_MODEL /* default */
+#elif defined(__powerpc__)
# define LG_QUANTUM 4
+# define LG_SIZEOF_PTR 2
# define TLS_MODEL /* default */
#endif
#ifdef __s390x__
==== //depot/projects/soc2010/gabor_jobs/irix_jobs/lib/libc/sys/ptrace.2#2 (text+ko) ====
@@ -1,8 +1,8 @@
-.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.45 2010/05/24 17:23:14 kib Exp $
+.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.46 2010/07/10 14:31:44 kib Exp $
.\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
.\"
.\" This file is in the public domain.
-.Dd May 24, 2010
+.Dd July 10, 2010
.Dt PTRACE 2
.Os
.Sh NAME
@@ -294,6 +294,7 @@
int pl_flags;
sigset_t pl_sigmask;
sigset_t pl_siglist;
+ siginfo_t pl_siginfo;
};
.Ed
.Pp
@@ -338,13 +339,28 @@
execution of a system call from the
.Fn execve 2
family.
+.It PL_FLAG_SI
+Indicates that
+.Va pl_siginfo
+member of
+.Vt "struct ptrace_lwpinfo"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list