PERFORCE change 180622 for review
Garrett Cooper
gcooper at FreeBSD.org
Thu Jul 8 00:56:50 UTC 2010
http://p4web.freebsd.org/@@180622?ac=10
Change 180622 by gcooper at gcooper-bioshock on 2010/07/08 00:56:29
IFC
Affected files ...
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ObsoleteFiles.inc#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/dialog/dialog.1#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/include/arpa/inet.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gmon/gmon.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/net/sctp_recvmsg.3#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/net/sctp_send.3#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/net/sctp_sys_calls.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_from_text.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_from_text_nfs4.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_support.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/getgroups.2#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libfetch/http.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthread_db/Symbol.map#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthread_db/thread_db.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthread_db/thread_db.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthread_db/thread_db_int.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/bsdlabel/bsdlabel.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/camcontrol/camcontrol.8#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/devd/devd.cc#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/devd/devd.hh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/dhclient/dhclient.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/suj.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/multipath/geom_multipath.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mca/mca.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/reboot/boot_i386.8#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man3/pthread_join.3#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ata.4#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/bwi.4#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/siftr.4#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/alloc_unr.9#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/style.9#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/vm_page_alloc.9#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/mk/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/ia32/ia32_signal.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/segments.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/ia64/efi/version#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/ata/ata_xpt.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/freebsd32_signal.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/linux/linux_signal.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#9 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/changes.txt#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/adisasm.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/adwalk.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/dmextern.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/dmrestag.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/dmtable.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslpredef.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dtcompile.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dtcompiler.h#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dtfield.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dtio.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dtsubtable.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dttable.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dttemplate.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dttemplate.h#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/compiler/dtutils.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbdisply.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evgpe.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evgpeinit.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evgpeutil.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evxface.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/executer/exdump.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/executer/exprep.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/executer/exregion.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/executer/exsystem.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acevents.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acexcep.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acglobal.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/aclocal.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acoutput.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acpixf.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acstruct.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/actbl2.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/actypes.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/osunixxf.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/acpica/utilities/uttrack.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_button.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_lid.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-all.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/bwi/if_bwi.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_82575.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_api.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_api.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_hw.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_mbx.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_mbx.h#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_regs.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_vf.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/e1000_vf.h#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.c#8 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fb/vesa.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ixgbe/ixgbe.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ixgbe/ixgbe.h#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/md/md.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/machdep.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/autoconf.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/mca.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/mp_machdep.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/asm.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/mca.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/md_var.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/profile.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_clock.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_context.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_syscalls.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/makesyscalls.sh#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_trap.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_unit.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_process.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sysv_shm.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/atheros/ar71xxreg.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/pte.h#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pm_machdep.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/tlb.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/board.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/board.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/Makefile#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/em/Makefile#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/igb/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/siftr/Makefile#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_crypto.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_crypto_tkip.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_ipfw.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_pipe.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_source.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ipfw/ip_fw2.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctputil.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/siftr.c#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/clock.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/clock.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/asm.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/intr.h#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/atpic.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/opic.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cuda.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/openpic_macio.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/openpic.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/proc.h#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/ptrace.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/signalvar.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/sysent.h#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/systm.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/softdep.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ufs/inode.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ufs/ufs_lookup.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_contig.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_fault.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_map.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_object.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#9 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#8 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pageout.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pager.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/atrtc.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/clock.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/expansion/arith2.0#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/ncpus/biosmptable.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/getopt/getopt.1#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/locate/bigram/locate.bigram.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/locate/code/locate.code.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/lock/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/lock/lock.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ministat/ministat.1#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tcopy/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tcopy/tcopy.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tftp/tftp.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/acpi/iasl/Makefile#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/Makefile.inc#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-vmware.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-info.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-list.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-part.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/enable-net.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-components.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-config.sh#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/query-langs.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/send-logs.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/test-live.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/test-netup.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-disk.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-ftp.sh#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-localize.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-networking.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-newfs.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-parse.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-unmount.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-users.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/parseconfig.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/startautoinstall.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-index#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/install.cfg#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/label.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/menus.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/msg.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/sysinstall.h#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate
Differences ...
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ObsoleteFiles.inc#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.236 2010/05/14 20:40:37 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.237 2010/07/02 02:20:25 marcel Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,10 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100701: [powerpc] removed <machine/intr.h>
+.if ${TARGET_ARCH} == "powerpc"
+OLD_FILES+=usr/include/machine/intr.h
+.endif
# 20100514: library version bump for versioned symbols for liblzma
OLD_LIBS+=usr/lib/liblzma.so.0
.if ${TARGET_ARCH} == "amd64"
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.64 2010/05/11 23:19:28 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.65 2010/06/29 22:37:45 jilles Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -818,7 +818,7 @@
{
if (*name == '!')
- return backgndpid != -1;
+ return backgndpidset();
else if (*name == '@' || *name == '*') {
if (*shellparam.p == NULL)
return 0;
@@ -891,7 +891,7 @@
num = shellparam.nparam;
goto numvar;
case '!':
- num = backgndpid;
+ num = backgndpidval();
numvar:
expdest = cvtnum(num, expdest);
break;
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.77 2010/06/06 22:27:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.78 2010/06/29 22:37:45 jilles Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -75,6 +75,7 @@
STATIC struct job *jobtab; /* array of jobs */
STATIC int njobs; /* size of array */
MKINIT pid_t backgndpid = -1; /* pid of last background process */
+MKINIT struct job *bgjob = NULL; /* last background process */
#if JOBS
STATIC struct job *jobmru; /* most recently used job list */
STATIC pid_t initialpgrp; /* pgrp of shell on invocation */
@@ -183,6 +184,7 @@
SHELLPROC {
backgndpid = -1;
+ bgjob = NULL;
#if JOBS
jobctl = 0;
#endif
@@ -413,7 +415,11 @@
continue;
showjob(jp, 0, mode);
jp->changed = 0;
- if (jp->state == JOBDONE) {
+ /* Hack: discard jobs for which $! has not been referenced
+ * in interactive mode when they terminate.
+ */
+ if (jp->state == JOBDONE && !jp->remembered &&
+ (iflag || jp != bgjob)) {
freejob(jp);
}
}
@@ -431,6 +437,8 @@
int i;
INTOFF;
+ if (bgjob == jp)
+ bgjob = NULL;
for (i = jp->nprocs, ps = jp->ps ; --i >= 0 ; ps++) {
if (ps->cmd != nullstr)
ckfree(ps->cmd);
@@ -477,12 +485,27 @@
#endif
else
retval = WTERMSIG(status) + 128;
- if (! iflag)
+ if (! iflag || ! job->changed)
freejob(job);
+ else {
+ job->remembered = 0;
+ if (job == bgjob)
+ bgjob = NULL;
+ }
in_waitcmd--;
return retval;
}
} else {
+ for (jp = jobtab ; jp < jobtab + njobs; jp++)
+ if (jp->used && jp->state == JOBDONE) {
+ if (! iflag || ! jp->changed)
+ freejob(jp);
+ else {
+ jp->remembered = 0;
+ if (jp == bgjob)
+ bgjob = NULL;
+ }
+ }
for (jp = jobtab ; ; jp++) {
if (jp >= jobtab + njobs) { /* no running procs */
in_waitcmd--;
@@ -623,6 +646,8 @@
jp[i].next = &jp[jp[i].next -
jobtab];
#endif
+ if (bgjob != NULL)
+ bgjob = &jp[bgjob - jobtab];
/* Relocate `ps' pointers */
for (i = 0; i < njobs; i++)
if (jp[i].ps == &jobtab[i].ps0)
@@ -644,6 +669,7 @@
jp->changed = 0;
jp->nprocs = 0;
jp->foreground = 0;
+ jp->remembered = 0;
#if JOBS
jp->jobctl = jobctl;
jp->next = NULL;
@@ -821,8 +847,13 @@
pgrp = jp->ps[0].pid;
setpgid(pid, pgrp);
}
- if (mode == FORK_BG)
+ if (mode == FORK_BG) {
+ if (bgjob != NULL && bgjob->state == JOBDONE &&
+ !bgjob->remembered && !iflag)
+ freejob(bgjob);
backgndpid = pid; /* set $! */
+ bgjob = jp;
+ }
if (jp) {
struct procstat *ps = &jp->ps[jp->nprocs++];
ps->pid = pid;
@@ -975,10 +1006,15 @@
if (jp->state != state) {
TRACE(("Job %d: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state));
jp->state = state;
+ if (jp != job) {
+ if (done && !jp->remembered &&
+ !iflag && jp != bgjob)
+ freejob(jp);
#if JOBS
- if (done)
- deljob(jp);
+ else if (done)
+ deljob(jp);
#endif
+ }
}
}
}
@@ -1074,6 +1110,21 @@
}
+int
+backgndpidset(void)
+{
+ return backgndpid != -1;
+}
+
+
+pid_t
+backgndpidval(void)
+{
+ if (bgjob != NULL)
+ bgjob->remembered = 1;
+ return backgndpid;
+}
+
/*
* Return a string identifying a command (to be printed by the
* jobs command.
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)jobs.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.20 2010/06/29 22:37:45 jilles Exp $
*/
/* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */
@@ -68,6 +68,7 @@
char used; /* true if this entry is in used */
char changed; /* true if status has changed */
char foreground; /* true if running in the foreground */
+ char remembered; /* true if $! referenced */
#if JOBS
char jobctl; /* job running under job control */
struct job *next; /* job used after this one */
@@ -81,7 +82,6 @@
SHOWJOBS_PGIDS /* PID of the group leader only */
};
-extern pid_t backgndpid; /* pid of last background process */
extern int job_warning; /* user was warned about stopped jobs */
extern int in_waitcmd; /* are we in waitcmd()? */
extern int in_dowait; /* are we in dowait()? */
@@ -98,6 +98,8 @@
pid_t forkshell(struct job *, union node *, int);
int waitforjob(struct job *, int *);
int stoppedjobs(void);
+int backgndpidset(void);
+pid_t backgndpidval(void);
char *commandtext(union node *);
#if ! JOBS
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.81 2010/06/19 10:33:04 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.82 2010/07/02 22:17:13 jilles Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -1734,7 +1734,8 @@
{
static char ps[PROMPTLEN];
char *fmt;
- int i, j, trim;
+ const char *pwd;
+ int i, trim;
static char internal_error[] = "<internal prompt error>";
/*
@@ -1785,17 +1786,15 @@
*/
case 'W':
case 'w':
- ps[i] = '\0';
- getcwd(&ps[i], PROMPTLEN - i);
- if (*fmt == 'W' && ps[i + 1] != '\0') {
- /* Final path component only. */
- trim = 1;
- for (j = i; ps[j] != '\0'; j++)
- if (ps[j] == '/')
- trim = j + 1;
- memmove(&ps[i], &ps[trim],
- j - trim + 1);
- }
+ pwd = lookupvar("PWD");
+ if (pwd == NULL)
+ pwd = "?";
+ if (*fmt == 'W' &&
+ *pwd == '/' && pwd[1] != '\0')
+ strlcpy(&ps[i], strrchr(pwd, '/') + 1,
+ PROMPTLEN - i);
+ else
+ strlcpy(&ps[i], pwd, PROMPTLEN - i);
/* Skip to end of path. */
while (ps[i + 1] != '\0')
i++;
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#5 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.141 2010/05/24 15:12:12 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.142 2010/06/29 22:37:45 jilles Exp $
.\"
-.Dd May 24, 2010
+.Dd June 29, 2010
.Dt SH 1
.Os
.Sh NAME
@@ -1106,6 +1106,10 @@
For a
pipeline, the process ID is that of the last command in the
pipeline.
+If this parameter is referenced, the shell will remember
+the process ID and its exit status until the
+.Ic wait
+built-in command reports completion of the process.
.It Li $0
(zero) Expands to the name of the shell or shell script.
.El
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/compat/opensolaris/misc/fsshare.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.3 2008/03/28 22:16:05 jb Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.4 2010/07/07 07:09:33 mm Exp $");
#include <sys/param.h>
#include <stdio.h>
@@ -110,11 +110,11 @@
*
* Recognized keywords:
*
- * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet
+ * ro, maproot, mapall, mask, network, sec, alldirs, public, webnfs, index, quiet
*
*/
static const char *known_opts[] = { "ro", "maproot", "mapall", "mask",
- "network", "alldirs", "public", "webnfs", "index", "quiet", NULL };
+ "network", "sec", "alldirs", "public", "webnfs", "index", "quiet", NULL };
static char *
translate_opts(const char *shareopts)
{
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.usr.dist#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.346 2010/06/24 22:21:47 imp Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.347 2010/06/28 08:05:30 pjd Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -1231,15 +1231,15 @@
pc-sysinstall
backend
..
- backend-partmanager
+ backend-partmanager
..
- backend-query
+ backend-query
..
- conf
+ conf
license
- ..
+ ..
..
- doc
+ doc
..
..
security
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/dialog/dialog.1#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/gnu/usr.bin/dialog/dialog.1,v 1.8 2006/02/07 20:14:07 jkim Exp $
+.\" $FreeBSD: src/gnu/usr.bin/dialog/dialog.1,v 1.9 2010/07/06 18:06:10 bcr Exp $
.TH DIALOG 1 "2 October 1998"
.SH NAME
dialog \- display dialog boxes from shell scripts
@@ -30,6 +30,7 @@
.BR yes/no " box," " menu" " box," " input" " box,"
.BR message " box," " text" " box," " info" " box,"
.BR checklist " box," " program" " box,"
+.BR radiolist " box,"
.BR ftree " and " tree " boxes."
.SH OPTIONS
.TP
@@ -172,6 +173,15 @@
.I tag
strings of those entries that are turned on will be printed on
.IR stderr "."
+.IP "\fB\-\-radiolist \fItext height width list-height \fR[ \fItag item status \fR] \fI..."
+.RB "A " radiolist " box is similar to a " checklist " but it only allows"
+a single entry to be selected. One entry may initially be turned on as
+specified by
+.IR status "."
+On exit, the
+.I tag
+string of the entry that is turned on will be printed on
+.IR stderr "."
.IP "\fB\-\-ftree \fIfile FS text height width menu-height"
.B ftree
box is a dialog box showing the tree described by the data from the file
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.18 2008/09/14 16:52:42 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.19 2010/07/04 12:09:30 kib Exp $ */
/* FreeBSD libthread_db assisted debugging support.
Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -1299,6 +1299,7 @@
td_thrhandle_t th;
td_thrinfo_t ti;
td_err_e err;
+ const char *code;
if (!fbsd_thread_active || !IS_THREAD(inferior_ptid))
return;
@@ -1315,6 +1316,42 @@
fbsd_print_sigset(&ti.ti_sigmask);
printf_filtered("signal pending:\n");
fbsd_print_sigset(&ti.ti_pending);
+ if (ti.ti_siginfo.si_signo != 0) {
+ printf_filtered("si_signo %d si_errno %d", ti.ti_siginfo.si_signo,
+ ti.ti_siginfo.si_errno);
+ if (ti.ti_siginfo.si_errno != 0)
+ printf_filtered(" (%s)", strerror(ti.ti_siginfo.si_errno));
+ printf_filtered("\n");
+ switch (ti.ti_siginfo.si_code) {
+ case SI_NOINFO:
+ code = "NOINFO";
+ break;
+ case SI_USER:
+ code = "USER";
+ break;
+ case SI_QUEUE:
+ code = "QUEUE";
+ break;
+ case SI_TIMER:
+ code = "TIMER";
+ break;
+ case SI_ASYNCIO:
+ code = "ASYNCIO";
+ break;
+ case SI_MESGQ:
+ code = "MESGQ";
+ break;
+ case SI_KERNEL:
+ code = "KERNEL";
+ break;
+ default:
+ code = "UNKNOWN";
+ break;
+ }
+ printf_filtered("si_code %s si_pid %d si_uid %d si_status %x si_addr %p\n",
+ code, ti.ti_siginfo.si_pid, ti.ti_siginfo.si_uid, ti.ti_siginfo.si_status,
+ ti.ti_siginfo.si_addr);
+ }
}
static int
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/include/arpa/inet.h#2 (text+ko) ====
@@ -52,13 +52,13 @@
/*%
* @(#)inet.h 8.1 (Berkeley) 6/2/93
* $Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $
- * $FreeBSD: src/include/arpa/inet.h,v 1.32 2010/02/16 19:46:46 imp Exp $
+ * $FreeBSD: src/include/arpa/inet.h,v 1.33 2010/07/06 03:48:46 maxim Exp $
*/
#ifndef _ARPA_INET_H_
#define _ARPA_INET_H_
-/* External definitions for functions in inet(3), addr2ascii(3) */
+/* External definitions for functions in inet(3). */
#include <sys/cdefs.h>
#include <sys/_types.h>
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/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.23 2009/12/05 19:31:38 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.25 2010/07/01 00:48:00 marcel Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -41,6 +41,7 @@
#include <err.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -58,8 +59,8 @@
struct gmonparam _gmonparam = { GMON_PROF_OFF };
static int s_scale;
-/* see profil(2) where this is describe (incorrectly) */
-#define SCALE_1_TO_1 0x10000L
+/* See profil(2) where this is described (incorrectly). */
+#define SCALE_SHIFT 16
#define ERR(s) _write(2, s, sizeof(s))
@@ -110,24 +111,8 @@
p->tos[0].link = 0;
o = p->highpc - p->lowpc;
- if (p->kcountsize < o) {
-#ifndef hp300
- s_scale = ((float)p->kcountsize / o ) * SCALE_1_TO_1;
-#else /* avoid floating point */
- int quot = o / p->kcountsize;
-
- if (quot >= 0x10000)
- s_scale = 1;
- else if (quot >= 0x100)
- s_scale = 0x10000 / quot;
- else if (o >= 0x800000)
- s_scale = 0x1000000 / (o / (p->kcountsize >> 8));
- else
- s_scale = 0x1000000 / ((o << 8) / p->kcountsize);
-#endif
- } else
- s_scale = SCALE_1_TO_1;
-
+ s_scale = (p->kcountsize < o) ?
+ ((uintmax_t)p->kcountsize << SCALE_SHIFT) / o : (1 << SCALE_SHIFT);
moncontrol(1);
}
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/net/sctp_recvmsg.3#3 (text+ko) ====
@@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.8 2010/06/11 18:43:55 brucec Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.9 2010/07/04 08:09:33 brucec Exp $
.\"
.Dd August 13, 2007
.Dt SCTP_RECVMSG 3
@@ -146,14 +146,14 @@
argument is defined as follows.
.Bd -literal
struct sctp_sndrcvinfo {
- u_int16_t sinfo_stream; /* Stream arriving on */
- u_int16_t sinfo_ssn; /* Stream Sequence Number */
- u_int16_t sinfo_flags; /* Flags on the incoming message */
- u_int32_t sinfo_ppid; /* The ppid field */
- u_int32_t sinfo_context; /* context field */
- u_int32_t sinfo_timetolive; /* not used by sctp_recvmsg */
- u_int32_t sinfo_tsn; /* The transport sequence number */
- u_int32_t sinfo_cumtsn; /* The cumulative acknowledgment point */
+ uint16_t sinfo_stream; /* Stream arriving on */
+ uint16_t sinfo_ssn; /* Stream Sequence Number */
+ uint16_t sinfo_flags; /* Flags on the incoming message */
+ uint32_t sinfo_ppid; /* The ppid field */
+ uint32_t sinfo_context; /* context field */
+ uint32_t sinfo_timetolive; /* not used by sctp_recvmsg */
+ uint32_t sinfo_tsn; /* The transport sequence number */
+ uint32_t sinfo_cumtsn; /* The cumulative acknowledgment point */
sctp_assoc_t sinfo_assoc_id; /* The association id of the peer */
};
.Ed
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/net/sctp_send.3#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.7 2010/01/31 21:45:14 brucec Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.8 2010/07/04 08:09:33 brucec Exp $
.\"
.Dd December 15, 2006
.Dt SCTP_SEND 3
@@ -94,14 +94,14 @@
and has the following format:
.Bd -literal
struct sctp_sndrcvinfo {
- u_int16_t sinfo_stream; /* Stream sending to */
- u_int16_t sinfo_ssn; /* valid for recv only */
- u_int16_t sinfo_flags; /* flags to control sending */
- u_int32_t sinfo_ppid; /* ppid field */
- u_int32_t sinfo_context; /* context field */
- u_int32_t sinfo_timetolive; /* timetolive for PR-SCTP */
- u_int32_t sinfo_tsn; /* valid for recv only */
- u_int32_t sinfo_cumtsn; /* valid for recv only */
+ uint16_t sinfo_stream; /* Stream sending to */
+ uint16_t sinfo_ssn; /* valid for recv only */
+ uint16_t sinfo_flags; /* flags to control sending */
+ uint32_t sinfo_ppid; /* ppid field */
+ uint32_t sinfo_context; /* context field */
+ uint32_t sinfo_timetolive; /* timetolive for PR-SCTP */
+ uint32_t sinfo_tsn; /* valid for recv only */
+ uint32_t sinfo_cumtsn; /* valid for recv only */
sctp_assoc_t sinfo_assoc_id; /* The association id */
};
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list