From owner-p4-projects@FreeBSD.ORG Sun Nov 11 04:19:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 939CB16A469; Sun, 11 Nov 2007 04:19:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE77A16A418 for ; Sun, 11 Nov 2007 04:18:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9351813C4AC for ; Sun, 11 Nov 2007 04:18:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAB4Iulr048358 for ; Sun, 11 Nov 2007 04:18:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAB4IiYF048291 for perforce@freebsd.org; Sun, 11 Nov 2007 04:18:44 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 11 Nov 2007 04:18:44 GMT Message-Id: <200711110418.lAB4IiYF048291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 04:19:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=128921 Change 128921 by kmacy@kmacy_home:ethng on 2007/11/11 04:18:08 IFC 128920 Affected files ... .. //depot/projects/ethng/src/Makefile.inc1#5 integrate .. //depot/projects/ethng/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/ethng/src/bin/mv/mv.1#2 integrate .. //depot/projects/ethng/src/bin/ps/keyword.c#3 integrate .. //depot/projects/ethng/src/bin/ps/ps.c#4 integrate .. //depot/projects/ethng/src/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/complete.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/display.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/input.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/misc.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/readline.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/text.c#2 integrate .. //depot/projects/ethng/src/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/configure#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/CACerts#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/ethng/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/ethng/src/etc/Makefile#5 integrate .. //depot/projects/ethng/src/etc/defaults/Makefile#2 integrate .. //depot/projects/ethng/src/etc/defaults/pccard.conf#2 delete .. //depot/projects/ethng/src/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/ethng/src/etc/namedb/named.root#2 integrate .. //depot/projects/ethng/src/etc/network.subr#2 integrate .. //depot/projects/ethng/src/etc/pf.conf#2 delete .. //depot/projects/ethng/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/ethng/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/ethng/src/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/ethng/src/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/ethng/src/include/_ctype.h#4 integrate .. //depot/projects/ethng/src/include/pthread.h#2 integrate .. //depot/projects/ethng/src/include/pthread_np.h#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/ethng/src/lib/libc/net/ethers.3#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/ethng/src/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex.c#3 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/ethng/src/libexec/Makefile#2 integrate .. //depot/projects/ethng/src/release/Makefile#4 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/ethng/src/release/scripts/package-split.py#2 integrate .. //depot/projects/ethng/src/release/scripts/src-install.sh#2 integrate .. //depot/projects/ethng/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/ethng/src/sbin/geom/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/ethng/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/ethng/src/sbin/gpt/boot.c#2 integrate .. //depot/projects/ethng/src/sbin/gpt/gpt.c#3 integrate .. //depot/projects/ethng/src/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/ethng/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/ethng/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/ethng/src/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/ethng/src/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/ethng/src/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/ethng/src/sbin/rcorder/hash.c#2 integrate .. //depot/projects/ethng/src/sbin/rcorder/hash.h#2 integrate .. //depot/projects/ethng/src/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/ethng/src/sbin/route/route.8#2 integrate .. //depot/projects/ethng/src/sbin/route/route.c#2 integrate .. //depot/projects/ethng/src/sbin/setkey/parse.y#2 integrate .. //depot/projects/ethng/src/sbin/setkey/setkey.c#2 integrate .. //depot/projects/ethng/src/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/ethng/src/sbin/setkey/token.l#2 integrate .. //depot/projects/ethng/src/share/doc/legal/Makefile#2 integrate .. //depot/projects/ethng/src/share/doc/legal/intel_wpi/Makefile#1 branch .. //depot/projects/ethng/src/share/examples/pf/Makefile#2 integrate .. //depot/projects/ethng/src/share/examples/pf/ackpri#2 integrate .. //depot/projects/ethng/src/share/examples/pf/faq-example1#2 integrate .. //depot/projects/ethng/src/share/examples/pf/faq-example2#2 integrate .. //depot/projects/ethng/src/share/examples/pf/faq-example3#2 integrate .. //depot/projects/ethng/src/share/examples/pf/pf.conf#1 branch .. //depot/projects/ethng/src/share/examples/pf/queue1#2 integrate .. //depot/projects/ethng/src/share/examples/pf/queue2#2 integrate .. //depot/projects/ethng/src/share/examples/pf/queue3#2 integrate .. //depot/projects/ethng/src/share/examples/pf/queue4#2 integrate .. //depot/projects/ethng/src/share/examples/pf/spamd#2 integrate .. //depot/projects/ethng/src/share/man/man3/queue.3#2 integrate .. //depot/projects/ethng/src/share/man/man4/Makefile#6 integrate .. //depot/projects/ethng/src/share/man/man4/mac.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/md.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ng_car.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/nxge.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/wpi.4#1 branch .. //depot/projects/ethng/src/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/quota.user.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/ethng/src/share/man/man5/xfs.5#2 integrate .. //depot/projects/ethng/src/share/man/man7/tuning.7#2 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#7 integrate .. //depot/projects/ethng/src/share/man/man9/locking.9#3 integrate .. //depot/projects/ethng/src/share/man/man9/rmlock.9#1 branch .. //depot/projects/ethng/src/share/man/man9/uio.9#2 integrate .. //depot/projects/ethng/src/share/misc/bsd-family-tree#3 integrate .. //depot/projects/ethng/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/ethng/src/share/misc/pci_vendors#2 integrate .. //depot/projects/ethng/src/share/mk/sys.mk#4 integrate .. //depot/projects/ethng/src/share/zoneinfo/asia#3 integrate .. //depot/projects/ethng/src/share/zoneinfo/northamerica#3 integrate .. //depot/projects/ethng/src/share/zoneinfo/pacificnew#1 branch .. //depot/projects/ethng/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/ethng/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/ethng/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/ethng/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/ethng/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/ethng/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/ethng/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/ethng/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/ethng/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/ethng/src/sys/bsm/audit.h#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/ethng/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/ethng/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/ethng/src/sys/conf/NOTES#4 integrate .. //depot/projects/ethng/src/sys/conf/files#9 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#8 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#6 integrate .. //depot/projects/ethng/src/sys/conf/options.arm#3 integrate .. //depot/projects/ethng/src/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/ethng/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/ethng/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/ethng/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/ethng/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/ethng/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/ethng/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/ethng/src/sys/dev/md/md.c#3 integrate .. //depot/projects/ethng/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/ethng/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/ethng/src/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/ethng/src/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/ethng/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/ethng/src/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/ethng/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/ethng/src/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/ethng/src/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/ethng/src/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/ethng/src/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/ethng/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/ethng/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/ethng/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/ethng/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/ethng/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/ethng/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/ethng/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/ethng/src/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/ethng/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/ethng/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/ethng/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_fork.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/ethng/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/ethng/src/sys/kern/subr_lock.c#3 integrate .. //depot/projects/ethng/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/ethng/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/ethng/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/ethng/src/sys/modules/Makefile#8 integrate .. //depot/projects/ethng/src/sys/modules/asmc/Makefile#1 branch .. //depot/projects/ethng/src/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/ethng/src/sys/modules/wpi/Makefile#1 branch .. //depot/projects/ethng/src/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/ethng/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/ethng/src/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/ethng/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/ethng/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/ethng/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/ethng/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/ethng/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/ethng/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/ethng/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_i810.c#3 integrate .. //depot/projects/ethng/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/ethng/src/sys/pci/agp_via.c#3 integrate .. //depot/projects/ethng/src/sys/pci/agppriv.h#2 integrate .. //depot/projects/ethng/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/ethng/src/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/ethng/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/ethng/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/ethng/src/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/ethng/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/ethng/src/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/ethng/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/ethng/src/sys/sys/_rmlock.h#1 branch .. //depot/projects/ethng/src/sys/sys/lock.h#2 integrate .. //depot/projects/ethng/src/sys/sys/malloc.h#2 integrate .. //depot/projects/ethng/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/ethng/src/sys/sys/proc.h#5 integrate .. //depot/projects/ethng/src/sys/sys/rmlock.h#1 branch .. //depot/projects/ethng/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/ethng/src/sys/sys/smp.h#2 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/ethng/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/ethng/src/sys/vm/phys_pager.c#3 integrate .. //depot/projects/ethng/src/sys/vm/pmap.h#2 integrate .. //depot/projects/ethng/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_extern.h#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/ethng/src/sys/vm/vm_map.c#5 integrate .. //depot/projects/ethng/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/ethng/src/tools/build/options/makeman#2 integrate .. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/ethng/src/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/ethng/src/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/ethng/src/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/ethng/src/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/ethng/src/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/ethng/src/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/ethng/src/usr.bin/calendar/io.c#2 integrate .. //depot/projects/ethng/src/usr.bin/du/du.c#2 integrate .. //depot/projects/ethng/src/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/ethng/src/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/ethng/src/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/ethng/src/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/ethng/src/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/ethng/src/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/ethng/src/usr.bin/killall/killall.1#2 integrate .. //depot/projects/ethng/src/usr.bin/killall/killall.c#2 integrate .. //depot/projects/ethng/src/usr.bin/lockf/lockf.1#3 integrate .. //depot/projects/ethng/src/usr.bin/mail/aux.c#2 integrate .. //depot/projects/ethng/src/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/ethng/src/usr.bin/mail/lex.c#2 integrate .. //depot/projects/ethng/src/usr.bin/mail/list.c#2 integrate .. //depot/projects/ethng/src/usr.bin/mail/main.c#2 integrate .. //depot/projects/ethng/src/usr.bin/make/make.1#2 integrate .. //depot/projects/ethng/src/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/ethng/src/usr.bin/msgs/msgs.c#2 integrate .. //depot/projects/ethng/src/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/ethng/src/usr.bin/sed/main.c#2 integrate .. //depot/projects/ethng/src/usr.bin/tail/read.c#3 integrate .. //depot/projects/ethng/src/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/ethng/src/usr.bin/tail/tail.c#2 integrate .. //depot/projects/ethng/src/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/ethng/src/usr.bin/xstr/xstr.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/cron/lib/entry.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/ethng/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/pciconf.8#4 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/ethng/src/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/ethng/src/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/ethng/src/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/ethng/src/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/options.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/pppd.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/sys-bsd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rip6query/rip6query.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/ethng/src/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/ethng/src/usr.sbin/rrenumd/rrenumd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/dmenu.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/tcpdrop/tcpdrop.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/ethng/src/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall ==== //depot/projects/ethng/src/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,9 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd +OLD_FILES+=etc/cached.conf OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached OLD_FILES+=usr/share/man/man5/cached.conf.5.gz ==== //depot/projects/ethng/src/bin/mv/mv.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/ethng/src/bin/ps/keyword.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,9 +186,8 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, - {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, - NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/ethng/src/bin/ps/ps.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/ethng/src/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/ethng/src/contrib/libreadline/complete.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/ethng/src/contrib/libreadline/display.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 05:39:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A589116A418; Sun, 11 Nov 2007 05:39:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D390816A419 for ; Sun, 11 Nov 2007 05:39:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB3B213C4B3 for ; Sun, 11 Nov 2007 05:39:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAB5dMPE063447 for ; Sun, 11 Nov 2007 05:39:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAB5dMak063444 for perforce@freebsd.org; Sun, 11 Nov 2007 05:39:22 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 11 Nov 2007 05:39:22 GMT Message-Id: <200711110539.lAB5dMak063444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 05:39:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=128922 Change 128922 by kmacy@kmacy:storage:toestack on 2007/11/11 05:39:03 disable non-enforceable checks in the offload case Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#6 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_syncache.c#6 (text+ko) ==== @@ -877,7 +877,7 @@ * Segment validation: * ACK must match our initial sequence number + 1 (the SYN|ACK). */ - if (th->th_ack != sc->sc_iss + 1) { + if (th->th_ack != sc->sc_iss + 1 && sc->sc_inc.inc_eh == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: ACK %u != ISS+1 %u, segment " "rejected\n", s, __func__, th->th_ack, sc->sc_iss); @@ -888,7 +888,7 @@ * number + 1 (the SYN) because we didn't ACK any data that * may have come with the SYN. */ - if (th->th_seq != sc->sc_irs + 1) { + if (th->th_seq != sc->sc_irs + 1 && sc->sc_inc.inc_eh == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); @@ -915,7 +915,7 @@ * If timestamps were negotiated the reflected timestamp * must be equal to what we actually sent in the SYN|ACK. */ - if ((to->to_flags & TOF_TS) && to->to_tsecr != sc->sc_ts) { + if ((to->to_flags & TOF_TS) && to->to_tsecr != sc->sc_ts && sc->sc_inc.inc_eh == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: TSECR %u != TS %u, " "segment rejected\n", From owner-p4-projects@FreeBSD.ORG Sun Nov 11 05:40:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BEFD16A421; Sun, 11 Nov 2007 05:40:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E0E16A417 for ; Sun, 11 Nov 2007 05:40:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EDF7A13C4B9 for ; Sun, 11 Nov 2007 05:40:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAB5eNaR063552 for ; Sun, 11 Nov 2007 05:40:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAB5eNNn063549 for perforce@freebsd.org; Sun, 11 Nov 2007 05:40:23 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 11 Nov 2007 05:40:23 GMT Message-Id: <200711110540.lAB5eNNn063549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 05:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=128923 Change 128923 by kmacy@kmacy:storage:toestack on 2007/11/11 05:39:55 enable timestamps for offloaded connections Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/common/cxgb_t3_hw.c#3 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/common/cxgb_t3_hw.c#3 (text+ko) ==== @@ -2503,7 +2503,7 @@ F_TCPCHECKSUMOFFLOAD | V_IPTTL(64)); t3_write_reg(adap, A_TP_TCP_OPTIONS, V_MTUDEFAULT(576) | F_MTUENABLE | V_WINDOWSCALEMODE(1) | - V_TIMESTAMPSMODE(0) | V_SACKMODE(1) | V_SACKRX(1)); + V_TIMESTAMPSMODE(1) | V_SACKMODE(1) | V_SACKRX(1)); t3_write_reg(adap, A_TP_DACK_CONFIG, V_AUTOSTATE3(1) | V_AUTOSTATE2(1) | V_AUTOSTATE1(0) | V_BYTETHRESHOLD(16384) | V_MSSTHRESHOLD(2) | From owner-p4-projects@FreeBSD.ORG Sun Nov 11 05:47:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CB5616A417; Sun, 11 Nov 2007 05:47:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7B2516A419 for ; Sun, 11 Nov 2007 05:47:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AEFD713C4A6 for ; Sun, 11 Nov 2007 05:47:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAB5lVA9063831 for ; Sun, 11 Nov 2007 05:47:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAB5lVsD063828 for perforce@freebsd.org; Sun, 11 Nov 2007 05:47:31 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 11 Nov 2007 05:47:31 GMT Message-Id: <200711110547.lAB5lVsD063828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 05:47:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=128924 Change 128924 by kmacy@kmacy:storage:toestack on 2007/11/11 05:47:24 fix ctloutput null pointer deref fix qset / qset_idx / mtu_idx misusage remove toe_mbuf definition and all references to it add initial connection accept Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#8 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#17 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#7 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#20 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#11 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#8 (text+ko) ==== @@ -108,9 +108,7 @@ static __inline void set_arp_failure_handler(struct mbuf *m, arp_failure_handler_func hnd) { - struct toe_mbuf *tm = (struct toe_mbuf *)m; - - tm->m_toe.mt_arp_fail = (opaque_arp_failure_handler_func)hnd; + m->m_pkthdr.header = (opaque_arp_failure_handler_func)hnd; } ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#17 (text+ko) ==== @@ -732,7 +732,7 @@ unsigned int hwtid; struct toe_tid_entry *toe_tid; - printf("do_hwtid_rpl m=%p\n", m); + printf("do_hwtid_rpl opcode=0x%x\n", p->opcode); hwtid = G_TID(ntohl(p->opcode_tid)); toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#7 (text+ko) ==== @@ -163,32 +163,4 @@ } #endif /* CONFIG_TCP_OFFLOAD */ -struct toepcb; - -struct m_toe_ { - void (*mt_arp_fail)(void *, struct mbuf *); - void (*mt_backlog_rcv)(struct toepcb *, struct mbuf *); - int priority; - struct toepcb *mt_toepcb; -}; - -#define TMLEN (MLEN - sizeof(struct m_toe_)) - -struct toe_mbuf { - struct m_hdr m_hdr; - union { - struct { - struct pkthdr MH_pkthdr; /* M_PKTHDR set */ - union { - struct m_ext_ MH_ext; /* M_EXT set */ - char MH_databuf[MHLEN]; - } MH_dat; - struct m_toe_ MH_toe; /* M_TOE set */ - } MH; - char M_databuf[TMLEN]; /* !M_PKTHDR, !M_EXT */ - } M_dat; -}; - -#define m_toe M_dat.MH.MH_toe - #endif /* _OFFLOAD_DEV_H_ */ ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#20 (text+ko) ==== @@ -209,7 +209,7 @@ if (__predict_false((toep->tp_flags & TP_DATASENT) == 0)) { req->flags |= htonl(V_TX_ACK_PAGES(2) | F_TX_INIT | - V_TX_CPU_IDX(toep->tp_qset_idx)); + V_TX_CPU_IDX(toep->tp_qset)); /* Sendbuffer is in units of 32KB. */ @@ -547,6 +547,9 @@ struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; + if (toep == NULL) + return; + if (tp->t_state == TCPS_CLOSED || (toep->tp_flags & TP_ABORT_SHUTDOWN)) return; @@ -727,28 +730,23 @@ } static unsigned int -select_mss(struct socket *so, unsigned int pmtu) +select_mss(struct t3c_data *td, struct tcpcb *tp, unsigned int pmtu) { unsigned int idx; - struct tcpcb *tp = sototcpcb(so); - struct tom_data *d; - const struct t3c_data *td; - struct toedev *toed; - - toed = TOE_DEV(so); - d = TOM_DATA(toed); - if (d == NULL) - panic("tom_data not set"); - td = T3C_DATA(d->cdev); #ifdef notyet struct rtentry *dst = sotoinpcb(so)->inp_route.ro_rt; #endif - tp->t_maxseg = pmtu - 40; - if (tp->t_maxseg < td->mtus[0] - 40) - tp->t_maxseg = td->mtus[0] - 40; - idx = find_best_mtu(td, tp->t_maxseg + 40); - tp->t_maxseg = td->mtus[idx] - 40; + if (tp) { + tp->t_maxseg = pmtu - 40; + if (tp->t_maxseg < td->mtus[0] - 40) + tp->t_maxseg = td->mtus[0] - 40; + idx = find_best_mtu(td, tp->t_maxseg + 40); + + tp->t_maxseg = td->mtus[idx] - 40; + } else + idx = find_best_mtu(td, pmtu); + return (idx); } @@ -894,7 +892,8 @@ { struct tcpcb *tp = sototcpcb(so); struct toepcb *toep; - + struct t3c_data *td = T3C_DATA(TOM_DATA(dev)->cdev); + toep = malloc(sizeof(struct toepcb), M_DEVBUF, M_NOWAIT); if (toep == NULL) @@ -915,7 +914,7 @@ toep->tp_wr_unacked = 0; toep->tp_delack_mode = 0; - toep->tp_mtu_idx = select_mss(so, dst->rt_ifp->if_mtu); + toep->tp_mtu_idx = select_mss(td, tp, dst->rt_ifp->if_mtu); tp->rcv_wnd = select_rcv_wnd(so); toep->tp_ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) && @@ -931,21 +930,14 @@ * The next two functions calculate the option 0 value for a socket. */ static inline unsigned int -calc_opt0h(struct socket *so) +calc_opt0h(struct socket *so, int mtu_idx) { struct tcpcb *tp = sototcpcb(so); - struct toepcb *toep = tp->t_toe; int wscale = select_rcv_wscale(tp->rcv_wnd); - int qset_idx; - if (toep) - qset_idx = toep->tp_qset_idx; - else - qset_idx = 0; - return V_NAGLE((tp->t_flags & TF_NODELAY) == 0) | V_KEEP_ALIVE((so->so_options & SO_KEEPALIVE) != 0) | F_TCAM_BYPASS | - V_WND_SCALE(wscale) | V_MSS_IDX(qset_idx); + V_WND_SCALE(wscale) | V_MSS_IDX(mtu_idx); } static inline unsigned int @@ -972,7 +964,7 @@ #endif static void -mk_act_open_req(struct socket *so, struct toe_mbuf *m, +mk_act_open_req(struct socket *so, struct mbuf *m, unsigned int atid, const struct l2t_entry *e) { struct cpl_act_open_req *req; @@ -993,7 +985,7 @@ memcpy(&req->local_ip, &inp->inp_laddr, 4); memcpy(&req->peer_ip, &inp->inp_faddr, 4); - req->opt0h = htonl(calc_opt0h(so) | V_L2T_IDX(e->idx) | + req->opt0h = htonl(calc_opt0h(so, toep->tp_mtu_idx) | V_L2T_IDX(e->idx) | V_TX_CHANNEL(e->smt_idx)); req->opt0l = htonl(calc_opt0l(so, toep->tp_ulp_mode)); req->params = 0; @@ -1128,7 +1120,7 @@ t3_connect(struct toedev *tdev, struct socket *so, struct ifnet *egress_ifp) { - struct toe_mbuf *m; + struct mbuf *m; struct l2t_entry *e; struct tom_data *d = TOM_DATA(tdev); struct inpcb *inp = sotoinpcb(so); @@ -1145,7 +1137,7 @@ if (!e) goto free_tid; - m = (struct toe_mbuf *)m_gethdr(MT_DATA, M_WAITOK); + m = m_gethdr(MT_DATA, M_WAITOK); m_set_toep(m, tp->t_toe); #if 0 @@ -1307,10 +1299,8 @@ static int t3_ctloutput(struct socket *so, struct sockopt *sopt) { - struct tcpcb *tp = sototcpcb(so); - struct toepcb *toep = tp->t_toe; int err; - + if (sopt->sopt_level != IPPROTO_TCP) err = t3_ip_ctloutput(so, sopt); else @@ -1319,9 +1309,7 @@ if (err != EOPNOTSUPP) return (err); - printf("calling %p\n", toep->tp_ctloutput); - - return toep->tp_ctloutput(so, sopt); + return tcp_ctloutput(so, sopt); } /* @@ -1404,6 +1392,8 @@ { struct toepcb *toep = (struct toepcb *)ctx; + printf("rx_data len=%d\n", m->m_pkthdr.len); + new_rx_data(toep, m); return (0); @@ -1529,10 +1519,8 @@ tp->snd_una = ntohl(rpl->snd_nxt) - 1; /* exclude FIN */ -#if 0 if (!is_t3a(TOE_DEV(so)) && (toep->tp_flags & TP_ABORT_RPL_PENDING)) goto out; -#endif switch (tp->t_state) { case TCPS_CLOSING: /* see FIN_WAIT2 case in do_peer_fin */ @@ -1577,9 +1565,7 @@ TOE_DEV(so)->name, toep->tp_tid, tp->t_state); } -#if 0 out: -#endif m_free(m); } @@ -2149,17 +2135,21 @@ /* * Fill out information for entering us into the syncache */ - th.th_sport = req->peer_port; - th.th_dport = req->local_port; - th.th_seq = req->rcv_isn; + inc.inc_fport = th.th_sport = req->peer_port; + inc.inc_lport = th.th_dport = req->local_port; + toep->tp_iss = th.th_seq = req->rcv_isn; th.th_flags = TH_SYN; inc.inc_isipv6 = 0; inc.inc_len = 0; - memcpy(&inc.inc_faddr, &req->peer_ip, 4); - memcpy(&inc.inc_laddr, &req->local_ip, 4); + inc.inc_faddr.s_addr = req->peer_ip; + inc.inc_laddr.s_addr = req->local_ip; inc.inc_ext = toep; inc.inc_eh = handle_syncache_event; + + printf("syncache add of %d:%d %d:%d\n", + ntohl(req->local_ip), ntohs(req->local_port), + ntohl(req->peer_ip), ntohs(req->peer_port)); mss = req->tcp_options.mss; wsf = req->tcp_options.wsf; @@ -2197,6 +2187,7 @@ struct toepcb *newtoep; struct rtentry *dst; struct sockaddr_in nam; + struct t3c_data *td = T3C_DATA(cdev); reply_mbuf = m_gethdr(M_NOWAIT, MT_DATA); if (__predict_false(reply_mbuf == NULL)) { @@ -2279,7 +2270,8 @@ newtoep->tp_tp = tp; newtoep->tp_flags = TP_SYN_RCVD; newtoep->tp_tid = tid; - + newtoep->tp_toedev = tdev; + printf("inserting tid=%d\n", tid); cxgb_insert_tid(cdev, d->client, newtoep, tid); @@ -2303,17 +2295,14 @@ rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_PASS_ACCEPT_RPL, tid)); rpl->peer_ip = req->peer_ip; // req->peer_ip is not overwritten - printf("e=%p idxs:\n", e); - printf("e->idx=%d e->smt_idx=%d\n", e->idx, e->smt_idx); - rpl->opt0h = htonl(calc_opt0h(so) | V_L2T_IDX(e->idx) | + rpl->opt0h = htonl(calc_opt0h(so, select_mss(td, NULL, dst->rt_ifp->if_mtu)) | V_L2T_IDX(e->idx) | V_TX_CHANNEL(e->smt_idx)); rpl->opt0l_status = htonl(calc_opt0l(so, lctx->ulp_mode) | CPL_PASS_OPEN_ACCEPT); rpl->opt2 = htonl(calc_opt2(so, tdev)); rpl->rsvd = rpl->opt2; /* workaround for HW bug */ m_set_priority(reply_mbuf, mkprio(CPL_PRIORITY_SETUP, so)); - printf("sending off reply\n"); l2t_send(cdev, reply_mbuf, e); m_free(m); @@ -2391,44 +2380,6 @@ } /* - * Add a passively open socket to its parent's accept queue. Note that the - * child may be in any state by now, including TCP_CLOSE. We can guarantee - * though that it has not been orphaned yet. - */ -static void -add_pass_open_to_parent(struct socket *child, struct socket *lso, - struct toedev *dev) -{ - struct tcpcb *tp = sototcpcb(lso); - /* - * If the server is closed it has already killed its embryonic - * children. There is nothing further to do about child. - */ - if (tp->t_state != TCPS_LISTEN) - return; - - printf("need to move connection from syncache to so_comp for accept XXX\n"); - UNIMPLEMENTED(); - -#ifdef notyet - oreq = child->sk_user_data; - child->sk_user_data = NULL; - - inet_csk_reqsk_queue_removed(lsk, oreq); - synq_remove(tcp_sk(child)); - - if (sk_acceptq_is_full(lsk) && !TOM_TUNABLE(dev, soft_backlog_limit)) { - NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS); - NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS); - __reqsk_free(oreq); - add_to_reap_list(child); - } else { - inet_csk_reqsk_queue_add(lsk, oreq, child); - lsk->sk_data_ready(lsk, 0); - } -#endif -} -/* * Called when a connection is established to translate the TCP options * reported by HW to Linux's native format. */ @@ -2461,7 +2412,6 @@ toep->tp_write_seq = tp->iss = tp->snd_max = tp->snd_nxt = tp->snd_una = snd_isn; assign_rxopt(so, opt); - toep->tp_ctloutput = so->so_proto->pr_ctloutput; so->so_proto->pr_ctloutput = t3_ctloutput; #if 0 @@ -2488,6 +2438,59 @@ tp->t_state = TCPS_ESTABLISHED; } +static int +syncache_expand_establish_req(struct cpl_pass_establish *req, struct socket **so, struct toepcb *toep) +{ + + struct in_conninfo inc; + struct tcpopt to; + struct tcphdr th; + int mss, wsf, sack, ts; + struct mbuf *m = NULL; + const struct t3c_data *td = T3C_DATA(TOM_DATA(toep->tp_toedev)->cdev); + unsigned int opt; + +#ifdef MAC +#error "no MAC support" +#endif + + opt = ntohs(req->tcp_opt); + + bzero(&to, sizeof(struct tcpopt)); + + /* + * Fill out information for entering us into the syncache + */ + inc.inc_fport = th.th_sport = req->peer_port; + inc.inc_lport = th.th_dport = req->local_port; + th.th_seq = req->rcv_isn; + th.th_flags = TH_ACK; + + inc.inc_isipv6 = 0; + inc.inc_len = 0; + inc.inc_faddr.s_addr = req->peer_ip; + inc.inc_laddr.s_addr = req->local_ip; + + inc.inc_ext = toep; + inc.inc_eh = handle_syncache_event; + + mss = td->mtus[G_TCPOPT_MSS(opt)] - 40; + wsf = G_TCPOPT_WSCALE_OK(opt); + ts = G_TCPOPT_TSTAMP(opt); + sack = G_TCPOPT_SACK(opt); + + to.to_mss = mss; + to.to_wscale = G_TCPOPT_SND_WSCALE(opt); + to.to_flags = (mss ? TOF_MSS : 0) | (wsf ? TOF_SCALE : 0) | (ts ? TOF_TS : 0) | (sack ? TOF_SACKPERM : 0); + + printf("syncache expand of %d:%d %d:%d mss:%d wsf:%d ts:%d sack:%d\n", + ntohl(req->local_ip), ntohs(req->local_port), + ntohl(req->peer_ip), ntohs(req->peer_port), + mss, wsf, ts, sack); + return syncache_expand(&inc, &to, &th, so, m); +} + + /* * Process a CPL_PASS_ESTABLISH message. XXX a lot of the locking doesn't work * if we are in TCP_SYN_RECV due to crossed SYNs @@ -2497,23 +2500,50 @@ { struct cpl_pass_establish *req = cplhdr(m); struct toepcb *toep = (struct toepcb *)ctx; + struct tcpcb *tp; struct socket *so, *lso; + struct t3c_data *td = T3C_DATA(cdev); // Complete socket initialization now that we have the SND_ISN struct toedev *tdev; - struct toe_tid_entry *t3c_stid; - struct tid_info *t; - unsigned int stid; - lso = toeptoso(toep); - tdev = TOE_DEV(lso); + so = lso = toeptoso(toep); + tdev = toep->tp_toedev; - SOCK_LOCK(lso); + INP_INFO_WLOCK(&tcbinfo); + if (!syncache_expand_establish_req(req, &so, toep)) { + /* + * No entry + */ + UNIMPLEMENTED(); + } + if (so == NULL) { + /* + * Couldn't create the socket + */ + UNIMPLEMENTED(); + } + + tp = sototcpcb(so); + toep->tp_tp = tp; + tp->t_toe = toep; + reset_wr_list(tp); + tp->rcv_wnd = select_rcv_wnd(so); + install_offload_ops(so); + toep->tp_wr_max = toep->tp_wr_avail = TOM_TUNABLE(tdev, max_wrs); toep->tp_wr_unacked = 0; toep->tp_qset = G_QNUM(ntohl(m->m_pkthdr.csum_data)); + toep->tp_ulp_mode = TOM_TUNABLE(tdev, ddp) && !(so->so_options & SO_NO_DDP) && + tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; + toep->tp_qset_idx = 0; + toep->tp_mtu_idx = select_mss(td, tp, toep->tp_l2t->neigh->rt_ifp->if_mtu); + make_established(so, ntohl(req->snd_isn), ntohs(req->tcp_opt)); + INP_INFO_WUNLOCK(&tcbinfo); + soisconnected(so); + #ifdef notyet /* * XXX not sure how these checks map to us @@ -2539,22 +2569,9 @@ goto unlock; } #endif + m_free(m); - stid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); - t = &(T3C_DATA(cdev))->tid_maps; - t3c_stid = lookup_stid(t, stid); - lso = ((struct listen_ctx *)t3c_stid->ctx)->lso; - - SOCK_LOCK(lso); - m_free(m); - add_pass_open_to_parent(so, lso, tdev); - SOCK_UNLOCK(lso); -#if 0 -unlock: -#endif - SOCK_UNLOCK(lso); - - return 0; + return (0); } /* @@ -2876,6 +2893,7 @@ tcphdr_skb->h.raw = tcphdr_skb->data; memset(tcphdr_skb->data, 0, tcphdr_skb->len); #endif + t3tom_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish); t3tom_register_cpl_handler(CPL_ACT_OPEN_RPL, do_act_open_rpl); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#11 (text+ko) ==== @@ -153,6 +153,7 @@ int tp_qset; int tp_flags; int tp_enqueued_bytes; + tcp_seq tp_iss; tcp_seq tp_delack_seq; tcp_seq tp_rcv_wup; tcp_seq tp_copied_seq; From owner-p4-projects@FreeBSD.ORG Sun Nov 11 13:49:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5299216A419; Sun, 11 Nov 2007 13:49:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E100F16A417 for ; Sun, 11 Nov 2007 13:49:13 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D2FF413C4B9 for ; Sun, 11 Nov 2007 13:49:13 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABDnDG9033912 for ; Sun, 11 Nov 2007 13:49:13 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABDnAHu033909 for perforce@freebsd.org; Sun, 11 Nov 2007 13:49:10 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 11 Nov 2007 13:49:10 GMT Message-Id: <200711111349.lABDnAHu033909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 128931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 13:49:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=128931 Change 128931 by gonzo@gonzo_jeeves on 2007/11/11 13:48:35 IFC Affected files ... .. //depot/projects/mips2/src/ObsoleteFiles.inc#9 integrate .. //depot/projects/mips2/src/bin/ps/ps.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/mips2/src/contrib/libreadline/complete.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/display.c#4 integrate .. //depot/projects/mips2/src/contrib/libreadline/input.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/misc.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/readline.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/text.c#3 integrate .. //depot/projects/mips2/src/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/mips2/src/etc/Makefile#5 integrate .. //depot/projects/mips2/src/etc/defaults/Makefile#2 integrate .. //depot/projects/mips2/src/etc/defaults/pccard.conf#2 delete .. //depot/projects/mips2/src/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/mips2/src/etc/pf.conf#2 delete .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/mips2/src/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/mips2/src/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/mips2/src/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/mips2/src/release/Makefile#6 integrate .. //depot/projects/mips2/src/release/scripts/package-split.py#3 integrate .. //depot/projects/mips2/src/release/scripts/src-install.sh#3 integrate .. //depot/projects/mips2/src/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/mips2/src/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/hash.c#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/hash.h#2 integrate .. //depot/projects/mips2/src/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/mips2/src/sbin/setkey/parse.y#3 integrate .. //depot/projects/mips2/src/sbin/setkey/setkey.c#3 integrate .. //depot/projects/mips2/src/sbin/setkey/test-pfkey.c#3 integrate .. //depot/projects/mips2/src/sbin/setkey/token.l#3 integrate .. //depot/projects/mips2/src/share/doc/legal/Makefile#2 integrate .. //depot/projects/mips2/src/share/examples/pf/Makefile#2 integrate .. //depot/projects/mips2/src/share/examples/pf/ackpri#2 integrate .. //depot/projects/mips2/src/share/examples/pf/faq-example1#2 integrate .. //depot/projects/mips2/src/share/examples/pf/faq-example2#2 integrate .. //depot/projects/mips2/src/share/examples/pf/faq-example3#2 integrate .. //depot/projects/mips2/src/share/examples/pf/pf.conf#1 branch .. //depot/projects/mips2/src/share/examples/pf/queue1#2 integrate .. //depot/projects/mips2/src/share/examples/pf/queue2#2 integrate .. //depot/projects/mips2/src/share/examples/pf/queue3#2 integrate .. //depot/projects/mips2/src/share/examples/pf/queue4#2 integrate .. //depot/projects/mips2/src/share/examples/pf/spamd#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#11 integrate .. //depot/projects/mips2/src/share/man/man4/wpi.4#1 branch .. //depot/projects/mips2/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#6 integrate .. //depot/projects/mips2/src/share/man/man9/locking.9#4 integrate .. //depot/projects/mips2/src/share/man/man9/rmlock.9#1 branch .. //depot/projects/mips2/src/share/mk/sys.mk#7 integrate .. //depot/projects/mips2/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/mips2/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#10 integrate .. //depot/projects/mips2/src/sys/conf/files#11 integrate .. //depot/projects/mips2/src/sys/conf/files.amd64#7 integrate .. //depot/projects/mips2/src/sys/conf/files.i386#8 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/mips2/src/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/md/md.c#5 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2560.c#8 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/mips2/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/mips2/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/mips2/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/mips2/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/mips2/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/mips2/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#9 integrate .. //depot/projects/mips2/src/sys/modules/asmc/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/mips2/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/mips2/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/mips2/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/mips2/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/mips2/src/sys/sys/_rmlock.h#1 branch .. //depot/projects/mips2/src/sys/sys/lock.h#4 integrate .. //depot/projects/mips2/src/sys/sys/malloc.h#2 integrate .. //depot/projects/mips2/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/mips2/src/sys/sys/rmlock.h#1 branch .. //depot/projects/mips2/src/sys/sys/smp.h#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/vm/vm_kern.c#4 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/mips2/src/tools/build/options/makeman#3 integrate .. //depot/projects/mips2/src/usr.bin/du/du.c#3 integrate .. //depot/projects/mips2/src/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/fstat/fstat.c#3 integrate .. //depot/projects/mips2/src/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/mips2/src/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/mips2/src/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/mips2/src/usr.bin/killall/killall.1#2 integrate .. //depot/projects/mips2/src/usr.bin/killall/killall.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/aux.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/lex.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/list.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mail/main.c#2 integrate .. //depot/projects/mips2/src/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/mips2/src/usr.bin/passwd/passwd.1#3 integrate .. //depot/projects/mips2/src/usr.bin/sed/main.c#4 integrate .. //depot/projects/mips2/src/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/cron.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/cron.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/database.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/do_command.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cron/lib/entry.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/crunch/crunchide/crunchide.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/faithd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/faithd/tcp.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/mips2/src/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pciconf/pciconf.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/create/main.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/updating/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/updating/pathnames.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/auth.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/main.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/options.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/pppd.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/sys-bsd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rip6query/rip6query.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/route6d/route6d.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.statd/statd.c#6 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcbind.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/rrenumd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rtadvd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/traceroute6/traceroute6.c#5 integrate .. //depot/projects/mips2/src/usr.sbin/wpa/hostapd/Makefile#4 integrate .. //depot/projects/mips2/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate Differences ... ==== //depot/projects/mips2/src/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/mips2/src/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/mips2/src/contrib/libreadline/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/mips2/src/contrib/libreadline/complete.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/mips2/src/contrib/libreadline/display.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } } /* Otherwise, print over the existing material. */ @@ -1608,8 +1642,20 @@ { if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); _rl_last_c_pos += col_temp; /* XXX */ + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } } lendiff = (oe - old) - (ne - new); if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) @@ -1745,7 +1791,10 @@ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) { dpos = _rl_col_width (data, 0, new); - if (dpos > prompt_last_invisible) /* XXX - don't use woff here */ + /* Use NEW when comparing against the last invisible character in the + prompt string, since they're both buffer indices and DPOS is a + desired display position. */ + if (new > prompt_last_invisible) /* XXX - don't use woff here */ { dpos -= woff; /* Since this will be assigned to _rl_last_c_pos at the end (more ==== //depot/projects/mips2/src/contrib/libreadline/input.c#3 (text+ko) ==== @@ -133,8 +133,11 @@ return (0); *key = ibuffer[pop_index++]; - +#if 0 if (pop_index >= ibuffer_len) +#else + if (pop_index > ibuffer_len) +#endif pop_index = 0; return (1); @@ -250,7 +253,8 @@ while (chars_avail--) { k = (*rl_getc_function) (rl_instream); - rl_stuff_char (k); + if (rl_stuff_char (k) == 0) + break; /* some problem; no more room */ if (k == NEWLINE || k == RETURN) break; } @@ -373,7 +377,11 @@ RL_SETSTATE (RL_STATE_INPUTPENDING); } ibuffer[push_index++] = key; +#if 0 if (push_index >= ibuffer_len) +#else + if (push_index > ibuffer_len) +#endif push_index = 0; return 1; @@ -513,20 +521,26 @@ char *mbchar; int size; { - int mb_len = 0; + int mb_len, c; size_t mbchar_bytes_length; wchar_t wc; mbstate_t ps, ps_back; memset(&ps, 0, sizeof (mbstate_t)); memset(&ps_back, 0, sizeof (mbstate_t)); - + + mb_len = 0; while (mb_len < size) { RL_SETSTATE(RL_STATE_MOREINPUT); - mbchar[mb_len++] = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + break; + + mbchar[mb_len++] = c; + mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps); if (mbchar_bytes_length == (size_t)(-1)) break; /* invalid byte sequence for the current locale */ @@ -564,7 +578,7 @@ c = first; memset (mb, 0, mlen); - for (i = 0; i < mlen; i++) + for (i = 0; c >= 0 && i < mlen; i++) { mb[i] = (char)c; memset (&ps, 0, sizeof (mbstate_t)); ==== //depot/projects/mips2/src/contrib/libreadline/isearch.c#3 (text+ko) ==== @@ -327,8 +327,15 @@ rl_command_func_t *f; f = (rl_command_func_t *)NULL; - - /* Translate the keys we do something with to opcodes. */ + + if (c < 0) + { + cxt->sflags |= SF_FAILED; + cxt->history_pos = cxt->last_found_line; + return -1; + } + + /* Translate the keys we do something with to opcodes. */ if (c >= 0 && _rl_keymap[c].type == ISFUNC) { f = _rl_keymap[c].function; ==== //depot/projects/mips2/src/contrib/libreadline/misc.c#3 (text+ko) ==== @@ -146,6 +146,8 @@ rl_restore_prompt (); rl_clear_message (); RL_UNSETSTATE(RL_STATE_NUMERICARG); + if (key < 0) + return -1; return (_rl_dispatch (key, _rl_keymap)); } } ==== //depot/projects/mips2/src/contrib/libreadline/readline.c#3 (text+ko) ==== @@ -645,6 +645,11 @@ if ((cxt->flags & KSEQ_DISPATCHED) == 0) { nkey = _rl_subseq_getchar (cxt->okey); + if (nkey < 0) + { + _rl_abort_internal (); + return -1; + } r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg); cxt->flags |= KSEQ_DISPATCHED; } ==== //depot/projects/mips2/src/contrib/libreadline/text.c#3 (text+ko) ==== @@ -857,6 +857,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + #if defined (HANDLE_SIGNALS) if (RL_ISSTATE (RL_STATE_CALLBACK) == 0) _rl_restore_tty_signals (); @@ -1520,6 +1523,9 @@ mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX); + if (mb_len <= 0) + return -1; + if (count < 0) return (_rl_char_search_internal (-count, bdir, mbchar, mb_len)); else @@ -1536,6 +1542,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + if (count < 0) return (_rl_char_search_internal (-count, bdir, c)); else ==== //depot/projects/mips2/src/contrib/libreadline/vi_mode.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.6 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.7 2007/11/07 04:42:20 ache Exp $ */ /* vi_mode.c -- A vi emulation mode for Bash. Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */ @@ -887,6 +887,13 @@ RL_SETSTATE(RL_STATE_MOREINPUT); c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + + if (c < 0) + { + *nextkey = 0; + return -1; + } + *nextkey = c; if (!member (c, vi_motion)) @@ -903,6 +910,11 @@ RL_SETSTATE(RL_STATE_MOREINPUT); c = rl_read_key (); /* real command */ RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + { + *nextkey = 0; + return -1; + } *nextkey = c; } else if (key == c && (key == 'd' || key == 'y' || key == 'c')) @@ -1225,14 +1237,22 @@ _rl_vi_callback_char_search (data) _rl_callback_generic_arg *data; { + int c; #if defined (HANDLE_MULTIBYTE) - _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); #else RL_SETSTATE(RL_STATE_MOREINPUT); - _rl_vi_last_search_char = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); #endif + if (c <= 0) + return -1; + +#if !defined (HANDLE_MULTIBYTE) + _rl_vi_last_search_char = c; +#endif + _rl_callback_func = 0; _rl_want_redisplay = 1; @@ -1248,6 +1268,7 @@ rl_vi_char_search (count, key) int count, key; { + int c; #if defined (HANDLE_MULTIBYTE) static char *target; static int tlen; @@ -1294,11 +1315,17 @@ else { #if defined (HANDLE_MULTIBYTE) - _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + if (c <= 0) + return -1; + _rl_vi_last_search_mblen = c; #else RL_SETSTATE(RL_STATE_MOREINPUT); - _rl_vi_last_search_char = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + _rl_vi_last_search_char = c; #endif } } @@ -1468,6 +1495,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) c = _rl_read_mbstring (c, mb, mlen); @@ -1486,6 +1516,9 @@ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); + if (c < 0) + return -1; + _rl_callback_func = 0; _rl_want_redisplay = 1; @@ -1517,6 +1550,9 @@ else _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); + if (c < 0) + return -1; + return (_rl_vi_change_char (count, c, mb)); } @@ -1651,7 +1687,7 @@ ch = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); - if (ch < 'a' || ch > 'z') + if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ { rl_ding (); return -1; @@ -1703,7 +1739,7 @@ rl_point = rl_mark; return 0; } - else if (ch < 'a' || ch > 'z') + else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ { rl_ding (); return -1; ==== //depot/projects/mips2/src/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $ +# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ .include @@ -14,7 +14,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ - portsnap.conf pf.conf pf.os phones profile protocols \ + portsnap.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ ==== //depot/projects/mips2/src/etc/defaults/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.8 2007/11/08 17:41:35 imp Exp $ -FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf +FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults ==== //depot/projects/mips2/src/etc/mtree/BSD.usr.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.329 2007/07/25 13:37:33 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.332 2007/11/10 22:47:46 sam Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -80,6 +80,8 @@ .. intel_iwi .. + intel_wpi + .. .. ncurses .. @@ -212,6 +214,8 @@ .. find_interface .. + hostapd + .. ibcs2 .. ipfilter @@ -304,6 +308,8 @@ .. tcsh .. + wpa_supplicant + .. .. games fortune ==== //depot/projects/mips2/src/games/fortune/datfiles/fortunes#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.244 2007/10/28 07:02:10 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.246 2007/11/06 22:40:16 edwin Exp $ % ======================================================================= @@ -57352,9 +57352,9 @@ side of the majority, it is time to reform. -- Mark Twain % -Where a calculator on the ENIAC is equpped with 18,000 vaccuum tubes and -weighs 30 tons, computers in the future may have only 1,000 vaccuum tubes -and perhaps weight 1 1/2 tons. +Where a calculator on the ENIAC is equipped with 18,000 vacuum tubes and +weighs 30 tons, computers in the future may have only 1,000 vacuum tubes +and perhaps weigh 1 1/2 tons. -- Popular Mechanics, March 1949 % Where am I? Who am I? Am I? I ==== //depot/projects/mips2/src/games/fortune/fortune/fortune.6#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fortune.6 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.20 2005/02/13 23:45:45 ru Exp $ +.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.22 2007/11/07 12:08:03 ru Exp $ .\" -.Dd April 19, 1994 +.Dd November 7, 2007 .Dt FORTUNE 6 .Os .Sh NAME @@ -57,7 +57,7 @@ is subdivided into those which are potentially offensive and those which are not. The options are as follows: -.Bl -tag -width flag +.Bl -tag -width indent .It Fl a Choose from all lists of maxims, both offensive and not. (See the @@ -66,7 +66,8 @@ .It Fl D Enable additional debugging output. Specify this option multiple times for more verbose output. -Only available if compiled with -DDEBUG. +Only available if compiled with +.Li -DDEBUG . .It Fl e Consider all fortune files to be of equal size (see discussion below on multiple files). @@ -75,7 +76,7 @@ print a fortune. .It Fl l Long dictums only. -.It Fl m +.It Fl m Ar pattern Print out all fortunes which match the regular expression .Ar pattern . See @@ -116,13 +117,13 @@ The user may specify alternate sayings. You can specify a specific file, a directory which contains one or more files, or the special word -.Em all +.Cm all which says to use all the standard databases. Any of these may be preceded by a percentage, which is a number .Ar N between 0 and 100 inclusive, followed by a -.Ar % . -If it is, there will be a +.Ql % . +If it is, there will be an .Ar N percent probability that an adage will be picked from that file or directory. @@ -132,52 +133,56 @@ one of them will be based on their relative sizes. .Pp As an example, given two databases -.Em funny +.Pa funny and -.Em not-funny , +.Pa not-funny , with -.Em funny +.Pa funny twice as big, saying -.Bd -literal -offset indent -fortune funny not-funny -.Ed +.Pp +.Dl "fortune funny not-funny" .Pp will get you fortunes out of -.Em funny +.Pa funny two-thirds of the time. The command -.Bd -literal -offset indent -fortune 90% funny 10% not-funny -.Ed +.Pp +.Dl "fortune 90% funny 10% not-funny" .Pp will pick out 90% of its fortunes from -.Em funny +.Pa funny (the -.Dq 10% not-funny +.Dq Li "10% not-funny" is unnecessary, since 10% is all that is left). The .Fl e option says to consider all files equal; thus -.Bd -literal -offset indent -fortune -e funny not-funny -.Ed +.Pp +.Dl "fortune -e funny not-funny" .Pp is equivalent to -.Bd -literal -offset indent -fortune 50% funny 50% not-funny >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 14:00:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AE9516A419; Sun, 11 Nov 2007 14:00:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22A0716A417 for ; Sun, 11 Nov 2007 14:00:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F201813C4A6 for ; Sun, 11 Nov 2007 14:00:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABE0QKG034383 for ; Sun, 11 Nov 2007 14:00:26 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABE0QKE034380 for perforce@freebsd.org; Sun, 11 Nov 2007 14:00:26 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 11 Nov 2007 14:00:26 GMT Message-Id: <200711111400.lABE0QKE034380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 128932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 14:00:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=128932 Change 128932 by gonzo@gonzo_jeeves on 2007/11/11 13:59:40 o Remove extra .endif Affected files ... .. //depot/projects/mips2/src/share/mk/sys.mk#8 edit Differences ... ==== //depot/projects/mips2/src/share/mk/sys.mk#8 (text+ko) ==== @@ -37,7 +37,6 @@ CC ?= cc CFLAGS ?= -fno-strict-aliasing -pipe .endif -.endif CXX ?= c++ CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} From owner-p4-projects@FreeBSD.ORG Sun Nov 11 15:56:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B37B516A421; Sun, 11 Nov 2007 15:56:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C71F16A41B for ; Sun, 11 Nov 2007 15:56:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40E6713C4CA for ; Sun, 11 Nov 2007 15:56:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABFuVT5042251 for ; Sun, 11 Nov 2007 15:56:31 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABFuV55042248 for perforce@freebsd.org; Sun, 11 Nov 2007 15:56:31 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 11 Nov 2007 15:56:31 GMT Message-Id: <200711111556.lABFuV55042248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 128934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 15:56:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=128934 Change 128934 by pgj@disznohal on 2007/11/11 15:55:34 MFen 1.10 -> 1.13 Affected files ... .. //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#4 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.13 --> @@ -14,112 +14,115 @@ Murray Stokely - Írta: + Írta: - - Virtualizáció + Virtualizáció - Áttekintés + Áttekintés - A virtualizációs szoftverek lehetõvé - teszik, hogy ugyanazon a számítógépen - egyszerre több operációs rendszert is + A virtualizációs szoftverek lehetõvé + teszik, hogy ugyanazon a számítógépen + egyszerre több operációs rendszert is futassunk. Ezeknek a programcsomagoknak gyakorta - részük egy gazda operációs rendszer is, - amely a virtualizációs szoftvert futattja és - ismer bizonyos vendég operációs rendszereket. + részük egy gazda operációs rendszer is, + amely a virtualizációs szoftvert futattja és + ismer bizonyos vendég operációs rendszereket. - A fejezet elolvasása során - megismerjük: + A fejezet elolvasása során + megismerjük: - a gazda- és a vendég operációs - rendszerek közti különbségeket. + A gazda- és a vendég operációs + rendszerek közti különbségeket. + + + + Hogyan telepítsünk &os;-t egy + &intel;-alapú &apple; &macintosh; + számítógépre. - hogyan telepítsünk &os;-t &linux;-ra a - &xen; - használatával. + Hogyan telepítsünk a &xen; + használatával &os;-t &linux;-ra. - hogyan telepítsünk &os;-t egy - &intel;-alapú &apple; &macintosh; - számítógépre. + Hogyan telepítsünk a Virtual + PC &os;-t µsoft.windows;-ra. - hogyan hozzuk ki a legtöbbet &os; - rendszerünkbõl virtualizáció + Hogyan hozzuk ki a legtöbbet &os; + rendszerünkbõl virtualizáció alatt. - A fejezet elolvasásához ajánlott: + A fejezet elolvasásához ajánlott: - alapvetõ &unix;-os és &os;-s ismeretek (alapvetõ &unix;-os és &os;-s ismeretek (). - a &os; telepítésének ismerete (a &os; telepítésének ismerete (). - a hálózati kapcsolatok - beállításának ismerete (a hálózati kapcsolatok + beállításának ismerete (). - külsõs alkalmazások - telepítésének ismerete (külsõs alkalmazások + telepítésének ismerete (). - A &os; mint vendég + A &os; mint vendég Parallels-el &macos;-en A Parallels Desktop a &macos; - 10.4.6, vagy afeletti verzióját futattó, - &intel;-alapú &apple; &mac; személyi - számítógépekre fejlesztett - kereskedelmi alkalmazás. A &os;-t teljes - mértékben támogatja - vendégként. Miután - telepítettük a + 10.4.6, vagy afeletti verzióját futattó, + &intel;-alapú &apple; &mac; személyi + számítógépekre fejlesztett + kereskedelmi alkalmazás. A &os;-t teljes + mértékben támogatja + vendégként. Miután + telepítettük a Parallels-t a &macos; X-re, be kell - állítanunk egy virtuális gépet, majd - erre felraknunk a kívánt vendég - operációs rendszert. + állítanunk egy virtuális gépet, majd + erre felraknunk a kívánt vendég + operációs rendszert. - A &os; telepítése &macos; + <title>A &os; telepítése &macos; X/Parallels-re A &os; &macos; X/Parallels - párosra telepítéséhez elsõ - lépésként - készítenünk kell egy új - virtuális számítógépet. - A létrehozás során válasszuk a - Vendég operációs rendszer - típusá-nak a + párosra telepítéséhez elsõ + lépésként + készítenünk kell egy új + virtuális számítógépet. + A létrehozás során válasszuk a + Vendég operációs rendszer + típusá-nak a &os;-t: @@ -128,16 +131,16 @@ - Ezután adjunk meg egy nagyjából - elfogadható méretet a virtuális - merevlemezünknek, valamint annyi - memóriát, amennyire - szükségünk lehet a virtuális &os;-nk - használata során. Egy 4 GB-os lemez és - 512 MB rendszermemória a legtöbb esetben - jó választásnak bizonyulhat a &os; + Ezután adjunk meg egy nagyjából + elfogadható méretet a virtuális + merevlemezünknek, valamint annyi + memóriát, amennyire + szükségünk lehet a virtuális &os;-nk + használata során. Egy 4 GB-os lemez és + 512 MB rendszermemória a legtöbb esetben + jó választásnak bizonyulhat a &os; Parallels alatti - használata során: + használata során: @@ -163,9 +166,9 @@ - Válasszuk ki a - hálózatkezelés típusát - és a hálózati csatolót: + Válasszuk ki a + hálózatkezelés típusát + és a hálózati csatolót: @@ -179,8 +182,8 @@ - Mentsük el és fejezzük be a - konfigurálást: + Mentsük el és fejezzük be a + konfigurálást: @@ -194,25 +197,25 @@ - Miután a &os;-s virtuális - gépünk elkészült, - telepítenünk kell rá magát az - operációs rendszert is. Ezt a - legegyszerûbben a hivatalosan &os; telepítõ - CD-rõl, vagy a hivatalos FTP oldalról - letölthetõ CD-képpel tehetjük meg. Ha - lemásoltuk a megfelelõ CD-képet a &mac; - helyi állományrendszerére, vagy - behelyeztük a telepítõ CD-t a - CD-meghajtóba, kattintsunk a &os;-s + Miután a &os;-s virtuális + gépünk elkészült, + telepítenünk kell rá magát az + operációs rendszert is. Ezt a + legegyszerûbben a hivatalosan &os; telepítõ + CD-rõl, vagy a hivatalos FTP oldalról + letölthetõ CD-képpel tehetjük meg. Ha + lemásoltuk a megfelelõ CD-képet a &mac; + helyi állományrendszerére, vagy + behelyeztük a telepítõ CD-t a + CD-meghajtóba, kattintsunk a &os;-s Parallels ablakunk jobb - alsó sarkában található lemez - ikonjára. Ekkor feljön egy - párbeszédablak, ahol - összerendelhetjük a virtuális - gépünk CD-meghajtóját egy lemezen - található képpel, vagy éppen a - valódi CD-meghajtónkkal. + alsó sarkában található lemez + ikonjára. Ekkor feljön egy + párbeszédablak, ahol + összerendelhetjük a virtuális + gépünk CD-meghajtóját egy lemezen + található képpel, vagy éppen a + valódi CD-meghajtónkkal. @@ -220,11 +223,11 @@ - Ahogy megtettük az imént említett - összerendelést, indítsuk is újra a - &os;-s virtuális gépünket a megszokott - módon, az újraindítás - ikonjára kattintva. + Ahogy megtettük az imént említett + összerendelést, indítsuk is újra a + &os;-s virtuális gépünket a megszokott + módon, az újraindítás + ikonjára kattintva. @@ -232,16 +235,16 @@ - Ekkor a rendszer megtalálja a &os; - telepítõlemezt és a + Ekkor a rendszer megtalálja a &os; + telepítõlemezt és a sysinstall - segítségével megkezdi a - telepítést a - részben leírtak szerint. Ha - szükségünk van rá, - telepíthetjük az X11-et is, de egyelõre - még ne próbáljuk - beállítani. + segítségével megkezdi a + telepítést a + részben leírtak szerint. Ha + szükségünk van rá, + telepíthetjük az X11-et is, de egyelõre + még ne próbáljuk + beállítani. @@ -249,10 +252,10 @@ - A telepítés befejezését - követõen indítsuk újra a frissen - telepített &os;-s virtuális - gépünket. + A telepítés befejezését + követõen indítsuk újra a frissen + telepített &os;-s virtuális + gépünket. @@ -262,80 +265,80 @@ - A &os; beállítása &macos; + <title>A &os; beállítása &macos; X/Parallels-en - A &os; &macos; X/Parallels-re történõ - sikeres telepítését követõen - még vár ránk néhány - konfigurációs lépés a rendszer - virtuálizált - mûködésének - optimalizálása érdekében. + A &os; &macos; X/Parallels-re történõ + sikeres telepítését követõen + még vár ránk néhány + konfigurációs lépés a rendszer + virtuálizált + mûködésének + optimalizálása érdekében. - A rendszerbetöltõ - változóinak - beállítása + A rendszerbetöltõ + változóinak + beállítása - A legfontosabb lépés a - változó - értékének csökkentése, - amivel így a &os; - processzor-kihasználtságát is - csökkentjük a + A legfontosabb lépés a + változó + értékének csökkentése, + amivel így a &os; + processzor-kihasználtságát is + csökkentjük a Parallels alatt. Ezt a - következõ sor hozzadásával - tehetjük meg a + következõ sor hozzadásával + tehetjük meg a /boot/loader.conf-ban: kern.hz=100 - Enélkül egy üresjáratban - levõ &os; - Parallels-vendég az - &imac; egy processzorának durván - 15%-át foglalja le. A változtatás - életbe léptetése után - azonban ez megközelítõen 5%-ra - redukálható. + Enélkül egy üresjáratban + levõ &os; + Parallels-vendég az + &imac; egy processzorának durván + 15%-át foglalja le. A változtatás + életbe léptetése után + azonban ez megközelítõen 5%-ra + redukálható. - Egy új konfigurációs - állomány létrehozása a + <title>Egy új konfigurációs + állomány létrehozása a rendszermaghoz - Nyugodtan eltávolíthatjuk az - összes SCSI, FireWire és USB - eszközmeghajtót. A - Parallels által - felkínált virtuális - hálózati csatolót az &man.ed.4; - meghajtón keresztül tudjuk elérni, - ezért az &man.ed.4; és &man.miibus.4; - meghajtókon kívül az összes - többi elhagyható. + Nyugodtan eltávolíthatjuk az + összes SCSI, FireWire és USB + eszközmeghajtót. A + Parallels által + felkínált virtuális + hálózati csatolót az &man.ed.4; + meghajtón keresztül tudjuk elérni, + ezért az &man.ed.4; és &man.miibus.4; + meghajtókon kívül az összes + többi elhagyható. - A hálózati kapcsolat - beállítása + A hálózati kapcsolat + beállítása - Az alapvetõ hálózati - beállítás a virtuális - gépünkön a DHCP - aktiválása, aminek - segítségével csatlakozni tudunk - arra a helyi hálózatra, amelyen maga a - gazda &mac; is megtalálható. Ezt az - alábbi sor felvételével tudjuk + Az alapvetõ hálózati + beállítás a virtuális + gépünkön a DHCP + aktiválása, aminek + segítségével csatlakozni tudunk + arra a helyi hálózatra, amelyen maga a + gazda &mac; is megtalálható. Ezt az + alábbi sor felvételével tudjuk megoldani az /etc/rc.conf - állományba: - ifconfig_ed0="DHCP". Bõvebb - információkért járuljunk a + állományba: + ifconfig_ed0="DHCP". Bõvebb + információkért járuljunk a fejezethez. @@ -350,7 +353,7 @@ Fukang Chen (Loader) - Írta: + Írta: @@ -359,34 +362,34 @@ &xen;-el &linux;-on A &xen; hipervisor egy - nyílt forráskódú, - paravirtualizációt nyújtó - termék, amely mögött mostanra már a - XenSource kereskedelmi cég áll. Itt a - vendég operációs rendszereket a domU - tartományként azonosítják, - míg a gazda operációs rendszer a dom0. A - &os; &linux; alatti virtuális futattásához - elsõként telepítenünk kell a - &xen;-t egy dom0-ás - &linux;-ra. A leírásban a gazda - operációs rendszer a Slackware &linux; - disztribúció lesz. + nyílt forráskódú, + paravirtualizációt nyújtó + termék, amely mögött mostanra már a + XenSource kereskedelmi cég áll. Itt a + vendég operációs rendszereket a domU + tartományként azonosítják, + míg a gazda operációs rendszer a dom0. A + &os; &linux; alatti virtuális futattásához + elsõként telepítenünk kell a + &xen;-t egy dom0-ás + &linux;-ra. A leírásban a gazda + operációs rendszer a Slackware &linux; + disztribúció lesz. - A &xen; 3 beállítása egy &linux; - dom0-án + A &xen; 3 beállítása egy &linux; + dom0-án - Töltsük le a &xen; 3.0-át a - XenSource-tól + Töltsük le a &xen; 3.0-át a + XenSource-tól - Töltsük le a Töltsük le a xen-3.0.4_1-src.tgz - állományt a XenSource - oldaláról. + oldaláról. @@ -398,29 +401,29 @@ &prompt.root; make install - A rendszermagot így tudjuk dom0 módban - újrafordítani: + A rendszermagot így tudjuk dom0 módban + újrafordítani: &prompt.root; cd xen-3.0.4_1-src/linux-2.6.16.33-xen0 &prompt.root; make menuconfig &prompt.root; make &prompt.root; make install - A &xen; régebbi - verzióinál elképzelhetõ, hogy - így kell megadni: + A &xen; régebbi + verzióinál elképzelhetõ, hogy + így kell megadni: make ARCH=xen menuconfig - Vegyük fel a megfelelõ pontot a GRUB - menüjébe + Vegyük fel a megfelelõ pontot a GRUB + menüjébe Nyissuk meg a /boot/grub/menu.lst - állományt és írjuk be a - következõ sort: + állományt és írjuk be a + következõ sort: title Xen-3.0.4 root (hd0,0) @@ -429,24 +432,24 @@ - Indítsuk újra a gépet - és aktiváljuk a &xen;-t + Indítsuk újra a gépet + és aktiváljuk a &xen;-t - Elõször nyissuk meg az + Elõször nyissuk meg az /etc/xen/xend-config.sxp - állományt, majd adjuk hozzá a - következõ sort: + állományt, majd adjuk hozzá a + következõ sort: (network-script 'network-bridge netdev=eth0') - Ezután el is indíthatjuk a + Ezután el is indíthatjuk a &xen;-t: &prompt.root; /etc/init.d/xend start &prompt.root; /etc/init.d/xendomains start - Láthatjuk, hogy a dom0 tartomány most - már aktív: + Láthatjuk, hogy a dom0 tartomány most + már aktív: &prompt.root; xm list Name ID Mem VCPUs State Time(s) @@ -458,12 +461,12 @@ A &os; 7-CURRENT mint domU - Töltsük le a &os; &xen; - 3.0-ás domU rendszermagját - és a hozzátartozó lemezképet a + Töltsük le a &os; &xen; + 3.0-ás domU rendszermagját + és a hozzátartozó lemezképet a http://www.fsmware.com/ - címrõl: + címrõl: @@ -479,13 +482,13 @@ - Tegyük a xmexample1.bsd - konfigurációs állományt a - /etc/xen/ könyvtárba és - írjuk át a releváns bejegyzéseket a - rendszermag és a lemezkép elérési - útjának megfelelõen. Valahogy így - kellene kinézni az eredménynek: + Tegyük a xmexample1.bsd + konfigurációs állományt a + /etc/xen/ könyvtárba és + írjuk át a releváns bejegyzéseket a + rendszermag és a lemezkép elérési + útjának megfelelõen. Valahogy így + kellene kinézni az eredménynek: kernel = "/opt/kernel-current" memory = 256 @@ -499,15 +502,15 @@ extra += ",vfs.root.mountfrom=ufs:/dev/xbd769a" Az mdroot-7.0.bz2 - állományt ki kell - tömöríteni! + állományt ki kell + tömöríteni! - Ezután a kernel-current - állományban található __xen_guest - részt át kell írni úgy, hogy - hozzáadjuk a &xen; 3.0.3 - számára fontos VIRT_BASE - értéket: + Ezután a kernel-current + állományban található __xen_guest + részt át kell írni úgy, hogy + hozzáadjuk a &xen; 3.0.3 + számára fontos VIRT_BASE + értéket: &prompt.root; objcopy kernel-current -R __xen_guest &prompt.root; perl -e 'print "LOADER=generic,GUEST_OS=freebsd,GUEST_VER=7.0,XEN_VER=xen-3.0,BSD_SYMTAB,VIRT_BASE=0xC0000000\x00"' > tmp @@ -525,9 +528,9 @@ 0040 445f5359 4d544142 2c564952 545f4241 D_SYMTAB,VIRT_BA 0050 53453d30 78433030 30303030 3000 SE=0xC0000000. - Most már készen állunk a domU - létrehozására és - beindítására: + Most már készen állunk a domU + létrehozására és + beindítására: &prompt.root; xm create /etc/xen/xmexample1.bsd -c Using config file "/etc/xen/xmexample1.bsd". @@ -597,11 +600,11 @@ FreeBSD demo.freebsd.org 7.0-CURRENT FreeBSD 7.0-CURRENT #113: Wed Jan 4 06:25:43 UTC 2006 kmacy@freebsd7.gateway.2wire.net:/usr/home/kmacy/p4/freebsd7_xen3/src/sys/i386-xen/compile/XENCONF i386 - Miután errõl megbizonyosodtunk, be tudjuk - állítani a hálózatot is domU-ban. A - domU &os; egy xn0 nevû - speciális eszközt használ erre a - célra: + Miután errõl megbizonyosodtunk, be tudjuk + állítani a hálózatot is domU-ban. A + domU &os; egy xn0 nevû + speciális eszközt használ erre a + célra: &prompt.root; ifconfig xn0 10.10.10.200 netmask 255.0.0.0 &prompt.root; ifconfig @@ -613,9 +616,9 @@ inet6 fe80::1%lo0 prefixlen 64 scopeid 0x2 inet 127.0.0.1 netmask 0xff000000 - Eközben a dom0 Slackware-en néhány - &xen;-függõ - hálózati csatolónak is meg kell + Eközben a dom0 Slackware-en néhány + &xen;-függõ + hálózati csatolónak is meg kell jelennie: &prompt.root; ifconfig @@ -673,11 +676,227 @@ + + Virtual PC-vel &windows;-on + + A &windows;-ra fejlesztett Virtual + PC a µsoft; egyik szabadon letölthetõ + szoftverterméke. A rendszerkövetelményeit bõvebben ld. a + + linken. Miután telepítettük a µsoft.windows;-ra a Virtual + PC alkalmazást, be kell állítanunk egy virtuális gépet, majd + telepítenünk rá a kívánt vendég operációs rendszert. + + + A &os; telepítése Virtual PC/µsoft.windows;-ra + + A &os; µsoft.windows; és Virtual + PC párosra történõ telepítésének elsõ lépése + egy új virtuális gép létrehozása. Ehhez válasszuk ki a + menübõl a Create a virtual machine + (Virtuális gép létrehozása) pontot: + + + + + + + + + + + + + + Majd válasszuk az Operating system + (Operációs rendszer) beállításánál az + Other (Egyéb) opciót: + + + + + + + + Ezután válasszuk ki a szándékainknak megfelelõen a telepítendõ + &os; példányhoz mért memória és lemezterület mennyiségét. + A &os; Virtual PC alatt történõ + futtatásához 4 GB-nyi lemezterület és 512 MB RAM + beállítása a legtöbb esetben kiválóan megfelelõ: + + + + + + + + + + + + + + Mentsük el és fejezzük be a konfigurációt: + + + + + + + + Válasszuk ki a &os;-s virtuális gépünket, majd + kattintsunk a Settings (Beállítások) + menüre és állítsuk be hálózati csatoló és hálózatkezelés + típusát: + + + + + + + + + + + + + + A &os;-nek otthont adó virtuális gépünk létrehozása + után telepítenünk is kell rá a rendszert. Ez + legegyszerûbben a hivatalos &os; telepítõ CD-vel vagy a + hivatalos FTP oldalról letölthetõ CD-képpel tehetjük meg. + Amikor letöltöttük a megfelelõ CD-képet a helyi &windows;-os + állományrendszerünkre vagy behelyeztük a telepítéshez + használható CD-t a CD-meghajtónkba, a &os;-s virtuális + gépünk elindításához kattintsunk rá duplán. Ezt követõen + a Virtual PC ablakában + kattintsunk a CD menüre és válasszuk ki + belõle a Capture ISO Image... (Lemezkép + használata...) pontot. Ennek hatására megjelenik egy + ablak, amiben a virtuális gépünk CD-meghajtóihoz tudunk + csatlakoztatni lemezképeket vagy akár létezõ + CD-meghajtókat. + + + + + + + + + + + + + + Miután sikeresen beállítottuk a telepítõ CD forrását, + indítsuk újra a virtuális gépet az + Action (Mûvelet) menün belül a + Reset (Újraindítás) pont + kiválasztásával. Így a Virtual + PC újraindítja a virtuális rendszert egy + olyan speciális BIOS használatával, amely a normális + BIOS-hoz hasonlóan elõször megkeresi az elérhetõ + CD-meghajtókat. + + + + + + + + Ebben az esetben a &os; telepítõeszközét fogja + megtalálni és megkezdi a ben + ismertetett szokásos, sysinstallra + alapuló telepítési eljárást. Ennek során az X11-et is + feltelepíthetjük, habár egyelõre még ne állítsuk be. + + + + + + + + Ne felejtsük el kivenni a meghajtóból a telepítéshez + használt CD-t vagy elengedni a megfelelõ lemezképet, amikor + befejezõdõtt a telepítés. Végezetül indítsuk ismét újra a + frissen telepített &os;-s virtuális gépünket. + + + + + + + + + + A &os; beállítása a µsoft.windows;/Virtual PC-n + + Miután a &os;-t minden gond nélkül telepítettük a + µsoft.windows;-on futó Virtual + PC-re, még további beállítási lépéseket is + meg kell tennünk a rendszer virtualizált mûködésének + finomhangolásához. + + + + A rendszertöltõ változóinak beállítása + + A legfontosabb teendõnk csökkenteni a + konfigurációs beállítás + értéket, aminek köszönhetõen vissza tudjuk fogni a + Virtual PC alatt futó &os; + processzorhasználatát. Ezt úgy tudjuk megtenni, ha a + /boot/loader.conf állományba + felvesszük a következõ sort: + + kern.hz=100 + + Enélkül a Virtual PC + alatt üresjáratban futó &os; vendég operációs rendszer + egy egyprocesszoros számítógép idejének durván 40%-át + foglalja le. A változtatás után azonban ez az érték + pusztán közel 3%-ra csökken le. + + + + Új konfigurációs állomány létrehozása a + rendszermaghoz + + Nyugodtan eltávolíthatjuk a SCSI, FireWire és USB + eszközmeghajtókat. A Virtual + PC által felajánlott virtuális hálózati + csatolót a &man.de.4; meghajtón keresztül tudjuk + használni, ezért a &man.de.4; és &man.miibus.4; + eszközön kívül az összes többi hálózati eszköz + támogatása kiszedhetõ a rendszermagból. + + + + A hálózati kapcsolat beállítása + + A legalapvetõbb hálózati beállítás csupán annyiból + áll, hogy DHCP-n keresztül csatlakoztatjuk a virtuális + gépünket ugyanahhoz a helyi hálózathoz, amiben a gazda + µsoft.windows;-os gépünk is megtalálható. Ezt úgy + tudjuk elérni, ha a /etc/rc.conf + állományba megadjuk a + ifconfig_de0="DHCP" sort. A komolyabb + hálózati beállításokat a ben találhatjuk. + + + + + + + VMware-rel &windows;/&mac;/&linux;-on - Ez a rész még nincs - elkészítve. + Ez a rész még nincs + elkészítve. @@ -687,14 +906,14 @@ A &os; mint gazda Jelenleg a &os;-t hivatalosan egyik - virtualizációs programcsomag sem támogatja - gazda operációs rendszerként, de sokan - használják a VMware - régebbi verzióit ilyen megfontolásból. - Ezenkívül folynak munkálatok abból a - célból, hogy a &xen;-t - felkészítsék a &os; történõ - futattásra. + virtualizációs programcsomag sem támogatja + gazda operációs rendszerként, de sokan + használják a VMware + régebbi verzióit ilyen megfontolásból. + Ezenkívül folynak munkálatok abból a + célból, hogy a &xen;-t + felkészítsék a &os; történõ + futattásra. From owner-p4-projects@FreeBSD.ORG Sun Nov 11 16:16:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C72516A41A; Sun, 11 Nov 2007 16:16:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA8B016A469 for ; Sun, 11 Nov 2007 16:16:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF07613C4EB for ; Sun, 11 Nov 2007 16:16:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABGGqq8044395 for ; Sun, 11 Nov 2007 16:16:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABGGq1L044392 for perforce@freebsd.org; Sun, 11 Nov 2007 16:16:52 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 11 Nov 2007 16:16:52 GMT Message-Id: <200711111616.lABGGq1L044392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 128935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 16:16:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=128935 Change 128935 by pgj@disznohal on 2007/11/11 16:15:51 Fix missed Latin2 to NCR conversions and long lines Affected files ... .. //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#5 (text+ko) ==== @@ -14,115 +14,115 @@ Murray Stokely - Írta: + Írta: - Virtualizáció + Virtualizáció - Áttekintés + Áttekintés - A virtualizációs szoftverek lehetõvé - teszik, hogy ugyanazon a számítógépen - egyszerre több operációs rendszert is + A virtualizációs szoftverek lehetõvé + teszik, hogy ugyanazon a számítógépen + egyszerre több operációs rendszert is futassunk. Ezeknek a programcsomagoknak gyakorta - részük egy gazda operációs rendszer is, - amely a virtualizációs szoftvert futattja és - ismer bizonyos vendég operációs rendszereket. + részük egy gazda operációs rendszer is, + amely a virtualizációs szoftvert futattja és + ismer bizonyos vendég operációs rendszereket. - A fejezet elolvasása során - megismerjük: + A fejezet elolvasása során + megismerjük: - A gazda- és a vendég operációs - rendszerek közti különbségeket. + A gazda- és a vendég operációs + rendszerek közti különbségeket. - Hogyan telepítsünk &os;-t egy - &intel;-alapú &apple; &macintosh; - számítógépre. + Hogyan telepítsünk &os;-t egy + &intel;-alapú &apple; &macintosh; + számítógépre. - Hogyan telepítsünk a &xen; - használatával &os;-t &linux;-ra. + Hogyan telepítsünk a &xen; + használatával &os;-t &linux;-ra. - Hogyan telepítsünk a Virtual + Hogyan telepítsünk a Virtual PC &os;-t µsoft.windows;-ra. - Hogyan hozzuk ki a legtöbbet &os; - rendszerünkbõl virtualizáció + Hogyan hozzuk ki a legtöbbet &os; + rendszerünkbõl virtualizáció alatt. - A fejezet elolvasásához ajánlott: + A fejezet elolvasásához ajánlott: - alapvetõ &unix;-os és &os;-s ismeretek (alapvetõ &unix;-os és &os;-s ismeretek (). - a &os; telepítésének ismerete (a &os; telepítésének ismerete (). - a hálózati kapcsolatok - beállításának ismerete (a hálózati kapcsolatok + beállításának ismerete (). - külsõs alkalmazások - telepítésének ismerete (külsõs alkalmazások + telepítésének ismerete (). - A &os; mint vendég + A &os; mint vendég Parallels-el &macos;-en A Parallels Desktop a &macos; - 10.4.6, vagy afeletti verzióját futattó, - &intel;-alapú &apple; &mac; személyi - számítógépekre fejlesztett - kereskedelmi alkalmazás. A &os;-t teljes - mértékben támogatja - vendégként. Miután - telepítettük a + 10.4.6, vagy afeletti verzióját futattó, + &intel;-alapú &apple; &mac; személyi + számítógépekre fejlesztett + kereskedelmi alkalmazás. A &os;-t teljes + mértékben támogatja + vendégként. Miután + telepítettük a Parallels-t a &macos; X-re, be kell - állítanunk egy virtuális gépet, majd - erre felraknunk a kívánt vendég - operációs rendszert. + állítanunk egy virtuális gépet, majd + erre felraknunk a kívánt vendég + operációs rendszert. - A &os; telepítése &macos; + <title>A &os; telepítése &macos; X/Parallels-re A &os; &macos; X/Parallels - párosra telepítéséhez elsõ - lépésként - készítenünk kell egy új - virtuális számítógépet. - A létrehozás során válasszuk a - Vendég operációs rendszer - típusá-nak a + párosra telepítéséhez elsõ + lépésként + készítenünk kell egy új + virtuális számítógépet. + A létrehozás során válasszuk a + Vendég operációs rendszer + típusá-nak a &os;-t: @@ -131,16 +131,16 @@ - Ezután adjunk meg egy nagyjából - elfogadható méretet a virtuális - merevlemezünknek, valamint annyi - memóriát, amennyire - szükségünk lehet a virtuális &os;-nk - használata során. Egy 4 GB-os lemez és - 512 MB rendszermemória a legtöbb esetben - jó választásnak bizonyulhat a &os; + Ezután adjunk meg egy nagyjából + elfogadható méretet a virtuális + merevlemezünknek, valamint annyi + memóriát, amennyire + szükségünk lehet a virtuális &os;-nk + használata során. Egy 4 GB-os lemez és + 512 MB rendszermemória a legtöbb esetben + jó választásnak bizonyulhat a &os; Parallels alatti - használata során: + használata során: @@ -166,9 +166,9 @@ - Válasszuk ki a - hálózatkezelés típusát - és a hálózati csatolót: + Válasszuk ki a + hálózatkezelés típusát + és a hálózati csatolót: @@ -182,8 +182,8 @@ - Mentsük el és fejezzük be a - konfigurálást: + Mentsük el és fejezzük be a + konfigurálást: @@ -197,25 +197,25 @@ - Miután a &os;-s virtuális - gépünk elkészült, - telepítenünk kell rá magát az - operációs rendszert is. Ezt a - legegyszerûbben a hivatalosan &os; telepítõ - CD-rõl, vagy a hivatalos FTP oldalról - letölthetõ CD-képpel tehetjük meg. Ha - lemásoltuk a megfelelõ CD-képet a &mac; - helyi állományrendszerére, vagy - behelyeztük a telepítõ CD-t a - CD-meghajtóba, kattintsunk a &os;-s + Miután a &os;-s virtuális + gépünk elkészült, + telepítenünk kell rá magát az + operációs rendszert is. Ezt a + legegyszerûbben a hivatalosan &os; telepítõ + CD-rõl, vagy a hivatalos FTP oldalról + letölthetõ CD-képpel tehetjük meg. Ha + lemásoltuk a megfelelõ CD-képet a &mac; + helyi állományrendszerére, vagy + behelyeztük a telepítõ CD-t a + CD-meghajtóba, kattintsunk a &os;-s Parallels ablakunk jobb - alsó sarkában található lemez - ikonjára. Ekkor feljön egy - párbeszédablak, ahol - összerendelhetjük a virtuális - gépünk CD-meghajtóját egy lemezen - található képpel, vagy éppen a - valódi CD-meghajtónkkal. + alsó sarkában található lemez + ikonjára. Ekkor feljön egy + párbeszédablak, ahol + összerendelhetjük a virtuális + gépünk CD-meghajtóját egy lemezen + található képpel, vagy éppen a + valódi CD-meghajtónkkal. @@ -223,11 +223,11 @@ - Ahogy megtettük az imént említett - összerendelést, indítsuk is újra a - &os;-s virtuális gépünket a megszokott - módon, az újraindítás - ikonjára kattintva. + Ahogy megtettük az imént említett + összerendelést, indítsuk is újra a + &os;-s virtuális gépünket a megszokott + módon, az újraindítás + ikonjára kattintva. @@ -235,16 +235,16 @@ - Ekkor a rendszer megtalálja a &os; - telepítõlemezt és a + Ekkor a rendszer megtalálja a &os; + telepítõlemezt és a sysinstall - segítségével megkezdi a - telepítést a - részben leírtak szerint. Ha - szükségünk van rá, - telepíthetjük az X11-et is, de egyelõre - még ne próbáljuk - beállítani. + segítségével megkezdi a + telepítést a + részben leírtak szerint. Ha + szükségünk van rá, + telepíthetjük az X11-et is, de egyelõre + még ne próbáljuk + beállítani. @@ -252,10 +252,10 @@ - A telepítés befejezését - követõen indítsuk újra a frissen - telepített &os;-s virtuális - gépünket. + A telepítés befejezését + követõen indítsuk újra a frissen + telepített &os;-s virtuális + gépünket. @@ -265,80 +265,80 @@ - A &os; beállítása &macos; + <title>A &os; beállítása &macos; X/Parallels-en - A &os; &macos; X/Parallels-re történõ - sikeres telepítését követõen - még vár ránk néhány - konfigurációs lépés a rendszer - virtuálizált - mûködésének - optimalizálása érdekében. + A &os; &macos; X/Parallels-re történõ + sikeres telepítését követõen + még vár ránk néhány + konfigurációs lépés a rendszer + virtuálizált + mûködésének + optimalizálása érdekében. - A rendszerbetöltõ - változóinak - beállítása + A rendszerbetöltõ + változóinak + beállítása - A legfontosabb lépés a - változó - értékének csökkentése, - amivel így a &os; - processzor-kihasználtságát is - csökkentjük a + A legfontosabb lépés a + változó + értékének csökkentése, + amivel így a &os; + processzor-kihasználtságát is + csökkentjük a Parallels alatt. Ezt a - következõ sor hozzadásával - tehetjük meg a + következõ sor hozzadásával + tehetjük meg a /boot/loader.conf-ban: kern.hz=100 - Enélkül egy üresjáratban - levõ &os; - Parallels-vendég az - &imac; egy processzorának durván - 15%-át foglalja le. A változtatás - életbe léptetése után - azonban ez megközelítõen 5%-ra - redukálható. + Enélkül egy üresjáratban + levõ &os; + Parallels-vendég az + &imac; egy processzorának durván + 15%-át foglalja le. A változtatás + életbe léptetése után + azonban ez megközelítõen 5%-ra + redukálható. - Egy új konfigurációs - állomány létrehozása a + <title>Egy új konfigurációs + állomány létrehozása a rendszermaghoz - Nyugodtan eltávolíthatjuk az - összes SCSI, FireWire és USB - eszközmeghajtót. A - Parallels által - felkínált virtuális - hálózati csatolót az &man.ed.4; - meghajtón keresztül tudjuk elérni, - ezért az &man.ed.4; és &man.miibus.4; - meghajtókon kívül az összes - többi elhagyható. + Nyugodtan eltávolíthatjuk az + összes SCSI, FireWire és USB + eszközmeghajtót. A + Parallels által + felkínált virtuális + hálózati csatolót az &man.ed.4; + meghajtón keresztül tudjuk elérni, + ezért az &man.ed.4; és &man.miibus.4; + meghajtókon kívül az összes + többi elhagyható. - A hálózati kapcsolat - beállítása + A hálózati kapcsolat + beállítása - Az alapvetõ hálózati - beállítás a virtuális - gépünkön a DHCP - aktiválása, aminek - segítségével csatlakozni tudunk - arra a helyi hálózatra, amelyen maga a - gazda &mac; is megtalálható. Ezt az - alábbi sor felvételével tudjuk + Az alapvetõ hálózati + beállítás a virtuális + gépünkön a DHCP + aktiválása, aminek + segítségével csatlakozni tudunk + arra a helyi hálózatra, amelyen maga a + gazda &mac; is megtalálható. Ezt az + alábbi sor felvételével tudjuk megoldani az /etc/rc.conf - állományba: - ifconfig_ed0="DHCP". Bõvebb - információkért járuljunk a + állományba: + ifconfig_ed0="DHCP". Bõvebb + információkért járuljunk a fejezethez. @@ -353,7 +353,7 @@ Fukang Chen (Loader) - Írta: + Írta: @@ -362,34 +362,34 @@ &xen;-el &linux;-on A &xen; hipervisor egy - nyílt forráskódú, - paravirtualizációt nyújtó - termék, amely mögött mostanra már a - XenSource kereskedelmi cég áll. Itt a - vendég operációs rendszereket a domU - tartományként azonosítják, - míg a gazda operációs rendszer a dom0. A - &os; &linux; alatti virtuális futattásához - elsõként telepítenünk kell a - &xen;-t egy dom0-ás - &linux;-ra. A leírásban a gazda - operációs rendszer a Slackware &linux; - disztribúció lesz. + nyílt forráskódú, + paravirtualizációt nyújtó + termék, amely mögött mostanra már a + XenSource kereskedelmi cég áll. Itt a + vendég operációs rendszereket a domU + tartományként azonosítják, + míg a gazda operációs rendszer a dom0. A + &os; &linux; alatti virtuális futattásához + elsõként telepítenünk kell a + &xen;-t egy dom0-ás + &linux;-ra. A leírásban a gazda + operációs rendszer a Slackware &linux; + disztribúció lesz. - A &xen; 3 beállítása egy &linux; - dom0-án + A &xen; 3 beállítása egy &linux; + dom0-án - Töltsük le a &xen; 3.0-át a - XenSource-tól + Töltsük le a &xen; 3.0-át a + XenSource-tól - Töltsük le a Töltsük le a xen-3.0.4_1-src.tgz - állományt a XenSource - oldaláról. + oldaláról. @@ -401,29 +401,29 @@ &prompt.root; make install - A rendszermagot így tudjuk dom0 módban - újrafordítani: + A rendszermagot így tudjuk dom0 módban + újrafordítani: &prompt.root; cd xen-3.0.4_1-src/linux-2.6.16.33-xen0 &prompt.root; make menuconfig &prompt.root; make &prompt.root; make install - A &xen; régebbi - verzióinál elképzelhetõ, hogy - így kell megadni: + A &xen; régebbi + verzióinál elképzelhetõ, hogy + így kell megadni: make ARCH=xen menuconfig - Vegyük fel a megfelelõ pontot a GRUB - menüjébe + Vegyük fel a megfelelõ pontot a GRUB + menüjébe Nyissuk meg a /boot/grub/menu.lst - állományt és írjuk be a - következõ sort: + állományt és írjuk be a + következõ sort: title Xen-3.0.4 root (hd0,0) @@ -432,24 +432,24 @@ - Indítsuk újra a gépet - és aktiváljuk a &xen;-t + Indítsuk újra a gépet + és aktiváljuk a &xen;-t - Elõször nyissuk meg az + Elõször nyissuk meg az /etc/xen/xend-config.sxp - állományt, majd adjuk hozzá a - következõ sort: + állományt, majd adjuk hozzá a + következõ sort: (network-script 'network-bridge netdev=eth0') - Ezután el is indíthatjuk a + Ezután el is indíthatjuk a &xen;-t: &prompt.root; /etc/init.d/xend start &prompt.root; /etc/init.d/xendomains start - Láthatjuk, hogy a dom0 tartomány most - már aktív: + Láthatjuk, hogy a dom0 tartomány most + már aktív: &prompt.root; xm list Name ID Mem VCPUs State Time(s) @@ -461,12 +461,12 @@ A &os; 7-CURRENT mint domU - Töltsük le a &os; &xen; - 3.0-ás domU rendszermagját - és a hozzátartozó lemezképet a + Töltsük le a &os; &xen; + 3.0-ás domU rendszermagját + és a hozzátartozó lemezképet a http://www.fsmware.com/ - címrõl: + címrõl: @@ -482,13 +482,13 @@ - Tegyük a xmexample1.bsd - konfigurációs állományt a - /etc/xen/ könyvtárba és - írjuk át a releváns bejegyzéseket a - rendszermag és a lemezkép elérési - útjának megfelelõen. Valahogy így - kellene kinézni az eredménynek: + Tegyük a xmexample1.bsd + konfigurációs állományt a + /etc/xen/ könyvtárba és + írjuk át a releváns bejegyzéseket a + rendszermag és a lemezkép elérési + útjának megfelelõen. Valahogy így + kellene kinézni az eredménynek: kernel = "/opt/kernel-current" memory = 256 @@ -502,15 +502,15 @@ extra += ",vfs.root.mountfrom=ufs:/dev/xbd769a" Az mdroot-7.0.bz2 - állományt ki kell - tömöríteni! + állományt ki kell + tömöríteni! - Ezután a kernel-current - állományban található __xen_guest - részt át kell írni úgy, hogy - hozzáadjuk a &xen; 3.0.3 - számára fontos VIRT_BASE - értéket: + Ezután a kernel-current + állományban található __xen_guest + részt át kell írni úgy, hogy + hozzáadjuk a &xen; 3.0.3 + számára fontos VIRT_BASE + értéket: &prompt.root; objcopy kernel-current -R __xen_guest &prompt.root; perl -e 'print "LOADER=generic,GUEST_OS=freebsd,GUEST_VER=7.0,XEN_VER=xen-3.0,BSD_SYMTAB,VIRT_BASE=0xC0000000\x00"' > tmp @@ -528,9 +528,9 @@ 0040 445f5359 4d544142 2c564952 545f4241 D_SYMTAB,VIRT_BA 0050 53453d30 78433030 30303030 3000 SE=0xC0000000. - Most már készen állunk a domU - létrehozására és - beindítására: + Most már készen állunk a domU + létrehozására és + beindítására: &prompt.root; xm create /etc/xen/xmexample1.bsd -c Using config file "/etc/xen/xmexample1.bsd". @@ -600,11 +600,11 @@ FreeBSD demo.freebsd.org 7.0-CURRENT FreeBSD 7.0-CURRENT #113: Wed Jan 4 06:25:43 UTC 2006 kmacy@freebsd7.gateway.2wire.net:/usr/home/kmacy/p4/freebsd7_xen3/src/sys/i386-xen/compile/XENCONF i386 - Miután errõl megbizonyosodtunk, be tudjuk - állítani a hálózatot is domU-ban. A - domU &os; egy xn0 nevû - speciális eszközt használ erre a - célra: + Miután errõl megbizonyosodtunk, be tudjuk + állítani a hálózatot is domU-ban. A + domU &os; egy xn0 nevû + speciális eszközt használ erre a + célra: &prompt.root; ifconfig xn0 10.10.10.200 netmask 255.0.0.0 &prompt.root; ifconfig @@ -616,9 +616,9 @@ inet6 fe80::1%lo0 prefixlen 64 scopeid 0x2 inet 127.0.0.1 netmask 0xff000000 - Eközben a dom0 Slackware-en néhány - &xen;-függõ - hálózati csatolónak is meg kell + Eközben a dom0 Slackware-en néhány + &xen;-függõ + hálózati csatolónak is meg kell jelennie: &prompt.root; ifconfig @@ -680,38 +680,48 @@ Virtual PC-vel &windows;-on A &windows;-ra fejlesztett Virtual - PC a µsoft; egyik szabadon letölthetõ - szoftverterméke. A rendszerkövetelményeit bõvebben ld. a - a µsoft; egyik szabadon + letölthetõ szoftverterméke. A + rendszerkövetelményeit bõvebben ld. a - linken. Miután telepítettük a µsoft.windows;-ra a Virtual - PC alkalmazást, be kell állítanunk egy virtuális gépet, majd - telepítenünk rá a kívánt vendég operációs rendszert. + linken. Miután telepítettük a + µsoft.windows;-ra a Virtual PC + alkalmazást, be kell állítanunk egy + virtuális gépet, majd telepítenünk + rá a kívánt vendég + operációs rendszert. - A &os; telepítése Virtual PC/µsoft.windows;-ra + A &os; telepítése Virtual + PC/µsoft.windows;-ra - A &os; µsoft.windows; és Virtual - PC párosra történõ telepítésének elsõ lépése - egy új virtuális gép létrehozása. Ehhez válasszuk ki a - menübõl a Create a virtual machine - (Virtuális gép létrehozása) pontot: + A &os; µsoft.windows; és + Virtual PC párosra + történõ telepítésének + elsõ lépése egy új + virtuális gép létrehozása. + Ehhez válasszuk ki a menübõl a + Create a virtual machine + (Virtuális gép létrehozása) + pontot: - + - - + + - + - - + + - Majd válasszuk az Operating system - (Operációs rendszer) beállításánál az - Other (Egyéb) opciót: + Majd válasszuk az Operating + system (Operációs rendszer) + beállításánál az + Other (Egyéb) + opciót: @@ -719,11 +729,16 @@ - Ezután válasszuk ki a szándékainknak megfelelõen a telepítendõ - &os; példányhoz mért memória és lemezterület mennyiségét. - A &os; Virtual PC alatt történõ - futtatásához 4 GB-nyi lemezterület és 512 MB RAM - beállítása a legtöbb esetben kiválóan megfelelõ: + Ezután válasszuk ki a + szándékainknak megfelelõen a + telepítendõ &os; példányhoz + mért memória és lemezterület + mennyiségét. A &os; Virtual + PC alatt történõ + futtatásához 4 GB-nyi lemezterület + és 512 MB RAM beállítása a + legtöbb esetben kiválóan + megfelelõ: @@ -737,7 +752,8 @@ - Mentsük el és fejezzük be a konfigurációt: + Mentsük el és fejezzük be a + konfigurációt: @@ -745,10 +761,13 @@ - Válasszuk ki a &os;-s virtuális gépünket, majd - kattintsunk a Settings (Beállítások) - menüre és állítsuk be hálózati csatoló és hálózatkezelés - típusát: + Válasszuk ki a &os;-s virtuális + gépünket, majd kattintsunk a + Settings + (Beállítások) menüre és + állítsuk be hálózati + csatoló és hálózatkezelés + típusát: @@ -762,21 +781,29 @@ - A &os;-nek otthont adó virtuális gépünk létrehozása - után telepítenünk is kell rá a rendszert. Ez - legegyszerûbben a hivatalos &os; telepítõ CD-vel vagy a - hivatalos FTP oldalról letölthetõ CD-képpel tehetjük meg. - Amikor letöltöttük a megfelelõ CD-képet a helyi &windows;-os - állományrendszerünkre vagy behelyeztük a telepítéshez - használható CD-t a CD-meghajtónkba, a &os;-s virtuális - gépünk elindításához kattintsunk rá duplán. Ezt követõen - a Virtual PC ablakában - kattintsunk a CD menüre és válasszuk ki - belõle a Capture ISO Image... (Lemezkép - használata...) pontot. Ennek hatására megjelenik egy - ablak, amiben a virtuális gépünk CD-meghajtóihoz tudunk - csatlakoztatni lemezképeket vagy akár létezõ - CD-meghajtókat. + A &os;-nek otthont adó virtuális + gépünk létrehozása után + telepítenünk is kell rá a rendszert. Ez + legegyszerûbben a hivatalos &os; telepítõ + CD-vel vagy a hivatalos FTP oldalról + letölthetõ CD-képpel tehetjük meg. + Amikor letöltöttük a megfelelõ + CD-képet a helyi &windows;-os + állományrendszerünkre vagy + behelyeztük a telepítéshez + használható CD-t a CD-meghajtónkba, a + &os;-s virtuális gépünk + elindításához kattintsunk rá + duplán. Ezt követõen a + Virtual PC ablakában + kattintsunk a CD menüre és + válasszuk ki belõle a Capture ISO + Image... (Lemezkép használata...) + pontot. Ennek hatására megjelenik egy ablak, + amiben a virtuális gépünk + CD-meghajtóihoz tudunk csatlakoztatni + lemezképeket vagy akár létezõ + CD-meghajtókat. @@ -790,15 +817,19 @@ - Miután sikeresen beállítottuk a telepítõ CD forrását, - indítsuk újra a virtuális gépet az - Action (Mûvelet) menün belül a - Reset (Újraindítás) pont - kiválasztásával. Így a Virtual - PC újraindítja a virtuális rendszert egy - olyan speciális BIOS használatával, amely a normális - BIOS-hoz hasonlóan elõször megkeresi az elérhetõ - CD-meghajtókat. + Miután sikeresen beállítottuk a + telepítõ CD forrását, + indítsuk újra a virtuális gépet + az Action (Mûvelet) menün + belül a Reset + (Újraindítás) pont + kiválasztásával. Így a + Virtual PC + újraindítja a virtuális rendszert egy + olyan speciális BIOS használatával, + amely a normális BIOS-hoz hasonlóan + elõször megkeresi az elérhetõ + CD-meghajtókat. @@ -806,11 +837,15 @@ - Ebben az esetben a &os; telepítõeszközét fogja - megtalálni és megkezdi a ben - ismertetett szokásos, sysinstallra - alapuló telepítési eljárást. Ennek során az X11-et is - feltelepíthetjük, habár egyelõre még ne állítsuk be. + Ebben az esetben a &os; + telepítõeszközét fogja + megtalálni és megkezdi a ben ismertetett szokásos, + sysinstallra alapuló + telepítési eljárást. Ennek + során az X11-et is feltelepíthetjük, + habár egyelõre még ne + állítsuk be. @@ -818,10 +853,13 @@ - Ne felejtsük el kivenni a meghajtóból a telepítéshez - használt CD-t vagy elengedni a megfelelõ lemezképet, amikor - befejezõdõtt a telepítés. Végezetül indítsuk ismét újra a - frissen telepített &os;-s virtuális gépünket. + Ne felejtsük el kivenni a meghajtóból + a telepítéshez használt CD-t vagy + elengedni a megfelelõ lemezképet, amikor + befejezõdõtt a telepítés. + Végezetül indítsuk ismét + újra a frissen telepített &os;-s + virtuális gépünket. @@ -831,62 +869,84 @@ - A &os; beállítása a µsoft.windows;/Virtual PC-n + A &os; beállítása a + µsoft.windows;/Virtual PC-n - Miután a &os;-t minden gond nélkül telepítettük a - µsoft.windows;-on futó Virtual - PC-re, még további beállítási lépéseket is - meg kell tennünk a rendszer virtualizált mûködésének - finomhangolásához. + Miután a &os;-t minden gond nélkül + telepítettük a µsoft.windows;-on futó + Virtual PC-re, még + további beállítási + lépéseket is meg kell tennünk a rendszer + virtualizált mûködésének + finomhangolásához. - + - A rendszertöltõ változóinak beállítása + A rendszertöltõ változóinak + beállítása - A legfontosabb teendõnk csökkenteni a - konfigurációs beállítás - értéket, aminek köszönhetõen vissza tudjuk fogni a - Virtual PC alatt futó &os; - processzorhasználatát. Ezt úgy tudjuk megtenni, ha a - /boot/loader.conf állományba - felvesszük a következõ sort: + A legfontosabb teendõnk csökkenteni a + konfigurációs + beállítás értéket, + aminek köszönhetõen vissza tudjuk fogni a + Virtual PC alatt futó + &os; processzorhasználatát. Ezt + úgy tudjuk megtenni, ha a + /boot/loader.conf + állományba felvesszük a + következõ sort: kern.hz=100 - Enélkül a Virtual PC - alatt üresjáratban futó &os; vendég operációs rendszer - egy egyprocesszoros számítógép idejének durván 40%-át - foglalja le. A változtatás után azonban ez az érték - pusztán közel 3%-ra csökken le. + Enélkül a Virtual + PC alatt üresjáratban + futó &os; vendég operációs + rendszer egy egyprocesszoros + számítógép idejének + durván 40%-át foglalja le. A + változtatás után azonban ez az + érték pusztán közel 3%-ra + csökken le. - Új konfigurációs állomány létrehozása a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 19:34:27 2007 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9194716A418; Sun, 11 Nov 2007 19:34:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06F8516A421 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 19:34:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E230C13C48D for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 19:34:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABJYQC8068383 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 19:34:26 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABJYQl5068380 for perforce@freebsd.org; Sun, 11 Nov 2007 19:34:26 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 11 Nov 2007 19:34:26 GMT Message-Id: <200711111934.lABJYQl5068380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 128940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 11 Nov 2007 19:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=128940 Change 128940 by gonzo@gonzo_jeeves on 2007/11/11 19:33:55 o Use all four windows (two memory, two IO) for resource allocation, otherwise korina BARs content exhaust IO window and vr devices fail to allocate resources. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/idt/idtpci.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/idt/idtpci.c#5 (text+ko) ==== @@ -122,8 +122,8 @@ device_t sc_dev; int sc_busno; - struct rman sc_mem_rman; - struct rman sc_io_rman; + struct rman sc_mem_rman[2]; + struct rman sc_io_rman[2]; struct rman sc_irq_rman; uint32_t sc_mem; uint32_t sc_io; @@ -241,20 +241,36 @@ /* Use KSEG1 to access IO ports for it is uncached */ sc->sc_io = 0; - sc->sc_io_rman.rm_type = RMAN_ARRAY; - sc->sc_io_rman.rm_descr = "IDTPCI I/O Ports"; - if (rman_init(&sc->sc_io_rman) != 0 || - rman_manage_region(&sc->sc_io_rman, + sc->sc_io_rman[0].rm_type = RMAN_ARRAY; + sc->sc_io_rman[0].rm_descr = "IDTPCI I/O Ports window 1"; + if (rman_init(&sc->sc_io_rman[0]) != 0 || + rman_manage_region(&sc->sc_io_rman[0], + IDT_PCIMEM2_BASE, IDT_PCIMEM2_BASE + IDT_PCIMEM2_SIZE - 1) != 0) { + panic("idtpci_attach: failed to set up I/O rman"); + } + + sc->sc_io_rman[1].rm_type = RMAN_ARRAY; + sc->sc_io_rman[1].rm_descr = "IDTPCI I/O Ports window 2"; + if (rman_init(&sc->sc_io_rman[1]) != 0 || + rman_manage_region(&sc->sc_io_rman[1], IDT_PCIMEM3_BASE, IDT_PCIMEM3_BASE + IDT_PCIMEM3_SIZE - 1) != 0) { panic("idtpci_attach: failed to set up I/O rman"); } /* Use KSEG1 to access PCI memory for it is uncached */ sc->sc_mem = 0; - sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "IDTPCI PCI Memory"; - if (rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_mem_rman, + sc->sc_mem_rman[0].rm_type = RMAN_ARRAY; + sc->sc_mem_rman[0].rm_descr = "IDTPCI PCI Memory window 1"; + if (rman_init(&sc->sc_mem_rman[0]) != 0 || + rman_manage_region(&sc->sc_mem_rman[0], + IDT_PCIMEM0_BASE, IDT_PCIMEM0_BASE + IDT_PCIMEM0_SIZE) != 0) { + panic("idtpci_attach: failed to set up memory rman"); + } + + sc->sc_mem_rman[1].rm_type = RMAN_ARRAY; + sc->sc_mem_rman[1].rm_descr = "IDTPCI PCI Memory window 2"; + if (rman_init(&sc->sc_mem_rman[1]) != 0 || + rman_manage_region(&sc->sc_mem_rman[1], IDT_PCIMEM1_BASE, IDT_PCIMEM1_BASE + IDT_PCIMEM1_SIZE) != 0) { panic("idtpci_attach: failed to set up memory rman"); } @@ -458,25 +474,34 @@ struct idtpci_softc *sc = device_get_softc(bus); struct resource *rv = NULL; - struct rman *rm; + struct rman *rm1, *rm2; bus_space_handle_t bh = 0; void *vaddr; + switch (type) { case SYS_RES_IRQ: - rm = &sc->sc_irq_rman; + rm1 = &sc->sc_irq_rman; + rm2 = NULL; break; case SYS_RES_MEMORY: - rm = &sc->sc_mem_rman; + rm1 = &sc->sc_mem_rman[0]; + rm2 = &sc->sc_mem_rman[1]; break; case SYS_RES_IOPORT: - rm = &sc->sc_io_rman; + rm1 = &sc->sc_io_rman[0]; + rm2 = &sc->sc_io_rman[1]; break; default: return (NULL); } - rv = rman_reserve_resource(rm, start, end, count, flags, child); + rv = rman_reserve_resource(rm1, start, end, count, flags, child); + + /* Try second window if it exists */ + if ((rv == NULL) && (rm2 != NULL)) + rv = rman_reserve_resource(rm2, start, end, count, flags, + child); if (rv == NULL) return (NULL); From owner-p4-projects@FreeBSD.ORG Sun Nov 11 19:37:31 2007 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A83416A469; Sun, 11 Nov 2007 19:37:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF5DE16A41B for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 19:37:30 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B29A913C49D for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 19:37:30 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABJbUwO068539 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 19:37:30 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABJbURI068536 for perforce@freebsd.org; Sun, 11 Nov 2007 19:37:30 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 11 Nov 2007 19:37:30 GMT Message-Id: <200711111937.lABJbURI068536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 128941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 11 Nov 2007 19:37:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=128941 Change 128941 by gonzo@gonzo_jeeves on 2007/11/11 19:37:03 o Merge yongari's version of if_vr with newbus stuff. o During reset wait while reset bit is cleared instead of DELAY(200); Affected files ... .. //depot/projects/mips2/src/sys/pci/if_vr.c#7 edit .. //depot/projects/mips2/src/sys/pci/if_vrreg.h#6 edit Differences ... ==== //depot/projects/mips2/src/sys/pci/if_vr.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.127 2007/10/12 03:32:55 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.126 2007/04/23 12:19:02 phk Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -65,6 +65,7 @@ #endif #include <sys/param.h> +#include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> @@ -72,22 +73,24 @@ #include <sys/kernel.h> #include <sys/module.h> #include <sys/socket.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> #include <net/if.h> #include <net/ethernet.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> +#include <net/if_vlan_var.h> #include <net/bpf.h> -#include <vm/vm.h> /* for vtophys */ -#include <vm/pmap.h> /* for vtophys */ #include <machine/bus.h> #include <machine/resource.h> #include <sys/bus.h> #include <sys/rman.h> +#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> @@ -95,7 +98,11 @@ #define VR_USEIOSPACE +#if 0 #include <pci/if_vrreg.h> +#else +#include "if_vrreg.h" +#endif MODULE_DEPEND(vr, pci, 1, 1, 1); MODULE_DEPEND(vr, ether, 1, 1, 1); @@ -104,12 +111,18 @@ /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" +/* Show Rx/Tx error status */ +#define VR_SHOW_ERRORS + +#define VR_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) + /* * Various supported device vendors/types, their names & quirks */ #define VR_Q_NEEDALIGN (1<<0) #define VR_Q_CSUM (1<<1) +#define VR_Q_CAM (1<<2) static struct vr_type { u_int16_t vr_vid; @@ -130,7 +143,7 @@ 0, "VIA VT6105 Rhine III 10/100BaseTX" }, { VIA_VENDORID, VIA_DEVICEID_RHINE_III_M, - VR_Q_CSUM, + VR_Q_CSUM | VR_Q_CAM, "VIA VT6105M Rhine III 10/100BaseTX" }, { DELTA_VENDORID, DELTA_DEVICEID_RHINE_II, VR_Q_NEEDALIGN, @@ -141,81 +154,86 @@ { 0, 0, 0, NULL } }; -struct vr_list_data { - struct vr_desc vr_rx_list[VR_RX_LIST_CNT]; - struct vr_desc vr_tx_list[VR_TX_LIST_CNT]; -}; - -struct vr_softc { - struct ifnet *vr_ifp; /* interface info */ - device_t vr_dev; - struct resource *vr_res; - struct resource *vr_irq; - void *vr_intrhand; - device_t vr_miibus; - u_int8_t vr_revid; /* Rhine chip revision */ - u_int8_t vr_flags; /* See VR_F_* below */ - struct vr_list_data *vr_ldata; - struct callout vr_stat_callout; - struct mtx vr_mtx; - int vr_suspended; /* if 1, sleeping/detaching */ - int vr_quirks; - struct vr_desc *vr_rx_head; - struct vr_desc *vr_tx_cons; - struct vr_desc *vr_tx_prod; -#ifdef DEVICE_POLLING - int rxcycles; -#endif -}; - static int vr_probe(device_t); static int vr_attach(device_t); static int vr_detach(device_t); +static void vr_shutdown(device_t); +static int vr_suspend(device_t); +static int vr_resume(device_t); -static int vr_newbuf(struct vr_desc *, struct mbuf *); +static void vr_dmamap_cb(void *, bus_dma_segment_t *, int, int); +static int vr_dma_alloc(struct vr_softc *); +static void vr_dma_free(struct vr_softc *); +static __inline void vr_discard_rxbuf(struct vr_rxdesc *); +static int vr_newbuf(struct vr_softc *, int); +#ifndef __NO_STRICT_ALIGNMENT +static __inline void vr_fixup_rx(struct mbuf *); +#endif static void vr_rxeof(struct vr_softc *); -static void vr_rxeoc(struct vr_softc *); static void vr_txeof(struct vr_softc *); static void vr_tick(void *); +static int vr_error(struct vr_softc *, uint16_t); +static void vr_tx_underrun(struct vr_softc *); static void vr_intr(void *); static void vr_start(struct ifnet *); static void vr_start_locked(struct ifnet *); +static struct mbuf *vr_defrag(struct mbuf *, int, int); +static int vr_encap(struct vr_softc *, struct mbuf **); static int vr_ioctl(struct ifnet *, u_long, caddr_t); static void vr_init(void *); static void vr_init_locked(struct vr_softc *); +static void vr_vlan_setup(struct vr_softc *); +static void vr_tx_start(struct vr_softc *); +static void vr_rx_start(struct vr_softc *); +static int vr_tx_stop(struct vr_softc *); +static int vr_rx_stop(struct vr_softc *); static void vr_stop(struct vr_softc *); -static void vr_watchdog(struct ifnet *); -static void vr_shutdown(device_t); +static void vr_watchdog(struct vr_softc *); static int vr_ifmedia_upd(struct ifnet *); static void vr_ifmedia_sts(struct ifnet *, struct ifmediareq *); -static int vr_mii_readreg(const struct vr_softc *, struct vr_mii_frame *); -static int vr_mii_writereg(const struct vr_softc *, const struct vr_mii_frame *); -static int vr_miibus_readreg(device_t, uint16_t, uint16_t); -static int vr_miibus_writereg(device_t, uint16_t, uint16_t, uint16_t); +static int vr_miibus_readreg(device_t, int, int); +static int vr_miibus_writereg(device_t, int, int, int); static void vr_miibus_statchg(device_t); -static void vr_setcfg(struct vr_softc *, int); -static void vr_setmulti(struct vr_softc *); +static void vr_link_task(void *, int); +static int vr_setperf(struct vr_softc *, int, uint8_t *); +static void vr_set_filter(struct vr_softc *); static void vr_reset(const struct vr_softc *); -static int vr_list_rx_init(struct vr_softc *); -static int vr_list_tx_init(struct vr_softc *); +static int vr_tx_ring_init(struct vr_softc *); +static int vr_rx_ring_init(struct vr_softc *); +static int vr_sysctl_stats(SYSCTL_HANDLER_ARGS); #ifdef VR_USEIOSPACE #define VR_RES SYS_RES_IOPORT -#define VR_RID VR_PCI_LOIO +#define VR_RID PCIR_BAR(0) #else #define VR_RES SYS_RES_MEMORY -#define VR_RID VR_PCI_LOMEM +#define VR_RID PCIR_BAR(1) #endif +static struct vr_tx_threshold_table { + int tx_cfg; + int bcr_cfg; + int value; +} vr_tx_threshold_tables[] = { + { VR_TXTHRESH_64BYTES, VR_BCR1_TXTHRESH64BYTES, 64 }, + { VR_TXTHRESH_128BYTES, VR_BCR1_TXTHRESH128BYTES, 128 }, + { VR_TXTHRESH_256BYTES, VR_BCR1_TXTHRESH256BYTES, 256 }, + { VR_TXTHRESH_512BYTES, VR_BCR1_TXTHRESH512BYTES, 512 }, + { VR_TXTHRESH_1024BYTES, VR_BCR1_TXTHRESH1024BYTES, 1024 }, + { VR_TXTHRESH_STORENFWD, VR_BCR1_TXTHRESHSTORENFWD, 2048 } +}; + static device_method_t vr_methods[] = { /* Device interface */ DEVMETHOD(device_probe, vr_probe), DEVMETHOD(device_attach, vr_attach), DEVMETHOD(device_detach, vr_detach), DEVMETHOD(device_shutdown, vr_shutdown), + DEVMETHOD(device_suspend, vr_suspend), + DEVMETHOD(device_resume, vr_resume), /* bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), @@ -225,8 +243,9 @@ DEVMETHOD(miibus_readreg, vr_miibus_readreg), DEVMETHOD(miibus_writereg, vr_miibus_writereg), DEVMETHOD(miibus_statchg, vr_miibus_statchg), + DEVMETHOD(miibus_linkchg, vr_miibus_statchg), - { 0, 0 } + { NULL, NULL } }; static driver_t vr_driver = { @@ -239,132 +258,167 @@ DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0); DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0); -#define VR_F_RESTART 0x01 /* Restart unit on next tick */ - -#define VR_LOCK(_sc) mtx_lock(&(_sc)->vr_mtx) -#define VR_UNLOCK(_sc) mtx_unlock(&(_sc)->vr_mtx) -#define VR_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->vr_mtx, MA_OWNED) - -/* - * register space access macros - */ -#define CSR_WRITE_4(sc, reg, val) bus_write_4(sc->vr_res, reg, val) -#define CSR_WRITE_2(sc, reg, val) bus_write_2(sc->vr_res, reg, val) -#define CSR_WRITE_1(sc, reg, val) bus_write_1(sc->vr_res, reg, val) - -#define CSR_READ_2(sc, reg) bus_read_2(sc->vr_res, reg) -#define CSR_READ_1(sc, reg) bus_read_1(sc->vr_res, reg) -#define VR_SETBIT(sc, reg, x) CSR_WRITE_1(sc, reg, CSR_READ_1(sc, reg) | (x)) -#define VR_CLRBIT(sc, reg, x) CSR_WRITE_1(sc, reg, CSR_READ_1(sc, reg) & ~(x)) - -#define VR_SETBIT16(sc, reg, x) CSR_WRITE_2(sc, reg, CSR_READ_2(sc, reg) | (x)) -#define VR_CLRBIT16(sc, reg, x) CSR_WRITE_2(sc, reg, CSR_READ_2(sc, reg) & ~(x)) - - -/* - * Read an PHY register through the MII. - */ static int -vr_mii_readreg(const struct vr_softc *sc, struct vr_mii_frame *frame) +vr_miibus_readreg(device_t dev, int phy, int reg) { - int i; + struct vr_softc *sc; + int i; + + sc = device_get_softc(dev); + if (sc->vr_phyaddr != phy) + return (0); /* Set the PHY address. */ - CSR_WRITE_1(sc, VR_PHYADDR, (CSR_READ_1(sc, VR_PHYADDR)& 0xe0)| - frame->mii_phyaddr); - + CSR_WRITE_1(sc, VR_PHYADDR, phy); /* Set the register address. */ - CSR_WRITE_1(sc, VR_MIIADDR, frame->mii_regaddr); + CSR_WRITE_1(sc, VR_MIIADDR, reg); VR_SETBIT(sc, VR_MIICMD, VR_MIICMD_READ_ENB); - for (i = 0; i < 10000; i++) { + for (i = 0; i < VR_MII_TIMEOUT; i++) { + DELAY(1); if ((CSR_READ_1(sc, VR_MIICMD) & VR_MIICMD_READ_ENB) == 0) break; - DELAY(1); } - frame->mii_data = CSR_READ_2(sc, VR_MIIDATA); + if (i == VR_MII_TIMEOUT) + device_printf(sc->vr_dev, "phy read fail %d:%d\n", phy, reg); - return (0); + return (CSR_READ_2(sc, VR_MIIDATA)); } - -/* - * Write to a PHY register through the MII. - */ static int -vr_mii_writereg(const struct vr_softc *sc, const struct vr_mii_frame *frame) +vr_miibus_writereg(device_t dev, int phy, int reg, int data) { - int i; + struct vr_softc *sc; + int i; + + sc = device_get_softc(dev); + if (sc->vr_phyaddr != phy) + return (0); /* Set the PHY address. */ - CSR_WRITE_1(sc, VR_PHYADDR, (CSR_READ_1(sc, VR_PHYADDR)& 0xe0)| - frame->mii_phyaddr); - + CSR_WRITE_1(sc, VR_PHYADDR, phy); /* Set the register address and data to write. */ - CSR_WRITE_1(sc, VR_MIIADDR, frame->mii_regaddr); - CSR_WRITE_2(sc, VR_MIIDATA, frame->mii_data); - + CSR_WRITE_1(sc, VR_MIIADDR, reg); + CSR_WRITE_2(sc, VR_MIIDATA, data); VR_SETBIT(sc, VR_MIICMD, VR_MIICMD_WRITE_ENB); - for (i = 0; i < 10000; i++) { + for (i = 0; i < VR_MII_TIMEOUT; i++) { + DELAY(1); if ((CSR_READ_1(sc, VR_MIICMD) & VR_MIICMD_WRITE_ENB) == 0) break; - DELAY(1); } + if (i == VR_MII_TIMEOUT) + device_printf(sc->vr_dev, "phy write fail %d:%d\n", phy, reg); return (0); } -static int -vr_miibus_readreg(device_t dev, uint16_t phy, uint16_t reg) +static void +vr_miibus_statchg(device_t dev) { - struct vr_mii_frame frame; - struct vr_softc *sc = device_get_softc(dev); + struct vr_softc *sc; - if (sc->vr_revid == REV_ID_VT6102_APOLLO && phy != 1) - return (0); - - bzero((char *)&frame, sizeof(frame)); - frame.mii_phyaddr = phy; - frame.mii_regaddr = reg; - vr_mii_readreg(sc, &frame); - return (frame.mii_data); + sc = device_get_softc(dev); + taskqueue_enqueue(taskqueue_swi, &sc->vr_link_task); } -static int -vr_miibus_writereg(device_t dev, uint16_t phy, uint16_t reg, uint16_t data) +/* + * In order to fiddle with the + * 'full-duplex' and '100Mbps' bits in the netconfig register, we + * first have to put the transmit and/or receive logic in the idle state. + */ +static void +vr_link_task(void *arg, int pending) { - struct vr_mii_frame frame; - struct vr_softc *sc = device_get_softc(dev); + struct vr_softc *sc; + struct mii_data *mii; + struct ifnet *ifp; + int lfdx, mfdx; + uint8_t cr0, cr1; + + sc = (struct vr_softc *)arg; - if (sc->vr_revid == REV_ID_VT6102_APOLLO && phy != 1) - return (0); + VR_LOCK(sc); + mii = device_get_softc(sc->vr_miibus); + ifp = sc->vr_ifp; + if (mii == NULL || ifp == NULL || + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + VR_UNLOCK(sc); + return; + } - bzero((char *)&frame, sizeof(frame)); - frame.mii_phyaddr = phy; - frame.mii_regaddr = reg; - frame.mii_data = data; - vr_mii_writereg(sc, &frame); + if (mii->mii_media_status & IFM_ACTIVE) { + if (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) + sc->vr_link = 1; + } else + sc->vr_link = 0; - return (0); + if (sc->vr_link) { + /* XXX flow control */ + cr0 = CSR_READ_1(sc, VR_CR0); + cr1 = CSR_READ_1(sc, VR_CR1); + mfdx = (cr1 & VR_CR1_FULLDUPLEX) != 0; + lfdx = (IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0; + if (mfdx != lfdx) { + if ((cr0 & (VR_CR0_TX_ON | VR_CR0_RX_ON)) != 0) { + if (vr_tx_stop(sc) < 0 || vr_rx_stop(sc) < 0) { + printf("T1\n"); + sc->vr_flags |= VR_F_RESTART; + VR_UNLOCK(sc); + return; + } + } + if (lfdx) + cr1 |= VR_CR1_FULLDUPLEX; + else + cr1 &= ~VR_CR1_FULLDUPLEX; + CSR_WRITE_1(sc, VR_CR1, cr1); + } + vr_rx_start(sc); + vr_tx_start(sc); + } else { + if (vr_tx_stop(sc) < 0 || vr_rx_stop(sc) < 0) { + printf("T2\n"); + sc->vr_flags |= VR_F_RESTART; + VR_UNLOCK(sc); + return; + } + } + VR_UNLOCK(sc); } -static void -vr_miibus_statchg(device_t dev) +/* + * Copy the address 'mac' into the perfect RX filter entry at + * offset 'idx.' The perfect filter only has 32 entries so do + * some sanity tests. + */ +static int +vr_setperf(struct vr_softc *sc, int idx, uint8_t *mac) { - struct mii_data *mii; - struct vr_softc *sc = device_get_softc(dev); + int i; + + if (idx < 0 || idx >= VR_CAM_MCAST_CNT || mac == NULL) + return (EINVAL); + + /* Set CAM entry address. */ + CSR_WRITE_1(sc, VR_CAMADDR, idx); + /* Set CAM entry data. */ + for (i = 0; i < ETHER_ADDR_LEN; i++) + CSR_WRITE_1(sc, VR_MAR0 + i, mac[i]); + DELAY(10); + /* Set CAM write. */ + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_WRITE); + DELAY(10); - mii = device_get_softc(sc->vr_miibus); - vr_setcfg(sc, mii->mii_media_active); + return(0); } /* * Program the 64-bit multicast hash filter. */ static void -vr_setmulti(struct vr_softc *sc) +vr_set_filter(struct vr_softc *sc) { struct ifnet *ifp = sc->vr_ifp; int h = 0; @@ -372,13 +426,19 @@ struct ifmultiaddr *ifma; uint8_t rxfilt; int mcnt = 0; + uint32_t cam_mask; VR_LOCK_ASSERT(sc); rxfilt = CSR_READ_1(sc, VR_RXCFG); + rxfilt = ~(VR_RXCFG_RX_PROMISC | VR_RXCFG_RX_BROAD | VR_RXCFG_RX_MULTI); + if (ifp->if_flags & IFF_BROADCAST) + rxfilt |= VR_RXCFG_RX_BROAD; if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) { rxfilt |= VR_RXCFG_RX_MULTI; + if (ifp->if_flags & IFF_PROMISC) + rxfilt |= VR_RXCFG_RX_PROMISC; CSR_WRITE_1(sc, VR_RXCFG, rxfilt); CSR_WRITE_4(sc, VR_MAR0, 0xFFFFFFFF); CSR_WRITE_4(sc, VR_MAR1, 0xFFFFFFFF); @@ -389,11 +449,26 @@ CSR_WRITE_4(sc, VR_MAR0, 0); CSR_WRITE_4(sc, VR_MAR1, 0); + if (sc->vr_quirks & VR_Q_CAM) + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_MCAST); + cam_mask = 0; /* Now program new ones. */ IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; + /* + * Program the first VR_CAM_MCAST_CNT multicast + * groups into the perfect filter. For all others, + * use the hash table. + */ + if (sc->vr_quirks & VR_Q_CAM && mcnt < VR_CAM_MCAST_CNT) { + vr_setperf(sc, mcnt, + LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + cam_mask |= 1 << mcnt; + mcnt++; + continue; + } h = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; if (h < 32) @@ -404,68 +479,57 @@ } IF_ADDR_UNLOCK(ifp); + if (sc->vr_quirks & VR_Q_CAM) { + /* Set CAM mask. */ + CSR_WRITE_1(sc, VR_CAMMASK, cam_mask); + CSR_WRITE_1(sc, VR_CAMCTL, 0); + /* Disable VLAN CAM. */ + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_VLAN); + CSR_WRITE_1(sc, VR_CAMMASK, 0); + CSR_WRITE_1(sc, VR_CAMCTL, 0); + } + if (mcnt) rxfilt |= VR_RXCFG_RX_MULTI; - else - rxfilt &= ~VR_RXCFG_RX_MULTI; CSR_WRITE_4(sc, VR_MAR0, hashes[0]); CSR_WRITE_4(sc, VR_MAR1, hashes[1]); CSR_WRITE_1(sc, VR_RXCFG, rxfilt); } -/* - * In order to fiddle with the - * 'full-duplex' and '100Mbps' bits in the netconfig register, we - * first have to put the transmit and/or receive logic in the idle state. - */ -static void -vr_setcfg(struct vr_softc *sc, int media) -{ - int restart = 0; - - VR_LOCK_ASSERT(sc); - - if (CSR_READ_2(sc, VR_COMMAND) & (VR_CMD_TX_ON|VR_CMD_RX_ON)) { - restart = 1; - VR_CLRBIT16(sc, VR_COMMAND, (VR_CMD_TX_ON|VR_CMD_RX_ON)); - } - - if ((media & IFM_GMASK) == IFM_FDX) - VR_SETBIT16(sc, VR_COMMAND, VR_CMD_FULLDUPLEX); - else - VR_CLRBIT16(sc, VR_COMMAND, VR_CMD_FULLDUPLEX); - - if (restart) - VR_SETBIT16(sc, VR_COMMAND, VR_CMD_TX_ON|VR_CMD_RX_ON); -} - static void vr_reset(const struct vr_softc *sc) { - register int i; + int i; /*VR_LOCK_ASSERT(sc);*/ /* XXX: Called during attach w/o lock. */ - VR_SETBIT16(sc, VR_COMMAND, VR_CMD_RESET); - + CSR_WRITE_1(sc, VR_CR1, VR_CR1_RESET); + if (sc->vr_revid < REV_ID_VT6102_A) { + /* VT86C100A needs more delay after reset. */ + DELAY(100); + } for (i = 0; i < VR_TIMEOUT; i++) { DELAY(10); - if (!(CSR_READ_2(sc, VR_COMMAND) & VR_CMD_RESET)) + if (!(CSR_READ_1(sc, VR_CR1) & VR_CR1_RESET)) break; } if (i == VR_TIMEOUT) { - if (sc->vr_revid < REV_ID_VT3065_A) + if (sc->vr_revid < REV_ID_VT6102_A) device_printf(sc->vr_dev, "reset never completed!\n"); else { /* Use newer force reset command */ - device_printf(sc->vr_dev, "Using force reset command.\n"); + device_printf(sc->vr_dev, + "Using force reset command.\n"); VR_SETBIT(sc, VR_MISC_CR1, VR_MISCCR1_FORSRST); + /* + * Wait a little while for the chip to get its brains + * in order. + */ + DELAY(2000); } } - /* Wait a little while for the chip to get its brains in order. */ - DELAY(1000); } /* @@ -526,12 +590,18 @@ mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); callout_init_mtx(&sc->vr_stat_callout, &sc->vr_mtx, 0); + TASK_INIT(&sc->vr_link_task, 0, vr_link_task, sc); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "stats", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + vr_sysctl_stats, "I", "Statistics"); /* * Map control/status registers. */ pci_enable_busmaster(dev); - sc->vr_revid = pci_read_config(dev, VR_PCI_REVID, 4) & 0x000000FF; + sc->vr_revid = pci_get_revid(dev); + device_printf(dev, "Revision: 0x%x\n", sc->vr_revid); rid = VR_RID; sc->vr_res = bus_alloc_resource_any(dev, VR_RES, &rid, RF_ACTIVE); @@ -556,34 +626,40 @@ /* Allocate ifnet structure. */ ifp = sc->vr_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { - device_printf(dev, "can not if_alloc()\n"); + device_printf(dev, "couldn't allocate ifnet structure\n"); error = ENOSPC; goto fail; } ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = vr_ioctl; ifp->if_start = vr_start; - ifp->if_watchdog = vr_watchdog; ifp->if_init = vr_init; - IFQ_SET_MAXLEN(&ifp->if_snd, VR_TX_LIST_CNT - 1); - ifp->if_snd.ifq_maxlen = VR_TX_LIST_CNT - 1; + IFQ_SET_MAXLEN(&ifp->if_snd, VR_TX_RING_CNT - 1); + ifp->if_snd.ifq_maxlen = VR_TX_RING_CNT - 1; IFQ_SET_READY(&ifp->if_snd); + /* Configure Tx FIFO threshold */ + sc->vr_txthresh = VR_TXTHRESH_MIN; if (sc->vr_quirks & VR_Q_CSUM) { - ifp->if_hwassist = (CSUM_IP | CSUM_TCP | CSUM_UDP); + ifp->if_hwassist = VR_CSUM_FEATURES; ifp->if_capabilities |= IFCAP_HWCSUM; + /* + * To update checksum field the hardware may need to + * store entire frames into FIFO before transmitting. + */ + sc->vr_txthresh = VR_TXTHRESH_MAX; } ifp->if_capabilities |= IFCAP_VLAN_MTU; + if (sc->vr_revid >= REV_ID_VT6105M_A0) { + /* 6105M supports HW VLAN tag insertion/extraction. */ + ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; + if (sc->vr_quirks & VR_Q_CSUM) + ifp->if_capabilities |= IFCAP_VLAN_HWCSUM; + } ifp->if_capenable = ifp->if_capabilities; - if (ifp->if_capenable & IFCAP_TXCSUM) - ifp->if_hwassist = (CSUM_IP | CSUM_TCP | CSUM_UDP); - else - ifp->if_hwassist = 0; - #ifdef DEVICE_POLLING ifp->if_capabilities |= IFCAP_POLLING; #endif @@ -598,7 +674,13 @@ /* Reset the adapter. */ vr_reset(sc); + /* Ack intr & disable further interrupts. */ + CSR_WRITE_2(sc, VR_ISR, 0xFFFF); + CSR_WRITE_2(sc, VR_IMR, 0); + if (sc->vr_revid >= REV_ID_VT6102_A) + CSR_WRITE_2(sc, VR_MII_IMR, 0); +#if 0 /* * Turn on bit2 (MIION) in PCI configuration register 0x53 during * initialization and disable AUTOPOLL. @@ -606,6 +688,35 @@ pci_write_config(dev, VR_PCI_MODE, pci_read_config(dev, VR_PCI_MODE, 4) | (VR_MODE3_MIION << 24), 4); VR_CLRBIT(sc, VR_MIICMD, VR_MIICMD_AUTOPOLL); +#else + if (sc->vr_revid < REV_ID_VT6102_A) { + pci_write_config(dev, VR_PCI_MODE2, + pci_read_config(dev, VR_PCI_MODE2, 1) | + VR_MODE2_MODE10T, 1); + } else { + /* Report error instead of retrying forever. */ + pci_write_config(dev, VR_PCI_MODE2, + pci_read_config(dev, VR_PCI_MODE2, 1) | + VR_MODE2_PCEROPT, 1); + /* Detect MII coding error. */ + pci_write_config(dev, VR_PCI_MODE3, + pci_read_config(dev, VR_PCI_MODE3, 1) | + VR_MODE3_MIION, 1); + if (sc->vr_revid >= REV_ID_VT6105_LOM && + sc->vr_revid < REV_ID_VT6105M_A0) + pci_write_config(dev, VR_PCI_MODE2, + pci_read_config(dev, VR_PCI_MODE2, 1) | + VR_MODE2_MODE10T, 1); + /* Enable Memory-Read-Multiple. */ + if (sc->vr_revid >= REV_ID_VT6107_A1 && + sc->vr_revid < REV_ID_VT6105M_A0) + pci_write_config(dev, VR_PCI_MODE2, + pci_read_config(dev, VR_PCI_MODE2, 1) | + VR_MODE2_MRDPL, 1); + } + /* Disable MII AUTOPOLL. */ + VR_CLRBIT(sc, VR_MIICMD, VR_MIICMD_AUTOPOLL); +#endif /* * Get station address. The way the Rhine chips work, @@ -615,19 +726,23 @@ * registers. */ VR_SETBIT(sc, VR_EECSR, VR_EECSR_LOAD); - DELAY(200); + while ((CSR_READ_4(sc, VR_EECSR) & VR_EECSR_LOAD)) { + DELAY(10); + } + for (i = 0; i < ETHER_ADDR_LEN; i++) eaddr[i] = CSR_READ_1(sc, VR_PAR0 + i); - sc->vr_ldata = contigmalloc(sizeof(struct vr_list_data), M_DEVBUF, - M_NOWAIT | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0); - - if (sc->vr_ldata == NULL) { - device_printf(dev, "no memory for list buffers!\n"); + if (vr_dma_alloc(sc) != 0) { error = ENXIO; goto fail; } + /* Save PHY address. */ + if (sc->vr_revid >= REV_ID_VT6105_A0) + sc->vr_phyaddr = 1; + else + sc->vr_phyaddr = CSR_READ_1(sc, VR_PHYADDR) & VR_PHYADDR_MASK; /* Do MII setup. */ if (mii_phy_probe(dev, &sc->vr_miibus, vr_ifmedia_upd, vr_ifmedia_sts)) { @@ -638,8 +753,12 @@ /* Call MI attach routine. */ ether_ifattach(ifp, eaddr); - - sc->vr_suspended = 0; + /* + * Tell the upper layer(s) we support long frames. + * Must appear after the call to ether_ifattach() because + * ether_ifattach() sets ifi_hdrlen to the default value. + */ + ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); /* Hook interrupt last to avoid having to lock softc */ error = bus_setup_intr(dev, sc->vr_irq, INTR_TYPE_NET | INTR_MPSAFE, @@ -674,7 +793,7 @@ KASSERT(mtx_initialized(&sc->vr_mtx), ("vr mutex not initialized")); #ifdef DEVICE_POLLING - if (ifp->if_capenable & IFCAP_POLLING) + if (ifp != NULL && ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(ifp); #endif @@ -682,9 +801,11 @@ if (device_is_attached(dev)) { VR_LOCK(sc); sc->vr_suspended = 1; + sc->vr_detach = 1; vr_stop(sc); VR_UNLOCK(sc); callout_drain(&sc->vr_stat_callout); + taskqueue_drain(taskqueue_swi, &sc->vr_link_task); ether_ifdetach(ifp); } if (sc->vr_miibus) @@ -701,78 +822,366 @@ if (ifp) if_free(ifp); - if (sc->vr_ldata) - contigfree(sc->vr_ldata, sizeof(struct vr_list_data), M_DEVBUF); + vr_dma_free(sc); mtx_destroy(&sc->vr_mtx); return (0); } +struct vr_dmamap_arg { + bus_addr_t vr_busaddr; +}; + +static void +vr_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct vr_dmamap_arg *ctx; + + if (error != 0) + return; + ctx = arg; + ctx->vr_busaddr = segs[0].ds_addr; +} + +static int +vr_dma_alloc(struct vr_softc *sc) +{ + struct vr_dmamap_arg ctx; + struct vr_txdesc *txd; + struct vr_rxdesc *rxd; + bus_size_t alignment; + int error, i; + + /* Create parent DMA tag. */ + error = bus_dma_tag_create( + bus_get_dma_tag(sc->vr_dev), /* parent */ + 1, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsize */ + 0, /* nsegments */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->vr_cdata.vr_parent_tag); + if (error != 0) { + device_printf(sc->vr_dev, "failed to create parent DMA tag\n"); + goto fail; + } + /* Create tag for Tx ring. */ + error = bus_dma_tag_create( + sc->vr_cdata.vr_parent_tag, /* parent */ + VR_RING_ALIGN, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + VR_TX_RING_SIZE, /* maxsize */ + 1, /* nsegments */ + VR_TX_RING_SIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->vr_cdata.vr_tx_ring_tag); + if (error != 0) { + device_printf(sc->vr_dev, "failed to create Tx ring DMA tag\n"); + goto fail; + } + + /* Create tag for Rx ring. */ + error = bus_dma_tag_create( + sc->vr_cdata.vr_parent_tag, /* parent */ + VR_RING_ALIGN, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + VR_RX_RING_SIZE, /* maxsize */ + 1, /* nsegments */ + VR_RX_RING_SIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->vr_cdata.vr_rx_ring_tag); + if (error != 0) { + device_printf(sc->vr_dev, "failed to create Rx ring DMA tag\n"); + goto fail; + } + + if ((sc->vr_quirks & VR_Q_NEEDALIGN) != 0) + alignment = sizeof(uint32_t); + else + alignment = 1; + /* Create tag for Tx buffers. */ + error = bus_dma_tag_create( + sc->vr_cdata.vr_parent_tag, /* parent */ + alignment, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + MCLBYTES * VR_MAXFRAGS, /* maxsize */ + VR_MAXFRAGS, /* nsegments */ + MCLBYTES, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->vr_cdata.vr_tx_tag); + if (error != 0) { + device_printf(sc->vr_dev, "failed to create Tx DMA tag\n"); + goto fail; + } + + /* Create tag for Rx buffers. */ + error = bus_dma_tag_create( + sc->vr_cdata.vr_parent_tag, /* parent */ + VR_RX_ALIGN, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + MCLBYTES, /* maxsize */ + 1, /* nsegments */ + MCLBYTES, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->vr_cdata.vr_rx_tag); + if (error != 0) { + device_printf(sc->vr_dev, "failed to create Rx DMA tag\n"); + goto fail; + } + + /* Allocate DMA'able memory and load the DMA map for Tx ring. */ + error = bus_dmamem_alloc(sc->vr_cdata.vr_tx_ring_tag, + (void **)&sc->vr_rdata.vr_tx_ring, BUS_DMA_WAITOK | + BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->vr_cdata.vr_tx_ring_map); + if (error != 0) { + device_printf(sc->vr_dev, + "failed to allocate DMA'able memory for Tx ring\n"); + goto fail; + } + + ctx.vr_busaddr = 0; + error = bus_dmamap_load(sc->vr_cdata.vr_tx_ring_tag, + sc->vr_cdata.vr_tx_ring_map, sc->vr_rdata.vr_tx_ring, + VR_TX_RING_SIZE, vr_dmamap_cb, &ctx, 0); + if (error != 0 || ctx.vr_busaddr == 0) { + device_printf(sc->vr_dev, + "failed to load DMA'able memory for Tx ring\n"); + goto fail; + } + sc->vr_rdata.vr_tx_ring_paddr = ctx.vr_busaddr; + + /* Allocate DMA'able memory and load the DMA map for Rx ring. */ + error = bus_dmamem_alloc(sc->vr_cdata.vr_rx_ring_tag, + (void **)&sc->vr_rdata.vr_rx_ring, BUS_DMA_WAITOK | + BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->vr_cdata.vr_rx_ring_map); + if (error != 0) { + device_printf(sc->vr_dev, + "failed to allocate DMA'able memory for Rx ring\n"); + goto fail; + } + + ctx.vr_busaddr = 0; + error = bus_dmamap_load(sc->vr_cdata.vr_rx_ring_tag, + sc->vr_cdata.vr_rx_ring_map, sc->vr_rdata.vr_rx_ring, + VR_RX_RING_SIZE, vr_dmamap_cb, &ctx, 0); + if (error != 0 || ctx.vr_busaddr == 0) { + device_printf(sc->vr_dev, + "failed to load DMA'able memory for Rx ring\n"); + goto fail; + } + sc->vr_rdata.vr_rx_ring_paddr = ctx.vr_busaddr; + + /* Create DMA maps for Tx buffers. */ + for (i = 0; i < VR_TX_RING_CNT; i++) { + txd = &sc->vr_cdata.vr_txdesc[i]; + txd->tx_m = NULL; + txd->tx_dmamap = NULL; + error = bus_dmamap_create(sc->vr_cdata.vr_tx_tag, 0, + &txd->tx_dmamap); + if (error != 0) { + device_printf(sc->vr_dev, + "failed to create Tx dmamap\n"); + goto fail; + } + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 20:26:25 2007 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 028D916A469; Sun, 11 Nov 2007 20:26:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9607C16A417 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:26:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87B2C13C49D for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:26:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABKQO1t071625 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:26:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABKQN18071622 for perforce@freebsd.org; Sun, 11 Nov 2007 20:26:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Nov 2007 20:26:23 GMT Message-Id: <200711112026.lABKQN18071622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 128944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 11 Nov 2007 20:26:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=128944 Change 128944 by hselasky@hselasky_laptop001 on 2007/11/11 20:26:09 Substitute "__callout" by "usb_callout" hence double underscore function names are reserved for the system domain. Suggested by Alfred Perlstein. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#47 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.h#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.h#16 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#20 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#50 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#40 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#47 (text+ko) ==== @@ -149,7 +149,7 @@ LIST_INIT(&sc->sc_interrupt_list_head); - __callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx, + usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx, CALLOUT_RETURNUNLOCKED); #ifdef USB_DEBUG @@ -388,7 +388,7 @@ { mtx_lock(&sc->sc_bus.mtx); - __callout_stop(&sc->sc_tmo_pcd); + usb_callout_stop(&sc->sc_tmo_pcd); EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); EOWRITE4(sc, EHCI_USBCMD, 0); @@ -398,7 +398,7 @@ DELAY(1000 * 300); /* XXX let stray task complete */ - __callout_drain(&(sc->sc_tmo_pcd)); + usb_callout_drain(&(sc->sc_tmo_pcd)); return; } @@ -1411,7 +1411,7 @@ mtx_lock(&(sc->sc_bus.mtx)); } /* do not allow RHSC interrupts > 1 per second */ - __callout_reset(&sc->sc_tmo_pcd, hz, + usb_callout_reset(&sc->sc_tmo_pcd, hz, (void *)(void *)ehci_pcd_enable, sc); } status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA); @@ -2156,7 +2156,7 @@ xfer->td_transfer_last = NULL; } /* stop timeout */ - __callout_stop(&xfer->timeout_handle); + usb_callout_stop(&xfer->timeout_handle); /* remove interrupt info (if any) */ ehci_remove_interrupt_info(xfer); @@ -2260,7 +2260,7 @@ ehci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!xfer->flags.use_polling)) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ehci_timeout, xfer); } return; @@ -2310,7 +2310,7 @@ ehci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!xfer->flags.use_polling)) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ehci_timeout, xfer); } return; @@ -2416,7 +2416,7 @@ ehci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!xfer->flags.use_polling)) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ehci_timeout, xfer); } return; @@ -2686,7 +2686,7 @@ { /* start timeout, if any (should not be done by the enter routine) */ if (xfer->timeout && (!xfer->flags.use_polling)) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ehci_timeout, xfer); } return; @@ -2967,7 +2967,7 @@ { /* start timeout, if any (should not be done by the enter routine) */ if (xfer->timeout && (!xfer->flags.use_polling)) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ehci_timeout, xfer); } return; ==== //depot/projects/usb/src/sys/dev/usb/ehci.h#20 (text+ko) ==== @@ -437,7 +437,7 @@ struct usbd_page sc_hw_page; struct usbd_bus sc_bus; /* base device */ struct usbd_config_td sc_config_td; - struct __callout sc_tmo_pcd; + struct usb_callout sc_tmo_pcd; LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; union ehci_hub_desc sc_hub_desc; struct usbd_std_root_transfer sc_root_ctrl; ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#34 (text+ko) ==== @@ -799,7 +799,7 @@ mtx_init(&(sc->sc_mtx), "aue lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, AUE_CONFIG_NO, 0); @@ -946,7 +946,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&(sc->sc_watchdog)); + usb_callout_stop(&(sc->sc_watchdog)); aue_cfg_pre_stop(sc, NULL, 0); @@ -966,7 +966,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); @@ -1544,7 +1544,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), NULL, &aue_cfg_tick, 0, 0); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &aue_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_auereg.h#14 (text+ko) ==== @@ -201,7 +201,7 @@ void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct aue_rxpkt sc_rxpkt; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#35 (text+ko) ==== @@ -653,7 +653,7 @@ mtx_init(&(sc->sc_mtx), "axe lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, AXE_CONFIG_NO, 1); @@ -916,7 +916,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&sc->sc_watchdog); + usb_callout_stop(&sc->sc_watchdog); axe_cfg_pre_stop(sc, NULL, 0); @@ -936,7 +936,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); @@ -1502,7 +1502,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), NULL, &axe_cfg_tick, 0, 0); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &axe_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#17 (text+ko) ==== @@ -166,7 +166,7 @@ void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct ifnet *sc_ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#30 (text+ko) ==== @@ -484,7 +484,7 @@ mtx_init(&(sc->sc_mtx), "cue lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, CUE_CONFIG_NO, 0); @@ -591,7 +591,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&(sc->sc_watchdog)); + usb_callout_stop(&(sc->sc_watchdog)); cue_cfg_pre_stop(sc, NULL, 0); @@ -611,7 +611,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); @@ -973,7 +973,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), NULL, &cue_cfg_tick, 0, 0); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &cue_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#13 (text+ko) ==== @@ -124,7 +124,7 @@ void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct ifnet *sc_ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#32 (text+ko) ==== @@ -513,7 +513,7 @@ mtx_init(&(sc->sc_mtx), "kue lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, KUE_CONFIG_NO, 0); @@ -625,7 +625,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&(sc->sc_watchdog)); + usb_callout_stop(&(sc->sc_watchdog)); kue_cfg_pre_stop(sc, NULL, 0); @@ -645,7 +645,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); @@ -996,7 +996,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), NULL, &kue_cfg_tick, 0, 0); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &kue_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#12 (text+ko) ==== @@ -129,7 +129,7 @@ void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct kue_ether_desc sc_desc; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#30 (text+ko) ==== @@ -709,7 +709,7 @@ mtx_init(&(sc->sc_mtx), "rue lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, RUE_CONFIG_NO, 0); @@ -842,7 +842,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&sc->sc_watchdog); + usb_callout_stop(&sc->sc_watchdog); rue_cfg_pre_stop(sc, NULL, 0); @@ -862,7 +862,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); @@ -1379,7 +1379,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), NULL, &rue_cfg_tick, 0, 0); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &rue_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#13 (text+ko) ==== @@ -169,7 +169,7 @@ void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct ifnet *sc_ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#14 (text+ko) ==== @@ -465,7 +465,7 @@ sc->sc_udev = uaa->device; sc->sc_unit = device_get_unit(dev); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, RT2573_CONFIG_NO, 0); @@ -520,7 +520,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&sc->sc_watchdog); + usb_callout_stop(&sc->sc_watchdog); rum_cfg_pre_stop(sc, NULL, 0); @@ -542,7 +542,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&sc->sc_mtx); @@ -1576,7 +1576,7 @@ (&(sc->sc_config_td), NULL, &rum_cfg_amrr_timeout, 0, 0); } - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &rum_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#5 (text+ko) ==== @@ -107,7 +107,7 @@ struct ieee80211_amrr_node sc_amn; struct ieee80211_beacon_offsets sc_bo; struct mtx sc_mtx; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct rum_bbp_prom sc_bbp_prom[16]; union rum_rxtap sc_rxtap; union rum_txtap sc_txtap; ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#31 (text+ko) ==== @@ -324,7 +324,7 @@ mtx_init(&(sc->sc_mtx), "udav lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, UDAV_CONFIG_NO, 1); @@ -457,7 +457,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&sc->sc_watchdog); + usb_callout_stop(&sc->sc_watchdog); udav_cfg_pre_stop(sc, NULL, 0); @@ -477,7 +477,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); @@ -1170,7 +1170,7 @@ usbd_config_td_queue_command (&(sc->sc_config_td), NULL, &udav_cfg_tick, 0, 0); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &udav_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#11 (text+ko) ==== @@ -140,7 +140,7 @@ void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct ifnet *sc_ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#38 (text+ko) ==== @@ -524,7 +524,7 @@ sc->sc_udev = uaa->device; sc->sc_unit = device_get_unit(dev); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, RAL_CONFIG_NO, 0); @@ -579,7 +579,7 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&sc->sc_watchdog); + usb_callout_stop(&sc->sc_watchdog); ural_cfg_pre_stop(sc, NULL, 0); @@ -601,7 +601,7 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&sc->sc_mtx); @@ -1680,7 +1680,7 @@ (&(sc->sc_config_td), NULL, &ural_cfg_amrr_timeout, 0, 0); } - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &ural_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#20 (text+ko) ==== @@ -106,7 +106,7 @@ struct ieee80211_amrr_node sc_amn; struct ieee80211_beacon_offsets sc_bo; struct mtx sc_mtx; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct ural_bbp_prom sc_bbp_prom[16]; union ural_rxtap sc_rxtap; union ural_txtap sc_txtap; ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#20 (text+ko) ==== @@ -1265,10 +1265,10 @@ mtx_init(&sc->sc_mtx, "zyd lock", MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); - __callout_init_mtx(&(sc->sc_scan_callout), + usb_callout_init_mtx(&(sc->sc_scan_callout), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); error = usbd_set_config_no(uaa->device, ZYD_CONFIG_NO, 1); @@ -2126,8 +2126,8 @@ mtx_lock(&(sc->sc_mtx)); - __callout_stop(&(sc->sc_watchdog)); - __callout_stop(&(sc->sc_scan_callout)); + usb_callout_stop(&(sc->sc_watchdog)); + usb_callout_stop(&(sc->sc_scan_callout)); zyd_cfg_pre_stop(sc, NULL, 0); @@ -2149,8 +2149,8 @@ } usbd_config_td_unsetup(&(sc->sc_config_td)); - __callout_drain(&(sc->sc_watchdog)); - __callout_drain(&(sc->sc_scan_callout)); + usb_callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_scan_callout)); mtx_destroy(&sc->sc_mtx); @@ -2195,7 +2195,7 @@ /* stop timers */ - __callout_stop(&(sc->sc_scan_callout)); + usb_callout_stop(&(sc->sc_scan_callout)); if (nstate != IEEE80211_S_INIT) { usbd_config_td_queue_command @@ -2207,7 +2207,7 @@ break; case IEEE80211_S_SCAN: - __callout_reset(&(sc->sc_scan_callout), hz / 5, + usb_callout_reset(&(sc->sc_scan_callout), hz / 5, &zyd_next_scan, sc); break; @@ -3156,7 +3156,7 @@ ieee80211_watchdog(ic); - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz, &zyd_watchdog, sc); mtx_unlock(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#8 (text+ko) ==== @@ -1304,8 +1304,8 @@ struct ieee80211com sc_ic; struct zyd_rf sc_rf; - struct __callout sc_scan_callout; - struct __callout sc_watchdog; + struct usb_callout sc_scan_callout; + struct usb_callout sc_watchdog; struct mtx sc_mtx; struct usbd_config_td sc_config_td; struct ieee80211_beacon_offsets sc_bo; ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#37 (text+ko) ==== @@ -353,7 +353,7 @@ /* set up the bus struct */ sc->sc_bus.methods = &ohci_bus_methods; - __callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.mtx, + usb_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.mtx, CALLOUT_RETURNUNLOCKED); #ifdef USB_DEBUG @@ -390,7 +390,7 @@ { mtx_lock(&sc->sc_bus.mtx); - __callout_stop(&sc->sc_tmo_rhsc); + usb_callout_stop(&sc->sc_tmo_rhsc); OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS); OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); @@ -399,7 +399,7 @@ DELAY(1000 * 50); /* XXX let stray task complete */ - __callout_drain(&(sc->sc_tmo_rhsc)); + usb_callout_drain(&(sc->sc_tmo_rhsc)); return; } @@ -1204,7 +1204,7 @@ mtx_lock(&(sc->sc_bus.mtx)); } /* do not allow RHSC interrupts > 1 per second */ - __callout_reset(&sc->sc_tmo_rhsc, hz, + usb_callout_reset(&sc->sc_tmo_rhsc, hz, (void *)(void *)ohci_rhsc_enable, sc); } status &= ~(OHCI_RHSC | OHCI_WDH | OHCI_SO); @@ -1737,7 +1737,7 @@ xfer->td_transfer_last = NULL; /* stop timeout */ - __callout_stop(&xfer->timeout_handle); + usb_callout_stop(&xfer->timeout_handle); /* remove interrupt info */ ohci_remove_interrupt_info(xfer); @@ -1794,7 +1794,7 @@ ohci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ohci_timeout, xfer); } return; @@ -1844,7 +1844,7 @@ ohci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ohci_timeout, xfer); } return; @@ -1926,7 +1926,7 @@ ohci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ohci_timeout, xfer); } return; @@ -2141,7 +2141,7 @@ { /* start timeout, if any (should not be done by the enter routine) */ if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)ohci_timeout, xfer); } return; ==== //depot/projects/usb/src/sys/dev/usb/ohci.h#16 (text+ko) ==== @@ -311,7 +311,7 @@ struct usbd_page sc_hw_page; struct usbd_bus sc_bus; /* base device */ struct usbd_config_td sc_config_td; - struct __callout sc_tmo_rhsc; + struct usb_callout sc_tmo_rhsc; LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; union ohci_hub_desc sc_hub_desc; struct usbd_std_root_transfer sc_root_ctrl; ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#39 (text+ko) ==== @@ -1968,7 +1968,7 @@ xfer->td_transfer_last = NULL; } /* stop timeout */ - __callout_stop(&xfer->timeout_handle); + usb_callout_stop(&xfer->timeout_handle); /* remove interrupt info */ uhci_remove_interrupt_info(xfer); @@ -2034,7 +2034,7 @@ uhci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)uhci_timeout, xfer); } return; @@ -2099,7 +2099,7 @@ uhci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)uhci_timeout, xfer); } return; @@ -2189,7 +2189,7 @@ uhci_add_interrupt_info(sc, xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)uhci_timeout, xfer); } return; @@ -2393,7 +2393,7 @@ { /* start timeout, if any (should not be done by the enter routine) */ if (xfer->timeout && (!(xfer->flags.use_polling))) { - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), (void *)(void *)uhci_timeout, xfer); } return; @@ -3005,7 +3005,7 @@ sc->sc_root_intr.xfer = xfer; - __callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->interval), + usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->interval), (void *)(void *)uhci_root_intr_check, xfer); return; } ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#27 (text+ko) ==== @@ -117,7 +117,7 @@ keymap_t sc_keymap; accentmap_t sc_accmap; fkeytab_t sc_fkeymap[UKBD_NFKEY]; - struct __callout sc_callout; + struct usb_callout sc_callout; struct ukbd_data sc_ndata; struct ukbd_data sc_odata; @@ -428,7 +428,7 @@ } ukbd_interrupt(sc); - __callout_reset(&(sc->sc_callout), hz / 40, &ukbd_timeout, sc); + usb_callout_reset(&(sc->sc_callout), hz / 40, &ukbd_timeout, sc); mtx_unlock(&Giant); @@ -628,7 +628,7 @@ sc->sc_mode = K_XLATE; sc->sc_iface = uaa->iface; - __callout_init_mtx(&(sc->sc_callout), &Giant, + usb_callout_init_mtx(&(sc->sc_callout), &Giant, CALLOUT_RETURNUNLOCKED); err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, @@ -715,7 +715,7 @@ } sc->sc_flags |= UKBD_FLAG_GONE; - __callout_stop(&(sc->sc_callout)); + usb_callout_stop(&(sc->sc_callout)); ukbd_disable(&(sc->sc_kbd)); @@ -741,7 +741,7 @@ usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER); - __callout_drain(&(sc->sc_callout)); + usb_callout_drain(&(sc->sc_callout)); DPRINTF(0, "%s: disconnected\n", device_get_nameunit(dev)); ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#27 (text+ko) ==== @@ -87,7 +87,7 @@ struct ulpt_softc { struct usb_cdev sc_cdev; - struct __callout sc_watchdog; + struct usb_callout sc_watchdog; struct mtx sc_mtx; device_t sc_dev; @@ -141,7 +141,7 @@ usbd_transfer_start(sc->sc_xfer[1]); } - __callout_reset(&(sc->sc_watchdog), + usb_callout_reset(&(sc->sc_watchdog), hz / ULPT_WATCHDOG_INTERVAL, &ulpt_watchdog, sc); @@ -541,7 +541,7 @@ mtx_init(&(sc->sc_mtx), "ulpt lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_watchdog), + usb_callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); /* search through all the descriptors looking for bidir mode */ @@ -682,12 +682,12 @@ usb_cdev_detach(&(sc->sc_cdev)); mtx_lock(&(sc->sc_mtx)); - __callout_stop(&(sc->sc_watchdog)); + usb_callout_stop(&(sc->sc_watchdog)); mtx_unlock(&(sc->sc_mtx)); usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER); - __callout_drain(&(sc->sc_watchdog)); + usb_callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/ums.c#28 (text+ko) ==== @@ -87,7 +87,7 @@ struct ums_softc { struct usb_cdev sc_cdev; struct mtx sc_mtx; - struct __callout sc_callout; + struct usb_callout sc_callout; struct hid_location sc_loc_x; struct hid_location sc_loc_y; struct hid_location sc_loc_z; @@ -286,11 +286,11 @@ (dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) && (buttons == 0)) { - __callout_reset(&(sc->sc_callout), hz / 20, + usb_callout_reset(&(sc->sc_callout), hz / 20, &ums_put_queue_timeout, sc); } else { - __callout_stop(&(sc->sc_callout)); + usb_callout_stop(&(sc->sc_callout)); ums_put_queue(sc, dx, dy, dz, dt, buttons); } @@ -396,7 +396,7 @@ mtx_init(&(sc->sc_mtx), "ums lock", NULL, MTX_DEF | MTX_RECURSE); - __callout_init_mtx(&(sc->sc_callout), + usb_callout_init_mtx(&(sc->sc_callout), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, @@ -589,7 +589,7 @@ usbd_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER); - __callout_drain(&(sc->sc_callout)); + usb_callout_drain(&(sc->sc_callout)); mtx_destroy(&(sc->sc_mtx)); @@ -612,7 +612,7 @@ usbd_transfer_stop(sc->sc_xfer[1]); usbd_transfer_stop(sc->sc_xfer[0]); - __callout_stop(&(sc->sc_callout)); + usb_callout_stop(&(sc->sc_callout)); return; } ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#20 (text+ko) ==== @@ -77,13 +77,13 @@ #define __KASSERT KASSERT #define uio_procp uio_td #endif -#ifndef __callout_init_mtx -#define __callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f) -#define __callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d) -#define __callout_stop(c) callout_stop(&(c)->co) -#define __callout_drain(c) callout_drain(&(c)->co) -#define __callout_pending(c) callout_pending(&(c)->co) -struct __callout { +#ifndef usb_callout_init_mtx +#define usb_callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f) +#define usb_callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d) +#define usb_callout_stop(c) callout_stop(&(c)->co) +#define usb_callout_drain(c) callout_drain(&(c)->co) +#define usb_callout_pending(c) callout_pending(&(c)->co) +struct usb_callout { struct callout co; }; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#50 (text+ko) ==== @@ -89,7 +89,7 @@ struct usbd_std_root_transfer; struct usbd_setup_params; struct usbd_ifqueue; -struct __callout; +struct usb_callout; struct module; struct malloc_type; struct proc; @@ -381,7 +381,7 @@ }; struct usbd_xfer { - struct __callout timeout_handle; + struct usb_callout timeout_handle; struct usbd_page_cache buf_data;/* buffer page cache */ struct usbd_page_cache buf_fixup; /* fixup buffer */ LIST_ENTRY(usbd_xfer) interrupt_list; /* used by HC driver */ ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#40 (text+ko) ==== @@ -735,7 +735,7 @@ info->memory_refcount++; info->setup_refcount++; - __callout_init_mtx(&xfer->timeout_handle, xfer->usb_mtx, + usb_callout_init_mtx(&xfer->timeout_handle, xfer->usb_mtx, CALLOUT_RETURNUNLOCKED); } else { /* dummy xfer */ @@ -894,7 +894,7 @@ pxfer[n_setup] = NULL; } - __callout_drain(&(xfer->timeout_handle)); + usb_callout_drain(&(xfer->timeout_handle)); if (xfer->usb_root) { info = xfer->usb_root; @@ -1575,7 +1575,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 20:56:58 2007 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 697D816A419; Sun, 11 Nov 2007 20:56:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09DA016A420 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:56:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EEAB413C4B5 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:56:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABKuvZx081638 for <perforce@FreeBSD.org>; Sun, 11 Nov 2007 20:56:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABKuvRp081635 for perforce@freebsd.org; Sun, 11 Nov 2007 20:56:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Nov 2007 20:56:57 GMT Message-Id: <200711112056.lABKuvRp081635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 128946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 11 Nov 2007 20:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=128946 Change 128946 by hselasky@hselasky_laptop001 on 2007/11/11 20:56:29 Substitute "__usbd_callback" by "usbd_callback_wrapper", hence double underscored functions are reserved for the system domain. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#51 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#41 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#51 (text+ko) ==== @@ -698,7 +698,7 @@ void usbd_transfer_start(struct usbd_xfer *xfer); void usbd_transfer_stop(struct usbd_xfer *xfer); void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, uint32_t frindex); -void __usbd_callback(struct usbd_xfer *xfer); +void usbd_callback_wrapper(struct usbd_xfer *xfer); void usbd_do_callback(struct usbd_xfer **pp_xfer, struct thread *td); void usbd_transfer_enqueue(struct usbd_xfer *xfer); void usbd_transfer_dequeue(struct usbd_xfer *xfer, usbd_status error); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#41 (text+ko) ==== @@ -1203,7 +1203,7 @@ mtx_lock(xfer->usb_mtx); usbd_transfer_dequeue(xfer, error); mtx_unlock(xfer->usb_mtx); - __usbd_callback(xfer); + usbd_callback_wrapper(xfer); return; } @@ -1338,7 +1338,7 @@ } if (!xfer->flags_int.transferring) { /* call callback */ - __usbd_callback(xfer); + usbd_callback_wrapper(xfer); /* * wait for completion if polling is selected @@ -1358,7 +1358,7 @@ /* * call the interrupt handler, which will - * call __usbd_callback(): + * call usbd_callback_wrapper(): */ (bus->methods->do_poll) (bus); } @@ -1415,7 +1415,7 @@ * call callback, which will clear * "flags_int.transferring" */ - __usbd_callback(xfer); + usbd_callback_wrapper(xfer); } } return; @@ -1435,13 +1435,13 @@ } /*---------------------------------------------------------------------------* - * __usbd_callback + * usbd_callback_wrapper * * This is a wrapper for USB callbacks, which handles * recursation, which can happen during boot. *---------------------------------------------------------------------------*/ void -__usbd_callback(struct usbd_xfer *xfer) +usbd_callback_wrapper(struct usbd_xfer *xfer) { mtx_assert(xfer->priv_mtx, MA_OWNED); @@ -1506,7 +1506,7 @@ if (tmp) { /* call callback */ - __usbd_callback(xfer); + usbd_callback_wrapper(xfer); } /* * else already called back ! From owner-p4-projects@FreeBSD.ORG Sun Nov 11 21:30:37 2007 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F4616A41B; Sun, 11 Nov 2007 21:30:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70D4016A419 for <perforce@freebsd.org>; Sun, 11 Nov 2007 21:30:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EAD013C491 for <perforce@freebsd.org>; Sun, 11 Nov 2007 21:30:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABLUaOC084350 for <perforce@freebsd.org>; Sun, 11 Nov 2007 21:30:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABLUYgK084347 for perforce@freebsd.org; Sun, 11 Nov 2007 21:30:34 GMT (envelope-from jb@freebsd.org) Date: Sun, 11 Nov 2007 21:30:34 GMT Message-Id: <200711112130.lABLUYgK084347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 128949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 11 Nov 2007 21:30:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=128949 Change 128949 by jb@jb_freebsd1 on 2007/11/11 21:30:29 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/teams.ent#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/catalog#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/teams.ent#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#3 integrate .. //depot/projects/dtrace/src/bin/ps/ps.c#6 integrate .. //depot/projects/dtrace/src/etc/Makefile#11 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#15 integrate .. //depot/projects/dtrace/src/etc/pf.conf#4 delete .. //depot/projects/dtrace/src/release/Makefile#13 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/dtrace/src/release/scripts/src-install.sh#5 integrate .. //depot/projects/dtrace/src/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/dtrace/src/share/doc/legal/Makefile#2 integrate .. //depot/projects/dtrace/src/share/examples/pf/Makefile#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/ackpri#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/faq-example1#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/faq-example2#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/faq-example3#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/pf.conf#1 branch .. //depot/projects/dtrace/src/share/examples/pf/queue1#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/queue2#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/queue3#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/queue4#4 integrate .. //depot/projects/dtrace/src/share/examples/pf/spamd#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#22 integrate .. //depot/projects/dtrace/src/share/man/man4/wpi.4#1 branch .. //depot/projects/dtrace/src/share/man/man7/tuning.7#6 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#19 integrate .. //depot/projects/dtrace/src/share/man/man9/rmlock.9#2 integrate .. //depot/projects/dtrace/src/share/mk/sys.mk#12 edit .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#21 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#25 integrate .. //depot/projects/dtrace/src/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axereg.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_quirks.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pty.c#9 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#28 integrate .. //depot/projects/dtrace/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#13 integrate .. //depot/projects/dtrace/src/sys/pci/nfsmb.c#9 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/malloc.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/dtrace/src/usr.bin/killall/killall.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/killall/killall.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/main.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/pkg_add.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/delete/perform.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pathnames.h#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/version.h#4 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.h#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/menus.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/hostapd/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/Makefile#7 integrate .. //depot/projects/dtrace/www/en/java/index.sgml#5 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#5 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#9 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.hardware.xml#5 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#16 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#4 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing/article.sgml,v 1.4 2007/07/18 06:28:01 jkois Exp $ - $FreeBSDde: de-docproj/articles/contributing/article.sgml,v 1.4 2007/07/16 06:25:27 jkois Exp $ - basiert auf: 1.506 + $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing/article.sgml,v 1.5 2007/11/11 21:05:22 miwi Exp $ + $FreeBSDde: de-docproj/articles/contributing/article.sgml,v 1.8 2007/11/11 13:49:28 miwi Exp $ + basiert auf: 1.508 --> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -17,7 +17,7 @@ <articleinfo> <title>&os; unterstützen - $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing/article.sgml,v 1.4 2007/07/18 06:28:01 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing/article.sgml,v 1.5 2007/11/11 21:05:22 miwi Exp $ Dieser Artikel beschreibt, wie Einzelpersonen oder @@ -257,6 +257,18 @@ muss, oder Sie könnten weitere Ideen mit ihm diskutieren. + + + Wählen Sie einen der Einträge auf der + <quote>Ideen</quote>-Seite aus + + Die Liste + von Projekten und Ideen für &os; ist auch + für Freiwillige interessant, die etwas zum &os; Projekt + beitragen möchten. Diese Liste wird regelmäßig + aktualisiert und enthält Einträge für Programmierer + und Nicht-Programmierer sowie Informationen zu jedem Projekt. + ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 (text+ko) ==== @@ -27,9 +27,9 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml,v 1.5 2005/08/25 16:26:10 jkois Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/examples/appendix.sgml,v 1.12 2005/08/15 13:32:48 jkois Exp $ - basiert auf: 1.16 + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml,v 1.6 2007/11/11 21:05:22 miwi Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/examples/appendix.sgml,v 1.13 2007/11/10 15:41:58 miwi Exp $ + basiert auf: 1.17 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 (text+ko) ==== @@ -27,9 +27,9 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.6 2006/11/20 17:09:06 jkois Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/sgml-primer/chapter.sgml,v 1.18 2006/11/06 20:04:32 jkois Exp $ - basiert auf: 1.45 + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.7 2007/11/11 21:05:22 miwi Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/sgml-primer/chapter.sgml,v 1.19 2007/11/10 15:58:41 miwi Exp $ + basiert auf: 1.46 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#6 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.33 2007/08/21 19:09:00 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/eresources/chapter.sgml,v 1.70 2007/08/19 17:16:38 jkois Exp $ - basiert auf: 1.182 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.34 2007/11/11 21:05:22 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/eresources/chapter.sgml,v 1.71 2007/11/10 15:11:47 miwi Exp $ + basiert auf: 1.183 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#8 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.26 2007/08/21 19:09:00 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.53 2007/08/19 16:59:47 jkois Exp $ - basiert auf: 1.120 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.27 2007/11/11 21:05:22 miwi Exp $ + $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.54 2007/11/09 07:51:52 jkois Exp $ + basiert auf: 1.121 --> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#3 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml,v 1.2 2007/10/19 09:56:49 jkois Exp $ - $FreeBSDde: de-docproj/books/porters-handbook/book.sgml,v 1.139 2007/10/19 09:09:01 jkois Exp $ - basiert auf: 1.878 + $FreeBSD: doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml,v 1.3 2007/11/11 21:05:22 miwi Exp $ + $FreeBSDde: de-docproj/books/porters-handbook/book.sgml,v 1.142 2007/11/09 08:21:44 jkois Exp $ + basiert auf: 1.885 --> 6.1-STABLE nachdem 802.11 Reparaturen die API der IEEE80211_IOC_STA_INFO ioctl geändert haben. - 601104 + 601105 @@ -12611,7 +12611,20 @@ CURRENT. 602112 - + + 6.2-STABLE, nach der Trennung in "wide und + single byte ctype". Neu kompilierte Binärdateien, + die ctype.h referenzieren, erfordern möglicherweise + ein neues Symbol, __mb_sb_limit, das auf älteren + Systemen nicht verfügbar ist. + 602113 + + + 6.2-STABLE, nachdem die ctype + ABI-Aufwärtskompatibilität wiederhergestellt + wurde. + 602114 + 7.0-CURRENT. 700000 @@ -12972,6 +12985,20 @@ 700053 + 7.0-STABLE, nach der Trennung in "wide und + single byte ctype". + 700054 + + + 7.0-STABLE, nachdem die + ABI-Abwärtskompatibilität für die + FreeBSD 4/5/6-Versionen der PCIOCGETCONF-, PCIOCREAD- + sowie PCIOCWRITE IOCTLs hinzugefügt wurde. Damit + verbunden war, dass die ABI der PCIOCGETCONF IOCTL + erneut deaktiviert werden musste. + 700055 + + 8.0-CURRENT. Nach der Trennung in "wide und single byte ctype". 800000 @@ -12981,6 +13008,21 @@ tcpdump 3.9.8 importiert wurden. 800001 + + 8.0-CURRENT, nachdem kthread_create() und + Konsorten in kproc_create() usw. umbenannt + wurden. + 800002 + + + 8.0-CURRENT, nachdem die + ABI-Abwärtskompatibilität für die + FreeBSD 4/5/6-Versionen der PCIOCGETCONF-, PCIOCREAD- + sowie PCIOCWRITE IOCTLs hinzugefügt wurde. Damit + verbunden war, dass die ABI der PCIOCGETCONF IOCTL + erneut deaktiviert werden musste. + 800003 + ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#6 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -280,6 +280,10 @@ providers"> freebsd-isp"> + +FreeBSD jails mailing list"> +freebsd-jail"> + FreeBSD Java Language"> freebsd-java"> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/teams.ent#3 (text+ko) ==== @@ -12,13 +12,15 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/de_DE.ISO8859-1/share/sgml/teams.ent,v 1.10 2004/11/29 00:10:24 mheinen Exp $ - $FreeBSDde: de-docproj/share/sgml/teams.ent,v 1.12 2004/11/03 23:37:33 mheinen Exp $ - basiert auf: 1.15 + $FreeBSD: doc/de_DE.ISO8859-1/share/sgml/teams.ent,v 1.11 2007/11/11 21:05:21 miwi Exp $ + $FreeBSDde: de-docproj/share/sgml/teams.ent,v 1.13 2007/11/10 15:13:23 miwi Exp $ + basiert auf: 1.18 --> admins@FreeBSD.org"> +bugmeister@FreeBSD.org"> + core-secretary@FreeBSD.org "> cvsadm@FreeBSD.org"> @@ -39,10 +41,14 @@ ncvs@FreeBSD.org"> +perforce-admin@FreeBSD.org"> + pcvs@FreeBSD.org"> portmgr@FreeBSD.org"> +portmgr-secretary@FreeBSD.org"> + projcvs@FreeBSD.org"> re@FreeBSD.org"> ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#3 (text+ko) ==== @@ -1,15 +1,15 @@ FreeBSD ist ein eingetragenes Warenzeichen von - Wind River Systems, Inc. Dies soll sich bald ändern. + der FreeBSD Foundation. UNIX ist ein eingetragenes Warenzeichen von The Open Group in den Vereinigten Staaten und in anderen Ländern. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 (text+ko) ==== @@ -1,7 +1,7 @@ autoconf to regenerate configure, do not take the diffs of configure (it often grows to a few thousand - lines!); define USE_AUTOTOOLS=autoconf:261 and take the - diffs of configure.in. + lines!); define USE_AUTOTOOLS=autoconf:261 and + take the diffs of configure.in. + + Also, try to minimize the amount of non-functional whitespace + changes in your patches. It is common in Open Source world that + projects share large amount of code base, but obey different style + and indenting rules. If you take working piece of functionality from + one project to fix similar area in another, please be careful: the + resulting line patch may be full of non-functional changes. It does + not only increase the size of the CVS repository but makes it hard + to find out what had exactly caused the problem and what did you + change at all. If you had to delete a file, then you can do it in the post-extract target rather than as part of ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#3 (text+ko) ==== @@ -2,31 +2,11 @@ The FreeBSD Documentation Project --> - - - - -%man; - %freebsd; - %newsgroups; - -%authors; - -%trademarks; - -%translators; - %mailing-lists; - -]> -
Argentina.com : Un estudio de caso @@ -42,7 +22,7 @@ - $FreeBSD: doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml,v 1.2 2006/06/14 08:01:23 pav Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml,v 1.3 2007/11/08 21:49:09 carvay Exp $ &tm-attrib.freebsd; ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#3 (text+ko) ==== @@ -1,22 +1,13 @@ -%man; - %freebsd; - %newsgroups; - -%authors; - %mailing-lists; - -%translators; - + +%articles.ent; ]>
Contribuir a FreeBSD - $FreeBSD: doc/es_ES.ISO8859-1/articles/contributing/article.sgml,v 1.3 2005/03/09 17:26:09 jcamou Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/contributing/article.sgml,v 1.4 2007/11/08 21:49:09 carvay Exp $ En éste artículo se describen las diferentes ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#3 (text+ko) ==== @@ -1,34 +1,14 @@ - - -%man; - %freebsd; - %newsgroups; - -%authors; - -%trademarks; - -%translators; - %mailing-lists; - -]> - - -
Configurar un repositorio CVS - a la manera de FreeBSD @@ -48,7 +28,7 @@ Stijn Hoop - $FreeBSD: doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml,v 1.3 2005/03/07 10:14:22 jcamou Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml,v 1.4 2007/11/08 21:49:10 carvay Exp $ &tm-attrib.freebsd; ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#3 (text+ko) ==== @@ -3,11 +3,8 @@ --> -%man; - -%translators; - + +%articles.ent; ]>
@@ -25,7 +22,7 @@ - $FreeBSD: doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml,v 1.2 2005/01/12 20:39:26 carvay Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml,v 1.3 2007/11/08 21:49:10 carvay Exp $ En éste artículo se describe cómo ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/article.sgml#3 (text+ko) ==== @@ -1,21 +1,10 @@ -%man; - - -%freebsd; - - -%authors; - - -%mailing-lists; - -%translators; + +%articles.ent; ]> @@ -44,7 +33,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/es_ES.ISO8859-1/articles/euro/article.sgml,v 1.2 2005/03/09 19:04:24 jcamou Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/euro/article.sgml,v 1.3 2007/11/08 21:49:10 carvay Exp $ + -%man; - -%freebsd; - -%translators; - + +%articles.ent; ]>
==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 (text+ko) ==== @@ -1,11 +1,7 @@ -%man; - -%freebsd; + +%articles.ent; FreeBSD From Scratch"> - -%translators; ]>
@@ -24,7 +20,7 @@ Jens Schweikhardt - $FreeBSD: doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.2 2005/01/12 20:39:26 carvay Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.3 2007/11/08 21:49:10 carvay Exp $ ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#2 (text+ko) ==== @@ -1,21 +1,11 @@ -%man; - -%freebsd; - -%mailing-lists; - -%es-mailing-lists; - -%authors; - -%translators; + +%articles.ent; ]>
==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#3 (text+ko) ==== @@ -1,24 +1,13 @@ -%man; - - -%freebsd; - - -%authors; - - -%mailing-lists; - -%translators; + +%articles.ent; ]>
FreeBSD en ordenadores portátiles - $FreeBSD: doc/es_ES.ISO8859-1/articles/laptop/article.sgml,v 1.3 2005/01/12 20:39:26 carvay Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/laptop/article.sgml,v 1.4 2007/11/08 21:49:10 carvay Exp $ FreeBSD funciona perfectamente en la mayoría de ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#3 (text+ko) ==== @@ -1,27 +1,11 @@ - -%man; - -%freebsd; - -%newsgroups; - -%authors; - -%mailing-lists; - -%translators; - -%trademarks; - - - + +%articles.ent; ]>
==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#3 (text+ko) ==== @@ -2,28 +2,10 @@ The FreeBSD Documentation Project --> - - - -%man; - %freebsd; - %newsgroups; - -%authors; - -%trademarks; - -%translators; - %mailing-lists; - -]>
<application>Perforce</application> en el contexto del desarrollo de &os; @@ -41,7 +23,7 @@ - $FreeBSD: doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml,v 1.2 2006/06/14 09:29:27 pav Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml,v 1.3 2007/11/08 21:49:11 carvay Exp $ &tm-attrib.freebsd; ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#3 (text+ko) ==== @@ -1,18 +1,6 @@ -%man; - %freebsd; - %newsgroups; - -%authors; - -%mailing-lists; - -%translators; - -%trademarks; - + +%articles.ent; ]> @@ -21,7 +9,7 @@ Cómo enviar informes de problemas de &os; - $FreeBSD: doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml,v 1.2 2005/01/12 20:39:27 carvay Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml,v 1.3 2007/11/08 21:49:11 carvay Exp $ ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/article.sgml#3 (text+ko) ==== @@ -1,25 +1,11 @@ -%man; - %freebsd; - %newsgroups; - -%authors; - -%mailing-lists; - -%translators; - -%trademarks; - -%teams; - + +%articles.ent; ]> @@ -49,7 +35,7 @@ url="http://www.FreeBSD.org/~murray/"> - $FreeBSD: doc/es_ES.ISO8859-1/articles/releng/article.sgml,v 1.2 2005/07/02 14:38:46 rwatson Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/articles/releng/article.sgml,v 1.3 2007/11/08 21:49:11 carvay Exp $ &tm-attrib.freebsd; ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#3 (text+ko) ==== @@ -1,14 +1,8 @@ - + -%man; - -%freebsd; - - -%translators; - + +%articles.ent; ]>
==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/book.sgml#3 (text+ko) ==== @@ -1,11 +1,6 @@ -%freebsd; - -%teams; -%bookinfo; - -%mailing-lists; + +%books.ent; ]> @@ -14,7 +9,7 @@ Proyecto de documentación de FreeBSD - $FreeBSD: doc/es_ES.ISO8859-1/books/faq/book.sgml,v 1.25 2005/11/14 10:51:20 jcamou Exp $ + $FreeBSD: doc/es_ES.ISO8859-1/books/faq/book.sgml,v 1.26 2007/11/08 21:49:11 carvay Exp $ 1995 ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/book.sgml#3 (text+ko) ==== @@ -1,31 +1,16 @@ -%man; + +%books.ent; - -%bookinfo; - - -%freebsd; - - -%translators; - - %chapters; - -%authors; - -%teams; - %mailing-lists; - %newsgroups; - %trademarks; + +%chapters; %txtfiles; ==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#3 (text+ko) ==== @@ -6,9 +6,14 @@ es el nombre de la parte externa del elemento en la entidad. Por ejemplo, "bookinfo.legalnotice" y "bookinfo.preface". >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 21:42:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 058BB16A420; Sun, 11 Nov 2007 21:42:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 902DF16A417 for ; Sun, 11 Nov 2007 21:42:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D37813C4B3 for ; Sun, 11 Nov 2007 21:42:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABLg5b9084884 for ; Sun, 11 Nov 2007 21:42:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABLfq1q084859 for perforce@freebsd.org; Sun, 11 Nov 2007 21:41:52 GMT (envelope-from jb@freebsd.org) Date: Sun, 11 Nov 2007 21:41:52 GMT Message-Id: <200711112141.lABLfq1q084859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 21:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=128950 Change 128950 by jb@jb_freebsd1 on 2007/11/11 21:41:51 IF6 Affected files ... .. //depot/projects/dtrace6/src/UPDATING#3 integrate .. //depot/projects/dtrace6/src/bin/sh/eval.c#2 integrate .. //depot/projects/dtrace6/src/bin/sh/sh.1#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/CACerts#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/dtrace6/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/dtrace6/src/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/dtrace6/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/dtrace6/src/etc/namedb/named.root#2 integrate .. //depot/projects/dtrace6/src/etc/network.subr#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/abi#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/accounting#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/archdep#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/bluetooth#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/bridge#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/cleanvar#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/fsck#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/initrandom#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/kerberos#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/lpd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountlate#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/moused#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/named#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/netif#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ppp#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/pppoed#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/resolv#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/root#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/tmp#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/var#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypset#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypupdated#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.subr#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/dtrace6/src/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/dtrace6/src/include/_ctype.h#2 integrate .. //depot/projects/dtrace6/src/include/ctype.h#2 integrate .. //depot/projects/dtrace6/src/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/Makefile#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/big5.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/euc.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/dtrace6/src/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/dtrace6/src/lib/libstand/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/dtrace6/src/release/Makefile#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/dtrace6/src/release/scripts/package-split.py#2 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/clparse.c#2 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/tables.c#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/dtrace6/src/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/axe.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/mac.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/tty.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man7/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/man/man8/rc.8#2 integrate .. //depot/projects/dtrace6/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/dtrace6/src/share/misc/pci_vendors#2 integrate .. //depot/projects/dtrace6/src/share/mklocale/UTF-8.src#2 integrate .. //depot/projects/dtrace6/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/dtrace6/src/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/dtrace6/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/if_em.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/dtrace6/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/dtrace6/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/dtrace6/src/sys/modules/Makefile#3 integrate .. //depot/projects/dtrace6/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/net/bpf.c#2 integrate .. //depot/projects/dtrace6/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/dtrace6/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/dtrace6/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/dtrace6/src/sys/net/route.c#2 integrate .. //depot/projects/dtrace6/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/dtrace6/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/dtrace6/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/dtrace6/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agppriv.h#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/sys/bus.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/param.h#3 integrate .. //depot/projects/dtrace6/src/sys/sys/proc.h#5 integrate .. //depot/projects/dtrace6/src/sys/sys/rman.h#2 integrate .. //depot/projects/dtrace6/src/sys/vm/phys_pager.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/pmap.h#2 integrate .. //depot/projects/dtrace6/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/id/id.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/dtrace6/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/makewhatis/makewhatis.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/dtrace6/src/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/tail/read.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/Makefile#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/menus.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/UPDATING#3 (text+ko) ==== @@ -8,6 +8,17 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. +20071024: + A breakage was introduced in libc and fixed later. Make sure + you have lib/Makefile rev 1.205.2.4. If it already breaks your + world, you can recover it by + + - reboot to single user mode, make sure you use /rescue/sh + instead of /bin/sh + - use /rescue/chflags to remove schg flag on /lib/libc.so.6 + - use /rescue/cp to copy libc.so.6 from /usr/obj to /lib/libc.so.6 + - continue installworld, you should be fine now + 20070806: An incorrect field size in an ioctl struct for if_bridge(4) has been corrected, ifconfig(8) will need to be recompilied. @@ -534,4 +545,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.416.2.35 2007/10/21 04:22:46 julian Exp $ +$FreeBSD: src/UPDATING,v 1.416.2.37 2007/10/25 12:49:21 rafan Exp $ ==== //depot/projects/dtrace6/src/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.42.8.5 2006/11/22 00:17:21 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.42.8.6 2007/10/26 10:23:27 stefanf Exp $"); #include #include @@ -367,6 +367,7 @@ setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; + exitstatus = 0; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { ==== //depot/projects/dtrace6/src/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.102.2.8 2006/11/22 00:23:09 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.102.2.9 2007/10/26 10:23:27 stefanf Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -861,6 +861,10 @@ separated by .Dq Li \&| characters. +The exit code of the +.Ic case +command is the exit code of the last command executed in the list or +zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Bd -literal -offset indent ==== //depot/projects/dtrace6/src/contrib/sendmail/CACerts#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: CACerts,v 8.1 2004/03/01 22:05:47 ca Exp $ +# $Id: CACerts,v 8.3 2007/06/11 22:04:46 ca Exp $ # This file contains some CA certificates that are used to sign the # certificates of mail servers of members of the sendmail consortium # who may reply to questions etc sent to sendmail.org. @@ -78,73 +78,6 @@ Version: 3 (0x2) Serial Number: 0 (0x0) Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net - Validity - Not Before: Jan 1 04:39:54 2002 GMT - Not After : Dec 31 04:39:54 2006 GMT - Subject: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:aa:dd:a2:fe:3b:fa:2f:5c:3d:f1:e1:d4:1d:55: - 04:27:6b:01:62:00:d7:02:cb:74:47:69:84:d7:c6: - c5:71:55:79:35:3a:a8:ce:de:48:23:53:80:3c:cd: - 54:2e:e9:fe:b1:76:5a:be:cb:fd:2d:dc:a3:36:c5: - c7:1e:4e:ef:76:f0:55:8f:a0:a5:f8:07:c5:52:1d: - a2:42:81:4d:8a:c8:42:3f:f3:01:80:f9:46:35:a6: - bc:c0:9b:9f:33:8b:49:9b:1d:87:8f:19:48:15:21: - 23:57:df:6e:4d:03:ed:ae:9f:0b:91:b7:a9:47:66: - f1:0d:1b:1c:5d:b4:57:60:c7 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA - X509v3 Authority Key Identifier: - keyid:A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA - DirName:/C=US/ST=California/L=Emeryville/O=gshapiro.net/CN=Certificate Authority/emailAddress=certificates@gshapiro.net - serial:00 - - X509v3 Basic Constraints: - CA:TRUE - Signature Algorithm: md5WithRSAEncryption - 87:27:d2:2a:3a:dc:04:cd:ef:e8:7b:1c:34:47:2e:13:34:a5: - 08:f9:4d:df:d8:e1:6d:e6:9a:db:38:ee:20:6d:4a:ae:6f:1e: - bc:71:61:a4:b4:d6:40:24:ee:65:ca:e9:81:5a:ef:ee:62:57: - 70:05:46:91:6b:d0:c6:a6:e9:38:65:ae:ea:50:b3:5c:27:c4: - 7a:bd:95:8c:cb:45:ef:fc:fc:99:e5:6a:61:c3:44:77:d8:1f: - d6:b4:17:44:15:9a:bc:26:5b:ec:4e:29:5d:fd:cf:61:f3:be: - 91:a4:3b:51:e6:73:5b:17:82:9d:5a:56:2c:63:c2:f1:d6:a2: - 4c:5a ------BEGIN CERTIFICATE----- -MIIDoTCCAwqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCVVMx -EzARBgNVBAgTCkNhbGlmb3JuaWExEzARBgNVBAcTCkVtZXJ5dmlsbGUxFTATBgNV -BAoTDGdzaGFwaXJvLm5ldDEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5 -MSgwJgYJKoZIhvcNAQkBFhljZXJ0aWZpY2F0ZXNAZ3NoYXBpcm8ubmV0MB4XDTAy -MDEwMTA0Mzk1NFoXDTA2MTIzMTA0Mzk1NFowgZgxCzAJBgNVBAYTAlVTMRMwEQYD -VQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxlMRUwEwYDVQQKEwxn -c2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEoMCYG -CSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5ldDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAqt2i/jv6L1w98eHUHVUEJ2sBYgDXAst0R2mE18bF -cVV5NTqozt5II1OAPM1ULun+sXZavsv9LdyjNsXHHk7vdvBVj6Cl+AfFUh2iQoFN -ishCP/MBgPlGNaa8wJufM4tJmx2HjxlIFSEjV99uTQPtrp8LkbepR2bxDRscXbRX -YMcCAwEAAaOB+DCB9TAdBgNVHQ4EFgQUoG3gBq9hlLTGhBW0i3QiZ0pDYMowgcUG -A1UdIwSBvTCBuoAUoG3gBq9hlLTGhBW0i3QiZ0pDYMqhgZ6kgZswgZgxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxl -MRUwEwYDVQQKEwxnc2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1 -dGhvcml0eTEoMCYGCSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5l -dIIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAIcn0io63ATN7+h7 -HDRHLhM0pQj5Td/Y4W3mmts47iBtSq5vHrxxYaS01kAk7mXK6YFa7+5iV3AFRpFr -0Mam6ThlrupQs1wnxHq9lYzLRe/8/JnlamHDRHfYH9a0F0QVmrwmW+xOKV39z2Hz -vpGkO1Hmc1sXgp1aVixjwvHWokxa ------END CERTIFICATE----- - - -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 0 (0x0) - Signature Algorithm: md5WithRSAEncryption Issuer: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rickert@cs.niu.edu Validity Not Before: May 12 00:40:50 2000 GMT @@ -210,93 +143,94 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 0 (0x0) + Serial Number: + fa:7c:2c:80:29:3f:c2:64 Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org + Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org Validity - Not Before: Aug 7 15:56:45 2003 GMT - Not After : Aug 6 15:56:45 2006 GMT - Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org + Not Before: May 4 02:07:56 2007 GMT + Not After : May 3 02:07:56 2010 GMT + Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (2048 bit) Modulus (2048 bit): - 00:aa:37:0f:09:a9:1c:e3:1a:0c:fe:bd:6c:37:a4: - cf:87:db:af:6b:b4:19:d4:11:db:c6:56:ca:39:80: - c6:a4:38:b0:bc:ac:7e:be:71:30:86:2c:dc:fa:b5: - fd:58:23:a0:c1:ad:11:53:85:ca:fb:e6:d8:7e:28: - eb:84:3b:cd:a3:fa:28:a5:cb:c7:b2:54:99:3e:40: - 2a:27:43:4b:0c:26:4b:af:97:3d:92:82:d9:eb:2c: - 7f:77:fd:b8:cd:7e:1e:04:81:17:3c:e2:44:68:ce: - 88:66:02:90:24:35:24:c4:4c:ad:77:04:1a:3a:d5: - 59:28:28:03:da:03:9d:f4:2e:52:6e:b5:36:96:4b: - 14:f8:fc:8e:c6:d3:9b:e2:80:90:8b:71:d7:d0:5c: - 43:b2:49:f1:5a:26:f3:5d:9e:3b:01:98:db:e3:ed: - 5e:8d:dd:cf:aa:68:9d:0b:c9:e2:4e:fc:16:44:72: - 93:07:62:18:05:c1:47:81:3c:3d:e4:e4:22:da:2c: - d6:4a:44:52:06:7a:83:b5:e9:52:38:97:2f:75:a6: - 5c:6f:87:8a:8d:83:f4:d0:04:a5:34:18:5e:a1:06: - 16:b3:54:ce:64:47:ca:70:56:a3:6f:b9:7f:af:91: - 76:78:70:b4:ab:ae:8e:d5:22:26:57:b1:ba:e7:4b: - 18:21 + 00:b0:28:91:31:af:82:ce:72:ef:36:ab:7d:e9:b1: + f5:77:66:38:4b:38:1f:5f:3d:12:d3:c8:fd:9a:f4: + d4:f6:b8:90:f9:26:5f:29:f7:43:f9:34:ec:65:62: + 01:bb:64:f1:5d:ea:75:04:3d:92:65:60:a2:06:62: + fa:88:ca:d8:20:50:c8:1e:38:53:b5:18:dd:b7:bd: + c7:08:35:4c:d9:dc:c6:97:56:37:b6:65:33:74:5a: + b2:c3:85:08:2b:b7:26:70:ff:38:02:1a:67:6a:d0: + 49:18:10:4b:f8:db:af:06:9c:b1:a8:82:a1:b1:75: + d2:52:9b:53:0c:ca:a7:e3:15:38:79:6d:a1:f5:ef: + 7c:8b:fd:bd:04:78:f9:e8:1e:b9:92:ea:74:d7:45: + 1e:4c:c8:bd:f4:5c:fc:1a:7f:e7:31:c6:ab:cb:78: + c7:4d:2f:b5:72:10:35:27:4a:1a:fa:53:19:f8:a7: + 59:63:eb:e9:15:ab:dc:71:69:8c:42:1c:96:4e:89: + 80:66:c9:9e:21:d5:3d:08:19:74:a5:f5:07:a0:ae: + de:79:af:fd:42:c2:79:7e:8c:f8:39:22:3b:c3:c4: + 58:3b:d0:0d:e6:a9:11:b6:a2:cd:2e:e5:16:66:fd: + 7e:65:33:94:b0:36:80:27:f5:80:76:a9:e5:df:f2: + cf:ef Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - 3A:12:03:DB:0F:9E:28:45:A6:34:8D:38:AB:BA:47:8C:2A:A0:E4:2E + B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C X509v3 Authority Key Identifier: - keyid:3A:12:03:DB:0F:9E:28:45:A6:34:8D:38:AB:BA:47:8C:2A:A0:E4:2E - DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org - serial:00 + keyid:B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C + DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org + serial:FA:7C:2C:80:29:3F:C2:64 X509v3 Basic Constraints: - CA:TRUE + CA:TRUE X509v3 Subject Alternative Name: - email:ca+ca-rsa2003@esmtp.org + email:ca+ca-rsa2007@esmtp.org X509v3 Issuer Alternative Name: - email:ca+ca-rsa2003@esmtp.org + email:ca+ca-rsa2007@esmtp.org Signature Algorithm: md5WithRSAEncryption - 96:83:b6:54:93:df:38:d0:48:a7:a1:c8:08:c9:0f:e9:80:05: - e3:7e:c3:61:51:88:7b:7a:bb:24:b0:69:a3:22:e4:98:38:da: - c8:c3:eb:52:70:63:e2:66:f2:59:ef:56:be:aa:7c:87:6e:94: - 85:d4:71:ba:35:f7:ee:d0:6e:52:1d:1f:e4:fd:2f:e2:70:31: - 5d:b7:8b:13:cc:70:10:21:fa:34:29:8f:8d:d8:4a:c7:0f:b2: - 36:e7:1e:1e:46:d1:11:84:80:7c:bb:24:c4:63:be:2a:24:53: - 74:0c:89:e0:6a:f4:08:63:bf:54:d3:0a:d9:fc:fe:6c:de:4f: - 97:61:08:a0:10:92:eb:af:06:ec:50:86:c4:cc:6b:31:32:60: - 25:7a:09:47:f8:42:7a:a2:d5:90:fa:48:be:bf:0a:e1:03:b8: - 56:24:b9:12:e9:ba:09:30:47:be:a5:8e:a2:92:a4:dc:a6:a7: - c6:29:39:65:6e:64:4a:1b:b2:c3:07:29:f5:c0:7e:78:e0:22: - 9b:98:d4:87:91:ca:e1:66:9d:2f:70:f1:4c:a5:8e:2e:68:52: - b3:bd:95:76:56:40:0e:46:47:e4:b3:ec:aa:3c:e8:86:96:5a: - ed:fa:c9:10:95:53:04:13:71:01:91:ce:cd:3a:51:c6:30:e9: - 48:49:64:a3 + 98:98:7c:d3:d0:5b:72:47:15:e6:22:68:bb:78:0e:78:66:e9: + 56:16:d8:bc:9d:5a:dc:27:29:fb:91:2d:6a:21:35:18:56:b4: + 4f:2a:09:c0:08:6f:9a:59:2b:2e:72:9a:fb:50:ba:c7:a9:91: + a0:f9:6c:be:cf:78:42:43:02:70:53:97:ba:6a:e3:da:17:e8: + 1f:c7:3a:5b:e7:bc:eb:e5:24:4c:f5:cf:61:34:1e:20:ed:17: + 63:ef:81:d3:9e:25:fe:cc:05:19:cc:8a:82:c9:4c:3a:b5:6b: + 49:51:76:46:02:aa:60:bb:c4:b9:61:48:33:da:79:8d:46:a3: + 06:20:98:f3:b2:db:3b:ad:c9:1d:0e:97:3d:b7:14:19:d3:7d: + 04:8b:6a:81:e0:11:5b:e1:35:a3:ff:2f:11:86:1c:31:85:7a: + fd:3f:36:ef:99:25:46:2e:b0:cb:43:45:4a:ec:be:d3:3f:a4: + 77:9b:79:cc:ce:92:63:a5:d9:ed:db:a0:9d:5d:7c:d7:80:f6: + c9:41:fb:02:96:8e:fd:f3:da:05:9d:81:a7:25:da:26:35:3b: + a9:0c:8c:f5:a7:5d:48:ec:87:c7:7a:60:51:76:f2:de:9b:14: + 2b:55:8a:43:df:99:19:f3:eb:e7:03:e6:a7:a2:a2:28:dd:d5: + 07:6a:3f:f7 -----BEGIN CERTIFICATE----- -MIIFFzCCA/+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx -EzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRQwEgYDVQQK -EwtFbmRtYWlsIE9yZzEMMAoGA1UECxMDTVRBMSIwIAYDVQQDExlDbGF1cyBBc3Nt -YW5uIENBIFJTQSAyMDAzMSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDAzQGVz -bXRwLm9yZzAeFw0wMzA4MDcxNTU2NDVaFw0wNjA4MDYxNTU2NDVaMIGlMQswCQYD +MIIFJzCCBA+gAwIBAgIJAPp8LIApP8JkMA0GCSqGSIb3DQEBBAUAMIGlMQswCQYD VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx FDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNNVEExIjAgBgNVBAMTGUNs -YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDMxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz -YTIwMDNAZXNtdHAub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -qjcPCakc4xoM/r1sN6TPh9uva7QZ1BHbxlbKOYDGpDiwvKx+vnEwhizc+rX9WCOg -wa0RU4XK++bYfijrhDvNo/oopcvHslSZPkAqJ0NLDCZLr5c9koLZ6yx/d/24zX4e -BIEXPOJEaM6IZgKQJDUkxEytdwQaOtVZKCgD2gOd9C5SbrU2lksU+PyOxtOb4oCQ -i3HX0FxDsknxWibzXZ47AZjb4+1ejd3PqmidC8niTvwWRHKTB2IYBcFHgTw95OQi -2izWSkRSBnqDtelSOJcvdaZcb4eKjYP00ASlNBheoQYWs1TOZEfKcFajb7l/r5F2 -eHC0q66O1SImV7G650sYIQIDAQABo4IBTjCCAUowHQYDVR0OBBYEFDoSA9sPnihF -pjSNOKu6R4wqoOQuMIHSBgNVHSMEgcowgceAFDoSA9sPnihFpjSNOKu6R4wqoOQu -oYGrpIGoMIGlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8G -A1UEBxMIQmVya2VsZXkxFDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNN -VEExIjAgBgNVBAMTGUNsYXVzIEFzc21hbm4gQ0EgUlNBIDIwMDMxJjAkBgkqhkiG -9w0BCQEWF2NhK2NhLXJzYTIwMDNAZXNtdHAub3JnggEAMAwGA1UdEwQFMAMBAf8w -IgYDVR0RBBswGYEXY2ErY2EtcnNhMjAwM0Blc210cC5vcmcwIgYDVR0SBBswGYEX -Y2ErY2EtcnNhMjAwM0Blc210cC5vcmcwDQYJKoZIhvcNAQEEBQADggEBAJaDtlST -3zjQSKehyAjJD+mABeN+w2FRiHt6uySwaaMi5Jg42sjD61JwY+Jm8lnvVr6qfIdu -lIXUcbo19+7QblIdH+T9L+JwMV23ixPMcBAh+jQpj43YSscPsjbnHh5G0RGEgHy7 -JMRjviokU3QMieBq9Ahjv1TTCtn8/mzeT5dhCKAQkuuvBuxQhsTMazEyYCV6CUf4 -Qnqi1ZD6SL6/CuEDuFYkuRLpugkwR76ljqKSpNymp8YpOWVuZEobssMHKfXAfnjg -IpuY1IeRyuFmnS9w8Uylji5oUrO9lXZWQA5GR+Sz7Ko86IaWWu36yRCVUwQTcQGR -zs06UcYw6UhJZKM= +YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDcxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz +YTIwMDdAZXNtdHAub3JnMB4XDTA3MDUwNDAyMDc1NloXDTEwMDUwMzAyMDc1Nlow +gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhC +ZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAKBgNVBAsTA01UQTEiMCAG +A1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEmMCQGCSqGSIb3DQEJARYX +Y2ErY2EtcnNhMjAwN0Blc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCwKJExr4LOcu82q33psfV3ZjhLOB9fPRLTyP2a9NT2uJD5Jl8p90P5 +NOxlYgG7ZPFd6nUEPZJlYKIGYvqIytggUMgeOFO1GN23vccINUzZ3MaXVje2ZTN0 +WrLDhQgrtyZw/zgCGmdq0EkYEEv4268GnLGogqGxddJSm1MMyqfjFTh5baH173yL +/b0EePnoHrmS6nTXRR5MyL30XPwaf+cxxqvLeMdNL7VyEDUnShr6Uxn4p1lj6+kV +q9xxaYxCHJZOiYBmyZ4h1T0IGXSl9Qegrt55r/1Cwnl+jPg5IjvDxFg70A3mqRG2 +os0u5RZm/X5lM5SwNoAn9YB2qeXf8s/vAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU +sklrUkXukDbSeUcDM9mguoBQ2hwwgdoGA1UdIwSB0jCBz4AUsklrUkXukDbSeUcD +M9mguoBQ2hyhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y +bmlhMREwDwYDVQQHEwhCZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAK +BgNVBAsTA01UQTEiMCAGA1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEm +MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAwN0Blc210cC5vcmeCCQD6fCyAKT/C +ZDAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAu +b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAub3JnMA0GCSqGSIb3 +DQEBBAUAA4IBAQCYmHzT0FtyRxXmImi7eA54ZulWFti8nVrcJyn7kS1qITUYVrRP +KgnACG+aWSsucpr7ULrHqZGg+Wy+z3hCQwJwU5e6auPaF+gfxzpb57zr5SRM9c9h +NB4g7Rdj74HTniX+zAUZzIqCyUw6tWtJUXZGAqpgu8S5YUgz2nmNRqMGIJjzsts7 +rckdDpc9txQZ030Ei2qB4BFb4TWj/y8RhhwxhXr9PzbvmSVGLrDLQ0VK7L7TP6R3 +m3nMzpJjpdnt26CdXXzXgPbJQfsClo7989oFnYGnJdomNTupDIz1p11I7IfHemBR +dvLemxQrVYpD35kZ8+vnA+anoqIo3dUHaj/3 -----END CERTIFICATE----- ==== //depot/projects/dtrace6/src/contrib/sendmail/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.28.2.3 2007/04/12 03:11:33 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.28.2.4 2007/11/11 17:07:33 gshapiro Exp $ -sendmail 8.14.1 +sendmail 8.14.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.14.1' \ - src/contrib/sendmail SENDMAIL v8_14_1 + cvs import -m 'Import sendmail 8.14.2' \ + src/contrib/sendmail SENDMAIL v8_14_2 After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: @@ -97,4 +97,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -11-April-2007 +11-November-2007 ==== //depot/projects/dtrace6/src/contrib/sendmail/INSTALL#2 (text+ko) ==== @@ -12,13 +12,13 @@ 2. Create any necessary site configuration build files, as noted in devtools/Site/README. -3. In the sendmail/ directory, run "sh Build" (see sendmail/README for +3. In the sendmail/ directory, run "sh ./Build" (see sendmail/README for details). 4. Change to the cf/cf/ directory (that's not a typo): Copy whichever .mc file best matches your environment to sendmail.mc. Next, tailor it as explained in cf/README. Then run - "sh Build sendmail.cf". + "sh ./Build sendmail.cf". 5. Back up your current /etc/mail/sendmail.cf and the sendmail binary (whose location varies from operating system to operating system, but is usually @@ -26,21 +26,21 @@ 6. Install sendmail.cf as /etc/mail/sendmail.cf and submit.cf as /etc/mail/submit.cf. This can be done in the cf/cf by using - "sh Build install-cf". + "sh ./Build install-cf". Please read sendmail/SECURITY before continuing; you have to create a new user smmsp and a new group smmsp for the default installation. Then install the sendmail binary built in step 3 by cd-ing back to - sendmail/ and running "sh Build install". + sendmail/ and running "sh ./Build install". 7. For each of the associated sendmail utilities (makemap, mailstats, etc.), read the README in the utility's directory if it exists. When - you are ready to install it, back up your installed version and type "sh - Build install". + you are ready to install it, back up your installed version and type + "sh ./Build install". 8. If you are upgrading from an older version of sendmail and are using any database maps, be sure to rebuild them with the new version of makemap, in case you are now using a different (and thereby incompatible) version of Berkeley DB. -$Revision: 8.15 $, Last updated $Date: 2002/05/28 18:09:25 $ +$Revision: 8.16 $, Last updated $Date: 2007/10/03 21:00:28 $ ==== //depot/projects/dtrace6/src/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ==== @@ -1,11 +1,76 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1888 2007/04/03 23:28:40 ca Exp $ + $Id: RELEASE_NOTES,v 8.1909 2007/10/31 16:04:13 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.14.2/8.14.2 2007/11/01 + If a message was queued and it contained 8 bit characters in + a From: or To: header, then those characters could be + "mistaken" for internal control characters during a queue + run and trigger various consistency checks. Problem + noted by Neil Rickert of Northern Illinois University. + If MaxMimeHeaderLength is set to a value greater than 0 (which + it is by default) then even if the Linelimit parameter + is 0, sendmail corrupted in the non-transfer-encoding + case every MAXLINE-1 characters. Patch from John Gardiner + Myers of Proofpoint. + Setting the suboption DeliveryMode for DaemonPortOptions did not + work in earlier 8.14 versions. + Note: DeliveryMode=interactive is silently converted to + background if a milter can reject or delete a recipient. + Prior to 8.14 this happened only if milter could delete + recipients. + ClientRate should trigger when the limit was exceeded (as + documented), not when it was reached. Patch from + John Beck of Sun Microsystems. + Force a queue run for -qGqueuegroup even if no runners are + specified (R=0) and forking (F=f) is requested. + When multiple results are requested for a DNS map lookup + (-z and -Z), return only those that are relevant for + the query (not also those in the "additional section".) + If the message transfer time to sendmail (when acting as server) + exceeds Timeout.queuewarn or Timeout.queuereturn and + the message is refused (by a milter), sendmail previously + created a delivery status notification (DSN). Patch + from Doug Heath of The Hertz Corporation. + A code change in Cyrus-SASL 2.1.22 for sasl_decode64() requires + the MTA to deal with some input (i.e., "=") itself. + Problem noted by Eliot Lear. + sendmail counted a delivery as successful if PIPELINING is + compiled in but not offered by the server and the + delivery failed temporarily. Patch from Werner Wiethege. + If getting the result of an LDAP query times out then close the + map so it will be reopened on the next lookup. This + should help "failover" configurations that specify more + than one LDAP server. + If check_compat returns $#discard then a "savemail panic" could + be triggered under some circumstances (e.g., requiring + a system which does not have the compile time flag + HASFLOCK set). Based on patch by Motonori Nakamura + of National Institute of Informatics, Japan. + If a milter rejected a recipient, the count for nrcpts= in the + logfile entry might have been wrong. Problem found by + Petra Humann of TU Dresden. + If a milter invoked smfi_chgfrom() where ESMTP arguments are not + NULL, the message body was lost. Patch from Motonori + Nakamura of National Institute of Informatics, Japan. + sendmail(8) had a bogus space in -qGname. Patch from Peng Haitao. + CONTRIB: buildvirtuser: Preserve ownership and permissions when + replacing files. + CONTRIB: buildvirtuser: Skip dot-files (e.g., .cvsignore) when + reading the /etc/mail/virtusers/ directory. + CONTRIB: buildvirtuser: Emit warnings instead of exiting where + appropriate. + LIBMILTER: Fix ABI backwards compatibility so milters compiled + against an older libmilter.so shared library can use an + 8.14 libmilter.so shared library. + LIBMILTER: smfi_version() did not properly extract the patchlevel + from the version number, however, the returned value was + correct for the current libmilter version. + 8.14.1/8.14.1 2007/04/03 Even though a milter rejects a recipient the MTA will still keep it in its list of recipients and deliver to it if the ==== //depot/projects/dtrace6/src/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ==== @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by ca@nother.smi.sendmail.com on Tue Apr 3 16:32:55 PDT 2007 -##### in /extra/home/ca/sm-8.14.1/OpenSource/sendmail-8.14.1/cf/cf +##### built by ca@nother.smi.sendmail.com on Wed Oct 31 09:24:27 PDT 2007 +##### in /extra/home/ca/sm-8.14.2/OpenSource/sendmail-8.14.2/cf/cf ##### using ../ as configuration include directory ##### ###################################################################### @@ -35,7 +35,7 @@ ##### $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $ ##### -##### $Id: proto.m4,v 8.730 2007/02/01 18:50:03 ca Exp $ ##### +##### $Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $ ##### # level 10 config file format V10/Berkeley @@ -114,7 +114,7 @@ # Configuration version number -DZ8.14.1/Submit +DZ8.14.2/Submit ############### ==== //depot/projects/dtrace6/src/contrib/sendmail/cf/feature/ldap_routing.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1999-2002, 2004 Sendmail, Inc. and its suppliers. +# Copyright (c) 1999-2002, 2004, 2007 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`$Id: ldap_routing.m4,v 8.14 2004/02/18 02:45:11 gshapiro Exp $') +VERSIONID(`$Id: ldap_routing.m4,v 8.15 2007/05/01 17:38:25 ca Exp $') divert(-1) # Check first two arguments. If they aren't set, may need to warn in proto.m4 ==== //depot/projects/dtrace6/src/contrib/sendmail/cf/m4/proto.m4#2 (text+ko) ==== @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`$Id: proto.m4,v 8.730 2007/02/01 18:50:03 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -2962,9 +2962,9 @@ R<$* _ATMPF_> $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl') dnl use the generic routine (for now) R<0> $@ OK no limit -R<$+> $: <$1> $| $(arith l $@ $&{client_rate} $@ $1 $) +R<$+> $: <$1> $| $(arith l $@ $1 $@ $&{client_rate} $) dnl log this? Connection rate $&{client_rate} exceeds limit $1. -R<$+> $| FALSE $#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded. +R<$+> $| TRUE $#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded. ')') ifdef(`_CONN_CONTROL_',`dnl @@ -2984,9 +2984,9 @@ R<$* _ATMPF_> $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl') dnl use the generic routine (for now) R<0> $@ OK no limit -R<$+> $: <$1> $| $(arith l $@ $&{client_connections} $@ $1 $) +R<$+> $: <$1> $| $(arith l $@ $1 $@ $&{client_connections} $) dnl log this: Open connections $&{client_connections} exceeds limit $1. -R<$+> $| FALSE $#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections. +R<$+> $| TRUE $#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections. ')') undivert(9)dnl LOCAL_RULESETS ==== //depot/projects/dtrace6/src/contrib/sendmail/cf/m4/version.m4#2 (text+ko) ==== @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.178 2007/04/03 21:21:18 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $') # divert(0) # Configuration version number -DZ8.14.1`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/dtrace6/src/contrib/sendmail/contrib/buildvirtuser#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# Copyright (c) 1999-2003 Gregory Neil Shapiro. All Rights Reserved. +# Copyright (c) 1999-2004, 2007 Gregory Neil Shapiro. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -27,7 +27,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: buildvirtuser,v 1.6 2003/03/15 23:30:09 gshapiro Exp $ +# $Id: buildvirtuser,v 1.8 2007/10/08 18:44:15 gshapiro Exp $ =head1 NAME @@ -70,30 +70,21 @@ =head1 EXAMPLES -Here are some example files from the /etc/mail/virtusers/ directory: +Here is an example file from the /etc/mail/virtusers/ directory: -=head2 /etc/mail/virtusers/bsdunix.org: +=head2 /etc/mail/virtusers/example.org: # Services - MAILER-DAEMON gshapiro+bounce.$DOMAIN@gshapiro.net - postmaster gshapiro+$LHS.$DOMAIN@gshapiro.net - webmaster gshapiro+$LHS.$DOMAIN@gshapiro.net + MAILER-DAEMON gshapiro+bounce.$DOMAIN@example.net + postmaster gshapiro+$LHS.$DOMAIN@example.net + webmaster gshapiro+$LHS.$DOMAIN@example.net # Defaults error:nouser No such user # Users - gshapiro gshapiro+$DOMAIN@gshapiro.net - bob robert@smtp.org - -=head2 /etc/mail/virtusers/smtp.org: - - # Defaults - gshapiro+$DOMAIN@gshapiro.net - - # Users - john john@wookie.org - nancy n@milter.com + gshapiro gshapiro+$DOMAIN@example.net + zoe zoe@example.com =head1 AUTHOR @@ -102,6 +93,7 @@ =cut use strict; +use File::stat; use Getopt::Std; my $makemap = "/usr/sbin/makemap"; @@ -117,6 +109,18 @@ my ($lhs, $domain, $key, $value); my $opts = {}; +sub preserve_perms ($$) +{ + my $old = shift; + my $new = shift; + my $st; + + $st = stat($old); + return if (!defined($st)); + chmod($st->mode, $new) || warn "Could not chmod($st->mode, $new): $!\n"; + chown($st->uid, $st->gid, $new) || warn "Could not chmod($st->uid, $st->gid, $new): $!\n"; +} + getopts('ft', $opts) || die "Usage: $0 [-f] [-t]\n"; if ($opts->{t}) @@ -131,9 +135,12 @@ foreach $domain (@virts) { + next if ($domain =~ m/^\./); open(DOMAIN, "$virts/$domain") || die "Could not open file $virts/$domain: $!\n"; my $line = 0; - my $mtime = (stat(DOMAIN))[9] || 0; + my $mtime = 0; + my $st = stat("$virts/$domain"); + $mtime = $st->mtime if (defined($st)); if ($mtime > $newest) { $newest = $mtime; @@ -160,7 +167,7 @@ } else { - die "Bogus line $line in $virts/$domain\n"; + warn "Bogus line $line in $virts/$domain\n"; } # Variable subsitution @@ -172,7 +179,9 @@ close(DOMAIN) || die "Could not close $virts/$domain: $!\n"; } -my $virtmtime = (stat($virt))[9] || 0; +my $virtmtime = 0; +my $st = stat($virt); +$virtmtime = $st->mtime if (defined($st)); if ($opts->{f} || $virtmtime < $newest) { print STDOUT "Rebuilding $virt\n"; @@ -191,14 +200,17 @@ print MAKEMAP "$key\t\t$virt{$key}\n"; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 11 23:08:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F5F716A46B; Sun, 11 Nov 2007 23:08:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 192B116A417 for ; Sun, 11 Nov 2007 23:08:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E07AB13C49D for ; Sun, 11 Nov 2007 23:08:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lABN8aGo090973 for ; Sun, 11 Nov 2007 23:08:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lABN8a1m090970 for perforce@freebsd.org; Sun, 11 Nov 2007 23:08:36 GMT (envelope-from jb@freebsd.org) Date: Sun, 11 Nov 2007 23:08:36 GMT Message-Id: <200711112308.lABN8a1m090970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2007 23:08:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=128952 Change 128952 by jb@jb_freebsd1 on 2007/11/11 23:08:13 This file contains badness. Yuk. We really need to go back to using -Werror (which is how I caught this). Affected files ... .. //depot/projects/dtrace/src/usr.bin/fstat/zfs/zfs.c#2 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/fstat/zfs/zfs.c#2 (text+ko) ==== @@ -68,7 +68,8 @@ uint64_t *zid; void *znodeptr, *vnodeptr; char *dataptr; - int len, size, *zphys_addr; + int *zphys_addr; + size_t len, size; len = sizeof(size); if (sysctlbyname("debug.sizeof.znode", &size, &len, NULL, 0) == -1) { From owner-p4-projects@FreeBSD.ORG Mon Nov 12 00:42:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A4AF16A420; Mon, 12 Nov 2007 00:42:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 179F216A41A for ; Mon, 12 Nov 2007 00:42:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 002F513C491 for ; Mon, 12 Nov 2007 00:42:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAC0gFPZ096959 for ; Mon, 12 Nov 2007 00:42:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAC0gFeX096956 for perforce@freebsd.org; Mon, 12 Nov 2007 00:42:15 GMT (envelope-from jb@freebsd.org) Date: Mon, 12 Nov 2007 00:42:15 GMT Message-Id: <200711120042.lAC0gFeX096956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 00:42:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=128954 Change 128954 by jb@jb_freebsd1 on 2007/11/12 00:41:37 Remove a function that isn't needed any more. An equivalent function was added to -current after this one was prototyped. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#23 edit .. //depot/projects/dtrace/src/sys/sys/linker.h#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_linker.c#23 (text+ko) ==== @@ -701,33 +701,6 @@ } caddr_t -linker_file_lookup_value(const char *name) -{ - linker_file_t lf; - c_linker_sym_t sym; - linker_symval_t symval; - int locked; - - symval.value = 0; - - locked = KLD_LOCKED(); - if (!locked) - KLD_LOCK(); - - TAILQ_FOREACH(lf, &linker_files, link) { - if (LINKER_LOOKUP_SYMBOL(lf, name, &sym) == 0 && - LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) - break; - } - - if (!locked) - KLD_UNLOCK(); - - return (symval.value); -} - - -caddr_t linker_file_lookup_symbol(linker_file_t file, const char *name, int deps) { caddr_t sym; ==== //depot/projects/dtrace/src/sys/sys/linker.h#15 (text+ko) ==== @@ -148,11 +148,6 @@ int _deps); /* - * Lookup a symbol in all files, returning it's value. - */ -caddr_t linker_file_lookup_value(const char* _name); - -/* * Lookup a linker set in a file. Return pointers to the first entry, * last + 1, and count of entries. Use: for (p = start; p < stop; p++) {} * void *start is really: "struct yoursetmember ***start;" From owner-p4-projects@FreeBSD.ORG Mon Nov 12 05:24:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA1D516A468; Mon, 12 Nov 2007 05:24:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DFF916A420 for ; Mon, 12 Nov 2007 05:24:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B96E13C4A6 for ; Mon, 12 Nov 2007 05:24:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAC5OLrg031523 for ; Mon, 12 Nov 2007 05:24:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAC5OK7T031519 for perforce@freebsd.org; Mon, 12 Nov 2007 05:24:21 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 12 Nov 2007 05:24:21 GMT Message-Id: <200711120524.lAC5OK7T031519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 05:24:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=128972 Change 128972 by kmacy@kmacy:storage:toestack on 2007/11/12 05:23:35 update to work on freebsd Affected files ... .. //depot/projects/toestack/usr.sbin/cxgbtool/cxgbtool.c#2 edit Differences ... ==== //depot/projects/toestack/usr.sbin/cxgbtool/cxgbtool.c#2 (text+ko) ==== @@ -68,6 +68,41 @@ #include #include "version.h" +struct toetool_reg { + uint32_t cmd; + uint32_t addr; + uint32_t val; +}; + +struct toetool_mtus { + uint32_t cmd; + uint32_t nmtus; + uint16_t mtus[NMTUS]; +}; + +struct toetool_pm { + uint32_t cmd; + uint32_t tx_pg_sz; + uint32_t tx_num_pg; + uint32_t rx_pg_sz; + uint32_t rx_num_pg; + uint32_t pm_total; +}; + +struct toetool_tcam { + uint32_t cmd; + uint32_t tcam_size; + uint32_t nservers; + uint32_t nroutes; + uint32_t nfilters; +}; + +struct toetool_tcb { + uint32_t cmd; + uint32_t tcb_index; + uint32_t tcb_data[TCB_WORDS]; +}; + struct reg_info { const char *name; uint16_t addr; @@ -75,6 +110,80 @@ }; +struct toetool_tcam_word { + uint32_t cmd; + uint32_t addr; + uint32_t buf[3]; +}; + + +struct toetool_cntxt { + uint32_t cmd; + uint32_t cntxt_type; + uint32_t cntxt_id; + uint32_t data[4]; +}; + +struct toetool_desc { + uint32_t cmd; + uint32_t queue_num; + uint32_t idx; + uint32_t size; + uint8_t data[128]; +}; + +struct toetool_proto { + uint32_t cmd; + uint32_t data[5 * 128]; +}; + +struct toetool_qset_params { + uint32_t cmd; + uint32_t qset_idx; + int32_t txq_size[3]; + int32_t rspq_size; + int32_t fl_size[2]; + int32_t intr_lat; + int32_t polling; + int32_t lro; + int32_t cong_thres; + int32_t vector; + int32_t qnum; +}; + +struct toetool_trace { + uint32_t cmd; + uint32_t sip; + uint32_t sip_mask; + uint32_t dip; + uint32_t dip_mask; + uint16_t sport; + uint16_t sport_mask; + uint16_t dport; + uint16_t dport_mask; + uint32_t vlan:12; + uint32_t vlan_mask:12; + uint32_t intf:4; + uint32_t intf_mask:4; + uint8_t proto; + uint8_t proto_mask; + uint8_t invert_match:1; + uint8_t config_tx:1; + uint8_t config_rx:1; + uint8_t trace_tx:1; + uint8_t trace_rx:1; +}; + +struct toetool_pktsched_params { + uint32_t cmd; + uint8_t sched; + uint8_t idx; + uint8_t min; + uint8_t max; + uint8_t binding; +}; + + #include "reg_defs.c" #if defined(CONFIG_T3_REGS) # include "reg_defs_t3.c" @@ -447,9 +556,11 @@ if (revision == 0) return dump_regs_t3(argc, argv, start_arg, (uint32_t *)regs.data, is_pcie); - if (revision == 2) + if (revision == 2 || revision == 3) return dump_regs_t3b(argc, argv, start_arg, (uint32_t *)regs.data, is_pcie); + else + printf("revision=%d :-( \n", revision); } #endif errx(1, "unknown card type %d", vers); @@ -562,14 +673,14 @@ if (argc == start_arg) { op.cmd = TOETOOL_GETMTUTAB; - op.nmtus = MAX_NMTUS; + op.nmtus = NMTUS; if (doit(iff_name, &op) < 0) err(1, "get MTU table"); for (i = 0; i < op.nmtus; ++i) printf("%u ", op.mtus[i]); printf("\n"); - } else if (argc <= start_arg + MAX_NMTUS) { + } else if (argc <= start_arg + NMTUS) { op.cmd = TOETOOL_SETMTUTAB; op.nmtus = argc - start_arg; @@ -830,14 +941,10 @@ #define FBUF_WRAP_FSZ (FBUF_WRAP_SZ >> 3) #define MEM_CM_WRC_SIZE WRC_SIZE -typedef char int8_t; -typedef short int16_t; -typedef int int32_t; typedef long long _s64; typedef unsigned char _u8; typedef unsigned short _u16; typedef unsigned int _uint32_t; -typedef unsigned long long uint64_t; enum fw_ri_mpa_attrs { FW_RI_MPA_RX_MARKER_ENABLE = 0x1, @@ -1005,7 +1112,7 @@ static void print_wrc(unsigned int wrc_idx, struct wrc *p) { - u32 *buf = (u32 *)p; + uint32_t *buf = (uint32_t *)p; unsigned int i, j; printf("WRC STATE (raw)\n"); @@ -1094,7 +1201,7 @@ static int get_wrc(int argc, char *argv[], int start_arg, const char *iff_name) { - struct toetool_mem_range *op; + struct ch_mem_range op; uint64_t *p; uint32_t *buf; unsigned int idx, i = 0; @@ -1105,34 +1212,33 @@ if (get_int_arg(argv[start_arg], &idx)) return -1; - op = malloc(sizeof(*op) + MEM_CM_WRC_SIZE); - if (!op) + op.buf =malloc(MEM_CM_WRC_SIZE); + if (!op.buf) err(1, "get_wrc: malloc failed"); - op->cmd = TOETOOL_GET_MEM; - op->mem_id = MEM_CM; - op->addr = read_reg(iff_name, 0x28c) + CM_WRCONTEXT_OFFSET + + buf = (uint32_t *)op.buf; + op.mem_id = MEM_CM; + op.addr = read_reg(iff_name, 0x28c) + CM_WRCONTEXT_OFFSET + idx * MEM_CM_WRC_SIZE; - op->len = MEM_CM_WRC_SIZE; - buf = (uint32_t *)op->buf; + op.len = MEM_CM_WRC_SIZE; - if (doit(iff_name, op) < 0) + if (doit(iff_name, CHELSIO_GET_MEM, &op) < 0) err(1, "get_wrc"); - + /* driver manges with the data... put it back into the the FW's view */ - for (p = (uint64_t *)op->buf; - p < (uint64_t *)(op->buf + MEM_CM_WRC_SIZE); p++) { + for (p = (uint64_t *)op.buf; + p < (uint64_t *)(op.buf + MEM_CM_WRC_SIZE); p++) { uint64_t flit = *p; buf[i++] = htonl((uint32_t)(flit >> 32)); buf[i++] = htonl((uint32_t)flit); } - print_wrc(idx, (struct wrc *)op->buf); - print_wrc_zero(idx, (struct wrc *)op->buf); - print_wrc_history((struct wrc *)op->buf); + print_wrc(idx, (struct wrc *)op.buf); + print_wrc_zero(idx, (struct wrc *)op.buf); + print_wrc_history((struct wrc *)op.buf); - free(op); + free(buf); return 0; } #endif @@ -1737,7 +1843,8 @@ } } - if (argc < 3) usage(stderr); + if (argc < 3) + usage(stderr); iff_name = argv[1]; if (!strcmp(argv[2], "reg")) @@ -1757,11 +1864,12 @@ r = conf_tcam(argc, argv, 3, iff_name); else if (!strcmp(argv[2], "tcb")) r = get_tcb(argc, argv, 3, iff_name); +#endif #ifdef WRC - else if (!strcmp(argv[2], "wrc")) + else if (!strcmp(argv[2], "wrc")) r = get_wrc(argc, argv, 3, iff_name); #endif -#endif + else if (!strcmp(argv[2], "regdump")) r = dump_regs(argc, argv, 3, iff_name); #ifdef CHELSIO_INTERNAL From owner-p4-projects@FreeBSD.ORG Mon Nov 12 06:29:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 482D616A421; Mon, 12 Nov 2007 06:29:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C532216A420 for ; Mon, 12 Nov 2007 06:29:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B278B13C480 for ; Mon, 12 Nov 2007 06:29:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAC6TXhH035539 for ; Mon, 12 Nov 2007 06:29:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAC6TXxi035536 for perforce@freebsd.org; Mon, 12 Nov 2007 06:29:33 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 12 Nov 2007 06:29:33 GMT Message-Id: <200711120629.lAC6TXxi035536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 06:29:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=128974 Change 128974 by kmacy@kmacy:storage:toestack on 2007/11/12 06:28:34 - fix passive establish handling by initializing tp_ulp - fix race condition in t3_push_frames by adding locking - lock calls to tcp_close - change remaining cases where ctx was still being treated as a socket - update notes Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#21 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/notes#4 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#21 (text+ko) ==== @@ -139,12 +139,25 @@ static void t3_send_reset(struct socket *so); -static inline -int is_t3a(const struct toedev *dev) +static inline int +is_t3a(const struct toedev *dev) { return (dev->ttid == TOE_ID_CHELSIO_T3); } +static void +dump_toepcb(struct toepcb *toep) +{ + printf("qset_idx=%d qset=%d ulp_mode=%d mtu_idx=%d tid=%d\n", + toep->tp_qset_idx, toep->tp_qset, toep->tp_ulp_mode, + toep->tp_mtu_idx, toep->tp_tid); + + printf("wr_max=%d wr_avail=%d wr_unacked=%d mss_clamp=%d flags=0x%x\n", + toep->tp_wr_max, toep->tp_wr_avail, toep->tp_wr_unacked, + toep->tp_mss_clamp, toep->tp_flags); +} + + /* * Determine whether to send a CPL message now or defer it. A message is * deferred if the connection is in SYN_SENT since we don't know the TID yet. @@ -234,27 +247,45 @@ bus_dma_segment_t segs[TX_MAX_SEGS], *segp; segp = segs; - if (tp->t_state == TCPS_SYN_SENT || tp->t_state == TCPS_CLOSED) + if (tp->t_state == TCPS_SYN_SENT || tp->t_state == TCPS_CLOSED) { + printf("tcp state=%d\n", tp->t_state); return (0); + } - if (so->so_state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED)) + if (so->so_state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED)) { + printf("disconnecting\n"); + return (0); + } + SOCKBUF_LOCK(&so->so_snd); + d = TOM_DATA(TOE_DEV(so)); cdev = d->cdev; last = tail = so->so_snd.sb_sndptr ? so->so_snd.sb_sndptr : so->so_snd.sb_mb; total_bytes = 0; + printf("tail=%p snd.cc=%d tp_last=%4\n", tail, so->so_snd.sb_cc, + toep->tp_m_last); + if (last && toep->tp_m_last == last) { KASSERT(tail, ("sbdrop error")); last = tail = tail->m_next; } + if ((toep->tp_wr_avail == 0 ) || (tail == NULL)) { + SOCKBUF_UNLOCK(&so->so_snd); + return (0); + } + while (toep->tp_wr_avail && (tail != NULL)) { + count = bytes = 0; - if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) + if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) { + SOCKBUF_UNLOCK(&so->so_snd); return (0); - + } + while ((mbuf_wrs[count + 1] <= toep->tp_wr_avail) && (tail != NULL) && (count < TX_MAX_SEGS)) { bytes += tail->m_len; count++; @@ -269,6 +300,8 @@ segp++; tail = tail->m_next; } + printf("wr_avail=%d mbuf_wrs[%d]=%d tail=%p\n", + toep->tp_wr_avail, count, mbuf_wrs[count], tail); if (tail) { so->so_snd.sb_sndptr = tail; toep->tp_m_last = NULL; @@ -279,6 +312,8 @@ total_bytes += bytes; toep->tp_write_seq += bytes; + + SOCKBUF_UNLOCK(&so->so_snd); /* * XXX can drop socket buffer lock here @@ -310,9 +345,11 @@ bytes, count); l2t_send(cdev, m0, toep->tp_l2t); + if (toep->tp_wr_avail && (tail != NULL)) + SOCKBUF_LOCK(&so->so_snd); } - - + + SOCKBUF_UNLOCK_ASSERT(&so->so_snd); return (total_bytes); } @@ -334,7 +371,7 @@ struct toepcb *toep = tp->t_toe; unsigned int tid = toep->tp_tid; - d = TOM_DATA(TOE_DEV(so)); + d = TOM_DATA(toep->tp_toedev); if (tp->t_state != TCPS_SYN_SENT) t3_push_frames(so, 1); @@ -494,9 +531,10 @@ cxgb_toe_send(struct tcpcb *tp) { struct socket *so; + + printf("cxgb_toe_send\n"); + dump_toepcb(tp->t_toe); - printf("cxgb_toe_send\n"); - so = tp->t_inpcb->inp_socket; t3_push_frames(so, 1); return (0); @@ -944,9 +982,13 @@ calc_opt0l(struct socket *so, int ulp_mode) { struct tcpcb *tp = sototcpcb(so); + unsigned int val; - return V_TOS(SO_TOS(so)) | V_ULP_MODE(ulp_mode) | + val = V_TOS(SO_TOS(so)) | V_ULP_MODE(ulp_mode) | V_RCV_BUFSIZ(min(tp->rcv_wnd >> 10, (u32)M_RCV_BUFSIZ)); + + printf("opt0l tos=%08x rcv_wnd=%ld opt0l=%08x\n", SO_TOS(so), tp->rcv_wnd, val); + return (val); } static inline unsigned int @@ -984,7 +1026,7 @@ req->peer_port = inp->inp_fport; memcpy(&req->local_ip, &inp->inp_laddr, 4); memcpy(&req->peer_ip, &inp->inp_faddr, 4); - + printf("connect smt_idx=%d\n", e->smt_idx); req->opt0h = htonl(calc_opt0h(so, toep->tp_mtu_idx) | V_L2T_IDX(e->idx) | V_TX_CHANNEL(e->smt_idx)); req->opt0l = htonl(calc_opt0l(so, toep->tp_ulp_mode)); @@ -1070,7 +1112,9 @@ static int do_act_open_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { - struct socket *so = (struct socket *)ctx; + struct toepcb *toep = (struct toepcb *)ctx; + struct socket *so = toeptoso(toep); + #ifdef notyet struct cpl_act_open_rpl *rpl = cplhdr(m); @@ -1468,9 +1512,13 @@ * Otherwise we enter TIME_WAIT. */ t3_release_offload_resources(so); - if (toep->tp_flags & TP_ABORT_RPL_PENDING) + if (toep->tp_flags & TP_ABORT_RPL_PENDING) { + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(tp->t_inpcb); tcp_close(tp); - else + INP_INFO_WUNLOCK(&tcbinfo); + INP_UNLOCK(tp->t_inpcb); + } else enter_timewait(so); break; default: @@ -1502,7 +1550,8 @@ static int do_peer_close(struct t3cdev *cdev, struct mbuf *m, void *ctx) { - struct socket *so = (struct socket *)ctx; + struct toepcb *toep = (struct toepcb *)ctx; + struct socket *so = toeptoso(toep); VALIDATE_SOCK(so); @@ -1525,9 +1574,13 @@ switch (tp->t_state) { case TCPS_CLOSING: /* see FIN_WAIT2 case in do_peer_fin */ t3_release_offload_resources(so); - if (toep->tp_flags & TP_ABORT_RPL_PENDING) + if (toep->tp_flags & TP_ABORT_RPL_PENDING) { + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(tp->t_inpcb); tcp_close(tp); - else + INP_INFO_WUNLOCK(&tcbinfo); + INP_UNLOCK(tp->t_inpcb); + } else enter_timewait(so); break; case TCPS_LAST_ACK: @@ -1537,7 +1590,12 @@ * late, this close_con_rpl is the actual last message. */ t3_release_offload_resources(so); + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(tp->t_inpcb); tcp_close(tp); + INP_INFO_WUNLOCK(&tcbinfo); + INP_UNLOCK(tp->t_inpcb); + break; case TCPS_FIN_WAIT_1: #ifdef notyet @@ -1576,7 +1634,8 @@ do_close_con_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { - struct socket *so = (struct socket *)ctx; + struct toepcb *toep = (struct toepcb *)ctx; + struct socket *so = toeptoso(toep); VALIDATE_SOCK(so); @@ -1613,7 +1672,11 @@ if (toep->tp_flags & TP_ABORT_REQ_RCVD) panic("TP_ABORT_REQ_RCVD set"); t3_release_offload_resources(so); + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(tp->t_inpcb); tcp_close(tp); + INP_INFO_WUNLOCK(&tcbinfo); + INP_UNLOCK(tp->t_inpcb); } } } @@ -1642,9 +1705,10 @@ return (0); } - so = (struct socket *)ctx; - - /* + toep = (struct toepcb *)ctx; + so = toeptoso(toep); + + /* * Sometimes we've already closed the socket, e.g., a post-close * abort races with ABORT_REQ_RSS, the latter frees the socket * expecting the ABORT_REQ will fail with CPL_ERR_ABORT_FAILED, @@ -1654,7 +1718,6 @@ if (!so) goto discard; - toep = sototcpcb(so)->t_toe; toepcb_hold(toep); process_abort_rpl(so, m); toepcb_release(toep); @@ -1775,6 +1838,7 @@ { struct tcpcb *parenttp = sototcpcb(parent); struct tcpcb *childtp = sototcpcb(child); + struct inpcb *inp = sotoinpcb(child); /* * If the server is still open we clean up the child connection, @@ -1784,7 +1848,11 @@ if (__predict_false(parenttp->t_state == TCPS_LISTEN)) { cleanup_syn_rcv_conn(child, parent); t3_release_offload_resources(child); + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(inp); tcp_close(childtp); + INP_INFO_WUNLOCK(&tcbinfo); + INP_UNLOCK(inp); } } @@ -1865,7 +1933,11 @@ return; t3_release_offload_resources(so); + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(tp->t_inpcb); tcp_close(tp); + INP_INFO_WUNLOCK(&tcbinfo); + INP_UNLOCK(tp->t_inpcb); } send_abort_rpl(m, tdev, rst_status); @@ -2140,6 +2212,8 @@ toep->tp_iss = th.th_seq = req->rcv_isn; th.th_flags = TH_SYN; + toep->tp_delack_seq = toep->tp_rcv_wup = toep->tp_copied_seq = ntohl(req->rcv_isn); + inc.inc_isipv6 = 0; inc.inc_len = 0; inc.inc_faddr.s_addr = req->peer_ip; @@ -2293,17 +2367,35 @@ rpl = cplhdr(reply_mbuf); reply_mbuf->m_pkthdr.len = reply_mbuf->m_len = sizeof(*rpl); rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); + rpl->wr.wr_lo = 0; OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_PASS_ACCEPT_RPL, tid)); + rpl->opt2 = htonl(calc_opt2(so, tdev)); + rpl->rsvd = rpl->opt2; /* workaround for HW bug */ rpl->peer_ip = req->peer_ip; // req->peer_ip is not overwritten + + printf("accept smt_idx=%d\n", e->smt_idx); - rpl->opt0h = htonl(calc_opt0h(so, select_mss(td, NULL, dst->rt_ifp->if_mtu)) | V_L2T_IDX(e->idx) | - V_TX_CHANNEL(e->smt_idx)); + rpl->opt0h = htonl(calc_opt0h(so, select_mss(td, NULL, dst->rt_ifp->if_mtu)) | + V_L2T_IDX(e->idx) | V_TX_CHANNEL(e->smt_idx)); rpl->opt0l_status = htonl(calc_opt0l(so, lctx->ulp_mode) | CPL_PASS_OPEN_ACCEPT); - rpl->opt2 = htonl(calc_opt2(so, tdev)); - rpl->rsvd = rpl->opt2; /* workaround for HW bug */ + + printf("opt0l_status=%08x\n", rpl->opt0l_status); + m_set_priority(reply_mbuf, mkprio(CPL_PRIORITY_SETUP, so)); + { + int i; + + printf("rpl:\n"); + uint32_t *rplbuf = mtod(reply_mbuf, uint32_t *); + + for (i = 0; i < sizeof(*rpl)/sizeof(uint32_t); i++) + printf("[%d] %08x\n", i, rplbuf[i]); + } + + + l2t_send(cdev, reply_mbuf, e); m_free(m); #ifdef notyet @@ -2429,6 +2521,8 @@ if (tp->rcv_wnd > (M_RCV_BUFSIZ << 10)) toep->tp_rcv_wup -= tp->rcv_wnd - (M_RCV_BUFSIZ << 10); + dump_toepcb(toep); + #ifdef notyet /* * no clean interface for marking ARP up to date @@ -2539,9 +2633,14 @@ tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; toep->tp_qset_idx = 0; toep->tp_mtu_idx = select_mss(td, tp, toep->tp_l2t->neigh->rt_ifp->if_mtu); - + + /* + * XXX Cancel any keep alive timer + */ + make_established(so, ntohl(req->snd_isn), ntohs(req->tcp_opt)); INP_INFO_WUNLOCK(&tcbinfo); + soisconnected(so); #ifdef notyet @@ -2587,6 +2686,8 @@ struct toepcb *toep = tp->t_toe; unsigned int tid = toep->tp_tid; + printf("fixup_and_send_ofo\n"); + while ((m = mbufq_dequeue(&toep->out_of_order_queue)) != NULL) { /* * A variety of messages can be waiting but the fields we'll @@ -2799,6 +2900,7 @@ struct toepcb *toep = (struct toepcb *)ctx; printf("do_wr_ack\n"); + dump_toepcb(toep); VALIDATE_SOCK(so); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 (text+ko) ==== @@ -253,7 +253,8 @@ ctx->tom_data = d; ctx->lso = so; - + ctx->ulp_mode = 0; /* DDP if the default */ + stid = cxgb_alloc_stid(d->cdev, d->client, ctx); if (stid < 0) goto free_ctx; ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/notes#4 (text+ko) ==== @@ -1,9 +1,10 @@ -Currently untested: +Somewhat untested: - abort Currently unimplemented: - - complete listen handling + - DDP + - module unload - close for a subset of states - correct ARP failure handling - urgent data @@ -11,7 +12,7 @@ - connection retry - fragment assembly and re-tunneling is not implemented, but may work just using the native stack - not clear how credit accounting will sync up - - DDP + open questions: What attributes are inherited from the listen socket. Should we be inheriting more? From owner-p4-projects@FreeBSD.ORG Mon Nov 12 15:46:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13F4A16A41B; Mon, 12 Nov 2007 15:46:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C60A16A417 for ; Mon, 12 Nov 2007 15:46:24 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFC1513C4A8 for ; Mon, 12 Nov 2007 15:46:23 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACFkNWJ011041 for ; Mon, 12 Nov 2007 15:46:23 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACFkNFS011033 for perforce@freebsd.org; Mon, 12 Nov 2007 15:46:23 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 12 Nov 2007 15:46:23 GMT Message-Id: <200711121546.lACFkNFS011033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 128976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 15:46:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=128976 Change 128976 by swise@swise:vic10:iwarp on 2007/11/12 15:46:13 Get rdma_verbs.c to compile. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/ib_verbs.h#5 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#2 edit .. //depot/projects/iwarp/sys/modules/rdma/Makefile#4 edit .. //depot/projects/iwarp/sys/modules/rdma/core/Makefile#4 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/ib_verbs.h#5 (text+ko) ==== @@ -718,7 +718,7 @@ TAILQ_ENTRY(ib_uobject) entry; /* link to context's list */ u32 id; /* index into kernel idr */ atomic_t ref; - struct rwlock lock; /* protects .live */ + struct mtx lock; /* protects .live */ int live; }; @@ -884,11 +884,11 @@ char name[IB_DEVICE_NAME_MAX]; TAILQ_HEAD(, ib_event_handler) event_handler_list; - spinlock_t event_handler_lock; + struct mtx event_handler_lock; TAILQ_ENTRY(ib_device) core_list; TAILQ_HEAD(, ib_client_data) client_data_list; - spinlock_t client_data_lock; + struct mtx client_data_lock; struct ib_cache cache; int *pkey_tbl_len; ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#2 (text+ko) ==== @@ -38,12 +38,16 @@ * $Id: verbs.c 1349 2004-12-16 21:09:43Z roland $ */ -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include int ib_rate_to_mult(enum ib_rate rate) { ==== //depot/projects/iwarp/sys/modules/rdma/Makefile#4 (text+ko) ==== @@ -2,7 +2,7 @@ SUBDIR= addr SUBDIR+= cma -#SUBDIR+= iwcm -#SUBDIR+= core +SUBDIR+= iwcm +SUBDIR+= core .include ==== //depot/projects/iwarp/sys/modules/rdma/core/Makefile#4 (text+ko) ==== @@ -7,6 +7,6 @@ SRCS= device_if.h bus_if.h pci_if.h pcib_if.h SRCS+= rdma_device.c SRCS+= rdma_cache.c -#SRCS+= rdma_verbs.c +SRCS+= rdma_verbs.c .include From owner-p4-projects@FreeBSD.ORG Mon Nov 12 15:50:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75B0A16A41B; Mon, 12 Nov 2007 15:50:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5DC216A419 for ; Mon, 12 Nov 2007 15:50:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDD0A13C4A8 for ; Mon, 12 Nov 2007 15:50:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACFoSgH011346 for ; Mon, 12 Nov 2007 15:50:28 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACFoS0e011343 for perforce@freebsd.org; Mon, 12 Nov 2007 15:50:28 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 12 Nov 2007 15:50:28 GMT Message-Id: <200711121550.lACFoS0e011343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 128978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 15:50:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=128978 Change 128978 by swise@swise:vic10:iwarp on 2007/11/12 15:49:47 Remove the IB_SUPPORTED ifdefs from rdma_verbs.c Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#3 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_verbs.c#3 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Mon Nov 12 16:13:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E05316A469; Mon, 12 Nov 2007 16:13:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3BAE16A41A for ; Mon, 12 Nov 2007 16:13:53 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9381F13C48E for ; Mon, 12 Nov 2007 16:13:53 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACGDrmv015569 for ; Mon, 12 Nov 2007 16:13:53 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACGDrTi015566 for perforce@freebsd.org; Mon, 12 Nov 2007 16:13:53 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 12 Nov 2007 16:13:53 GMT Message-Id: <200711121613.lACGDrTi015566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 128979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 16:13:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=128979 Change 128979 by swise@swise:vic10:iwarp on 2007/11/12 16:13:00 Get rdma modules to load! rdma_addr, rdma_cma, rdma_iwcm, and rdma_core now load. The IB stuff is all ifdefed out, but iwarp should work! Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#5 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#3 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#3 edit .. //depot/projects/iwarp/sys/modules/rdma/iwcm/Makefile#2 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#5 (text+ko) ==== @@ -71,7 +71,9 @@ .remove = cma_remove_one }; +#ifdef IB_SUPPORTED static struct ib_sa_client sa_client; +#endif static struct rdma_addr_client addr_client; static TAILQ_HEAD(, cma_device) dev_list; static LIST_HEAD(, rdma_id_private) listen_any_list; @@ -553,6 +555,7 @@ return ib_modify_qp(id->qp, &qp_attr, IB_QP_STATE); } +#ifdef IB_SUPPORTED static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, struct ib_qp_attr *qp_attr, int *qp_attr_mask) { @@ -577,6 +580,7 @@ } return 0; } +#endif int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr, int *qp_attr_mask) @@ -585,6 +589,7 @@ int ret = 0; id_priv = container_of(id, struct rdma_id_private, id); +#ifdef IB_SUPPORTED switch (rdma_node_get_transport(id_priv->id.device->node_type)) { case RDMA_TRANSPORT_IB: if (!id_priv->cm_id.ib || cma_is_ud_ps(id_priv->id.ps)) @@ -596,17 +601,20 @@ qp_attr->rq_psn = id_priv->seq_num; break; case RDMA_TRANSPORT_IWARP: +#endif if (!id_priv->cm_id.iw) { qp_attr->qp_access_flags = IB_ACCESS_LOCAL_WRITE; *qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS; } else ret = iw_cm_init_qp_attr(id_priv->cm_id.iw, qp_attr, qp_attr_mask); +#ifdef IB_SUPPORTED break; default: ret = ENOSYS; break; } +#endif return ret; } @@ -731,6 +739,7 @@ static void cma_cancel_route(struct rdma_id_private *id_priv) { +#ifdef IB_SUPPORTED switch (rdma_node_get_transport(id_priv->id.device->node_type)) { case RDMA_TRANSPORT_IB: if (id_priv->query) @@ -739,6 +748,7 @@ default: break; } +#endif } static inline int cma_internal_listen(struct rdma_id_private *id_priv) @@ -752,18 +762,22 @@ cma_exch(id_priv, CMA_DESTROYING); if (id_priv->cma_dev) { +#ifdef IB_SUPPORTED switch (rdma_node_get_transport(id_priv->id.device->node_type)) { case RDMA_TRANSPORT_IB: if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) ib_destroy_cm_id(id_priv->cm_id.ib); break; case RDMA_TRANSPORT_IWARP: +#endif if (id_priv->cm_id.iw && !IS_ERR(id_priv->cm_id.iw)) iw_destroy_cm_id(id_priv->cm_id.iw); +#ifdef IB_SUPPORTED break; default: break; } +#endif cma_detach_from_dev(id_priv); } LIST_REMOVE(id_priv, listen_entry); @@ -2870,7 +2884,9 @@ return (ENOMEM); taskqueue_start_threads(&cma_wq, 1, PI_NET, "cma_wq thread"); +#ifdef IB_SUPPORTED ib_sa_register_client(&sa_client); +#endif rdma_addr_register_client(&addr_client); ret = ib_register_client(&cma_client); @@ -2880,7 +2896,9 @@ err: rdma_addr_unregister_client(&addr_client); +#ifdef IB_SUPPORTED ib_sa_unregister_client(&sa_client); +#endif taskqueue_free(cma_wq); return ret; } @@ -2889,7 +2907,9 @@ { ib_unregister_client(&cma_client); rdma_addr_unregister_client(&addr_client); +#ifdef IB_SUPPORTED ib_sa_unregister_client(&sa_client); +#endif taskqueue_free(cma_wq); idr_destroy(&sdp_ps); idr_destroy(&tcp_ps); @@ -2933,4 +2953,5 @@ MODULE_VERSION(rdma_cma, 1); MODULE_DEPEND(rdma_cma, rdma_core, 1, 1, 1); MODULE_DEPEND(rdma_cma, rdma_addr, 1, 1, 1); +MODULE_DEPEND(rdma_cma, rdma_iwcm, 1, 1, 1); DECLARE_MODULE(rdma_cma, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#3 (text+ko) ==== @@ -732,6 +732,8 @@ #endif mtx_init(&device_mutex, "rdma_device mutex", NULL, MTX_DUPOK|MTX_DEF); + TAILQ_INIT(&client_list); + TAILQ_INIT(&device_list); ret = ib_cache_setup(); if (ret) { log(LOG_WARNING, "Couldn't set up InfiniBand P_Key/GID cache\n"); @@ -760,14 +762,13 @@ switch (cmd) { case MOD_LOAD: - printf("Loading iwcm.\n"); - + printf("Loading rdma_core.\n"); rdma_core_init(); break; case MOD_QUIESCE: break; case MOD_UNLOAD: - printf("Unloading iwcm.\n"); + printf("Unloading rdma_core.\n"); rdma_core_cleanup(); break; case MOD_SHUTDOWN: ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#3 (text+ko) ==== @@ -1058,14 +1058,14 @@ switch (cmd) { case MOD_LOAD: - printf("Loading iwcm.\n"); + printf("Loading rdma_iwcm.\n"); iw_cm_init(); break; case MOD_QUIESCE: break; case MOD_UNLOAD: - printf("Unloading iwcm.\n"); + printf("Unloading rdma_iwcm.\n"); iw_cm_cleanup(); break; case MOD_SHUTDOWN: ==== //depot/projects/iwarp/sys/modules/rdma/iwcm/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ RDMA= ${.CURDIR}/../../../contrib/rdma .PATH: ${RDMA} -KMOD= iw_cm +KMOD= rdma_iwcm SRCS= device_if.h bus_if.h pci_if.h pcib_if.h SRCS+= rdma_iwcm.c From owner-p4-projects@FreeBSD.ORG Mon Nov 12 19:03:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA42E16A421; Mon, 12 Nov 2007 19:03:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57DBD16A417 for ; Mon, 12 Nov 2007 19:03:05 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45B5513C49D for ; Mon, 12 Nov 2007 19:03:05 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACJ3544036273 for ; Mon, 12 Nov 2007 19:03:05 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACJ2vIr035759 for perforce@freebsd.org; Mon, 12 Nov 2007 19:02:57 GMT (envelope-from delphij@freebsd.org) Date: Mon, 12 Nov 2007 19:02:57 GMT Message-Id: <200711121902.lACJ2vIr035759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 128982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 19:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=128982 Change 128982 by delphij@charlie on 2007/11/12 19:02:08 IFC Affected files ... .. //depot/projects/delphij_fork/ObsoleteFiles.inc#12 integrate .. //depot/projects/delphij_fork/bin/ps/ps.c#4 integrate .. //depot/projects/delphij_fork/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/complete.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/display.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/input.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/misc.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/readline.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/text.c#2 integrate .. //depot/projects/delphij_fork/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/CACerts#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/delphij_fork/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/delphij_fork/etc/Makefile#4 integrate .. //depot/projects/delphij_fork/etc/defaults/Makefile#2 integrate .. //depot/projects/delphij_fork/etc/defaults/pccard.conf#2 delete .. //depot/projects/delphij_fork/etc/freebsd-update.conf#2 integrate .. //depot/projects/delphij_fork/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/delphij_fork/etc/namedb/named.root#2 integrate .. //depot/projects/delphij_fork/etc/network.subr#2 integrate .. //depot/projects/delphij_fork/etc/pf.conf#2 delete .. //depot/projects/delphij_fork/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/delphij_fork/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/delphij_fork/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/delphij_fork/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/delphij_fork/release/Makefile#5 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/delphij_fork/release/scripts/package-split.py#2 integrate .. //depot/projects/delphij_fork/release/scripts/src-install.sh#2 integrate .. //depot/projects/delphij_fork/rescue/rescue/Makefile#4 integrate .. //depot/projects/delphij_fork/sbin/geom/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/delphij_fork/sbin/geom/core/geom.c#3 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifbridge.c#3 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/delphij_fork/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/delphij_fork/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/delphij_fork/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/delphij_fork/sbin/rcorder/hash.c#2 integrate .. //depot/projects/delphij_fork/sbin/rcorder/hash.h#2 integrate .. //depot/projects/delphij_fork/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/delphij_fork/sbin/route/route.c#3 integrate .. //depot/projects/delphij_fork/sbin/setkey/parse.y#2 integrate .. //depot/projects/delphij_fork/sbin/setkey/setkey.c#2 integrate .. //depot/projects/delphij_fork/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/delphij_fork/sbin/setkey/token.l#2 integrate .. //depot/projects/delphij_fork/share/doc/legal/Makefile#2 integrate .. //depot/projects/delphij_fork/share/doc/legal/intel_wpi/Makefile#1 branch .. //depot/projects/delphij_fork/share/examples/pf/Makefile#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/ackpri#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/faq-example1#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/faq-example2#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/faq-example3#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/pf.conf#1 branch .. //depot/projects/delphij_fork/share/examples/pf/queue1#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/queue2#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/queue3#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/queue4#2 integrate .. //depot/projects/delphij_fork/share/examples/pf/spamd#2 integrate .. //depot/projects/delphij_fork/share/man/man4/Makefile#7 integrate .. //depot/projects/delphij_fork/share/man/man4/asmc.4#1 branch .. //depot/projects/delphij_fork/share/man/man4/wpi.4#1 branch .. //depot/projects/delphij_fork/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/delphij_fork/share/man/man7/tuning.7#2 integrate .. //depot/projects/delphij_fork/share/man/man9/Makefile#4 integrate .. //depot/projects/delphij_fork/share/man/man9/locking.9#3 integrate .. //depot/projects/delphij_fork/share/man/man9/rmlock.9#1 branch .. //depot/projects/delphij_fork/share/misc/bsd-family-tree#3 integrate .. //depot/projects/delphij_fork/share/mk/sys.mk#4 integrate .. //depot/projects/delphij_fork/share/zoneinfo/asia#3 integrate .. //depot/projects/delphij_fork/share/zoneinfo/northamerica#3 integrate .. //depot/projects/delphij_fork/share/zoneinfo/pacificnew#1 branch .. //depot/projects/delphij_fork/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/delphij_fork/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/delphij_fork/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/delphij_fork/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/common/loader.8#2 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#12 integrate .. //depot/projects/delphij_fork/sys/conf/files#10 integrate .. //depot/projects/delphij_fork/sys/conf/files.amd64#5 integrate .. //depot/projects/delphij_fork/sys/conf/files.i386#5 integrate .. //depot/projects/delphij_fork/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/delphij_fork/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/delphij_fork/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/delphij_fork/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/md/md.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/re/if_re.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/safe/safe.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/delphij_fork/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/delphij_fork/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/delphij_fork/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/delphij_fork/sys/i386/conf/NOTES#4 integrate .. //depot/projects/delphij_fork/sys/i386/conf/PAE#3 integrate .. //depot/projects/delphij_fork/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/delphij_fork/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/delphij_fork/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_exec.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_fork.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_kse.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_proc.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/delphij_fork/sys/kern/kern_sig.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_thr.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_thread.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/subr_lock.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/subr_smp.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/sys_process.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/tty_pty.c#2 integrate .. //depot/projects/delphij_fork/sys/modules/Makefile#9 integrate .. //depot/projects/delphij_fork/sys/modules/asmc/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/wpi/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/delphij_fork/sys/net/if_bridge.c#6 integrate .. //depot/projects/delphij_fork/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/delphij_fork/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/delphij_fork/sys/netinet/sctputil.c#13 integrate .. //depot/projects/delphij_fork/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/delphij_fork/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/delphij_fork/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/nfsmb.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/delphij_fork/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/delphij_fork/sys/sys/_rmlock.h#1 branch .. //depot/projects/delphij_fork/sys/sys/lock.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/malloc.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/pcpu.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/proc.h#7 integrate .. //depot/projects/delphij_fork/sys/sys/rmlock.h#1 branch .. //depot/projects/delphij_fork/sys/sys/signalvar.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/smp.h#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/vm/pmap.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/swap_pager.c#4 integrate .. //depot/projects/delphij_fork/sys/vm/vm_extern.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_glue.c#3 integrate .. //depot/projects/delphij_fork/sys/vm/vm_kern.c#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_map.c#5 integrate .. //depot/projects/delphij_fork/sys/vm/vm_map.h#3 integrate .. //depot/projects/delphij_fork/sys/vm/vm_page.c#8 integrate .. //depot/projects/delphij_fork/tools/build/options/makeman#2 integrate .. //depot/projects/delphij_fork/tools/sched/schedgraph.py#2 integrate .. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/du/du.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/delphij_fork/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/delphij_fork/usr.bin/killall/killall.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/killall/killall.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mail/aux.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mail/lex.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mail/list.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mail/main.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/sed/main.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/tail/read.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/tail/tail.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/lib/entry.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/delphij_fork/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pciconf/pciconf.8#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/options.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/pppd.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/sys-bsd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rip6query/rip6query.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/rpc.statd/statd.c#4 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rrenumd/rrenumd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/hostapd/Makefile#4 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/delphij_fork/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/delphij_fork/bin/ps/ps.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/delphij_fork/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/delphij_fork/contrib/libreadline/complete.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/delphij_fork/contrib/libreadline/display.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } } /* Otherwise, print over the existing material. */ @@ -1608,8 +1642,20 @@ { if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); _rl_last_c_pos += col_temp; /* XXX */ + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } } lendiff = (oe - old) - (ne - new); if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) @@ -1745,7 +1791,10 @@ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) { dpos = _rl_col_width (data, 0, new); - if (dpos > prompt_last_invisible) /* XXX - don't use woff here */ + /* Use NEW when comparing against the last invisible character in the + prompt string, since they're both buffer indices and DPOS is a + desired display position. */ + if (new > prompt_last_invisible) /* XXX - don't use woff here */ { dpos -= woff; /* Since this will be assigned to _rl_last_c_pos at the end (more ==== //depot/projects/delphij_fork/contrib/libreadline/input.c#2 (text+ko) ==== @@ -133,8 +133,11 @@ return (0); *key = ibuffer[pop_index++]; - +#if 0 if (pop_index >= ibuffer_len) +#else + if (pop_index > ibuffer_len) +#endif pop_index = 0; return (1); @@ -250,7 +253,8 @@ while (chars_avail--) { k = (*rl_getc_function) (rl_instream); - rl_stuff_char (k); + if (rl_stuff_char (k) == 0) + break; /* some problem; no more room */ if (k == NEWLINE || k == RETURN) break; } @@ -373,7 +377,11 @@ RL_SETSTATE (RL_STATE_INPUTPENDING); } ibuffer[push_index++] = key; +#if 0 if (push_index >= ibuffer_len) +#else + if (push_index > ibuffer_len) +#endif push_index = 0; return 1; @@ -513,20 +521,26 @@ char *mbchar; int size; { - int mb_len = 0; + int mb_len, c; size_t mbchar_bytes_length; wchar_t wc; mbstate_t ps, ps_back; memset(&ps, 0, sizeof (mbstate_t)); memset(&ps_back, 0, sizeof (mbstate_t)); - + + mb_len = 0; while (mb_len < size) { RL_SETSTATE(RL_STATE_MOREINPUT); - mbchar[mb_len++] = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + break; + + mbchar[mb_len++] = c; + mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps); if (mbchar_bytes_length == (size_t)(-1)) break; /* invalid byte sequence for the current locale */ @@ -564,7 +578,7 @@ c = first; memset (mb, 0, mlen); - for (i = 0; i < mlen; i++) + for (i = 0; c >= 0 && i < mlen; i++) { mb[i] = (char)c; memset (&ps, 0, sizeof (mbstate_t)); ==== //depot/projects/delphij_fork/contrib/libreadline/isearch.c#2 (text+ko) ==== @@ -327,8 +327,15 @@ rl_command_func_t *f; f = (rl_command_func_t *)NULL; - - /* Translate the keys we do something with to opcodes. */ + + if (c < 0) + { + cxt->sflags |= SF_FAILED; + cxt->history_pos = cxt->last_found_line; + return -1; + } + + /* Translate the keys we do something with to opcodes. */ if (c >= 0 && _rl_keymap[c].type == ISFUNC) { f = _rl_keymap[c].function; ==== //depot/projects/delphij_fork/contrib/libreadline/misc.c#2 (text+ko) ==== @@ -146,6 +146,8 @@ rl_restore_prompt (); rl_clear_message (); RL_UNSETSTATE(RL_STATE_NUMERICARG); + if (key < 0) + return -1; return (_rl_dispatch (key, _rl_keymap)); } } ==== //depot/projects/delphij_fork/contrib/libreadline/readline.c#2 (text+ko) ==== @@ -645,6 +645,11 @@ if ((cxt->flags & KSEQ_DISPATCHED) == 0) { nkey = _rl_subseq_getchar (cxt->okey); + if (nkey < 0) + { + _rl_abort_internal (); + return -1; + } r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg); cxt->flags |= KSEQ_DISPATCHED; } ==== //depot/projects/delphij_fork/contrib/libreadline/text.c#2 (text+ko) ==== @@ -857,6 +857,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + #if defined (HANDLE_SIGNALS) if (RL_ISSTATE (RL_STATE_CALLBACK) == 0) _rl_restore_tty_signals (); @@ -1520,6 +1523,9 @@ mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX); + if (mb_len <= 0) + return -1; + if (count < 0) return (_rl_char_search_internal (-count, bdir, mbchar, mb_len)); else @@ -1536,6 +1542,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + if (count < 0) return (_rl_char_search_internal (-count, bdir, c)); else ==== //depot/projects/delphij_fork/contrib/libreadline/vi_mode.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.6 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.7 2007/11/07 04:42:20 ache Exp $ */ /* vi_mode.c -- A vi emulation mode for Bash. Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */ @@ -887,6 +887,13 @@ RL_SETSTATE(RL_STATE_MOREINPUT); c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + + if (c < 0) + { + *nextkey = 0; + return -1; + } + *nextkey = c; if (!member (c, vi_motion)) @@ -903,6 +910,11 @@ RL_SETSTATE(RL_STATE_MOREINPUT); c = rl_read_key (); /* real command */ RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + { + *nextkey = 0; + return -1; + } *nextkey = c; } else if (key == c && (key == 'd' || key == 'y' || key == 'c')) @@ -1225,14 +1237,22 @@ _rl_vi_callback_char_search (data) _rl_callback_generic_arg *data; { + int c; #if defined (HANDLE_MULTIBYTE) - _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); #else RL_SETSTATE(RL_STATE_MOREINPUT); - _rl_vi_last_search_char = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); #endif + if (c <= 0) + return -1; + +#if !defined (HANDLE_MULTIBYTE) + _rl_vi_last_search_char = c; +#endif + _rl_callback_func = 0; _rl_want_redisplay = 1; @@ -1248,6 +1268,7 @@ rl_vi_char_search (count, key) int count, key; { + int c; #if defined (HANDLE_MULTIBYTE) static char *target; static int tlen; @@ -1294,11 +1315,17 @@ else { #if defined (HANDLE_MULTIBYTE) - _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX); + if (c <= 0) + return -1; + _rl_vi_last_search_mblen = c; #else RL_SETSTATE(RL_STATE_MOREINPUT); - _rl_vi_last_search_char = rl_read_key (); + c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + _rl_vi_last_search_char = c; #endif } } @@ -1468,6 +1495,9 @@ c = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); + if (c < 0) + return -1; + #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) c = _rl_read_mbstring (c, mb, mlen); @@ -1486,6 +1516,9 @@ _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); + if (c < 0) + return -1; + _rl_callback_func = 0; _rl_want_redisplay = 1; @@ -1517,6 +1550,9 @@ else _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX); + if (c < 0) + return -1; + return (_rl_vi_change_char (count, c, mb)); } @@ -1651,7 +1687,7 @@ ch = rl_read_key (); RL_UNSETSTATE(RL_STATE_MOREINPUT); - if (ch < 'a' || ch > 'z') + if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ { rl_ding (); return -1; @@ -1703,7 +1739,7 @@ rl_point = rl_mark; return 0; } - else if (ch < 'a' || ch > 'z') + else if (ch < 0 || ch < 'a' || ch > 'z') /* make test against 0 explicit */ { rl_ding (); return -1; ==== //depot/projects/delphij_fork/contrib/sendmail/CACerts#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: CACerts,v 8.1 2004/03/01 22:05:47 ca Exp $ +# $Id: CACerts,v 8.3 2007/06/11 22:04:46 ca Exp $ # This file contains some CA certificates that are used to sign the # certificates of mail servers of members of the sendmail consortium # who may reply to questions etc sent to sendmail.org. @@ -78,73 +78,6 @@ Version: 3 (0x2) Serial Number: 0 (0x0) Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net - Validity - Not Before: Jan 1 04:39:54 2002 GMT - Not After : Dec 31 04:39:54 2006 GMT - Subject: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:aa:dd:a2:fe:3b:fa:2f:5c:3d:f1:e1:d4:1d:55: - 04:27:6b:01:62:00:d7:02:cb:74:47:69:84:d7:c6: - c5:71:55:79:35:3a:a8:ce:de:48:23:53:80:3c:cd: - 54:2e:e9:fe:b1:76:5a:be:cb:fd:2d:dc:a3:36:c5: - c7:1e:4e:ef:76:f0:55:8f:a0:a5:f8:07:c5:52:1d: - a2:42:81:4d:8a:c8:42:3f:f3:01:80:f9:46:35:a6: - bc:c0:9b:9f:33:8b:49:9b:1d:87:8f:19:48:15:21: - 23:57:df:6e:4d:03:ed:ae:9f:0b:91:b7:a9:47:66: - f1:0d:1b:1c:5d:b4:57:60:c7 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA - X509v3 Authority Key Identifier: - keyid:A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA - DirName:/C=US/ST=California/L=Emeryville/O=gshapiro.net/CN=Certificate Authority/emailAddress=certificates@gshapiro.net - serial:00 - - X509v3 Basic Constraints: - CA:TRUE - Signature Algorithm: md5WithRSAEncryption - 87:27:d2:2a:3a:dc:04:cd:ef:e8:7b:1c:34:47:2e:13:34:a5: - 08:f9:4d:df:d8:e1:6d:e6:9a:db:38:ee:20:6d:4a:ae:6f:1e: - bc:71:61:a4:b4:d6:40:24:ee:65:ca:e9:81:5a:ef:ee:62:57: - 70:05:46:91:6b:d0:c6:a6:e9:38:65:ae:ea:50:b3:5c:27:c4: - 7a:bd:95:8c:cb:45:ef:fc:fc:99:e5:6a:61:c3:44:77:d8:1f: - d6:b4:17:44:15:9a:bc:26:5b:ec:4e:29:5d:fd:cf:61:f3:be: - 91:a4:3b:51:e6:73:5b:17:82:9d:5a:56:2c:63:c2:f1:d6:a2: - 4c:5a ------BEGIN CERTIFICATE----- -MIIDoTCCAwqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCVVMx -EzARBgNVBAgTCkNhbGlmb3JuaWExEzARBgNVBAcTCkVtZXJ5dmlsbGUxFTATBgNV >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 12 19:04:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9F0C16A46C; Mon, 12 Nov 2007 19:04:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFB5616A468 for ; Mon, 12 Nov 2007 19:04:06 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F93213C4A5 for ; Mon, 12 Nov 2007 19:04:06 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACJ46AO037000 for ; Mon, 12 Nov 2007 19:04:06 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACJ46t3036997 for perforce@freebsd.org; Mon, 12 Nov 2007 19:04:06 GMT (envelope-from delphij@freebsd.org) Date: Mon, 12 Nov 2007 19:04:06 GMT Message-Id: <200711121904.lACJ46t3036997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 128984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 19:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=128984 Change 128984 by delphij@charlie on 2007/11/12 19:03:37 IFC tmpfs stack overflow fix. Obtained from: des Affected files ... .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate Differences ... ==== //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ * allocate and release resources. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.11 2007/10/04 17:11:48 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.12 2007/11/12 18:57:33 delphij Exp $"); #include #include @@ -231,7 +231,7 @@ vfs_scanopt(mp->mnt_optnew, "uid", "%d", &root_uid) != 1) root_uid = va.va_uid; if (mp->mnt_cred->cr_ruid != 0 || - vfs_scanopt(mp->mnt_optnew, "mode", "%o", &root_mode) != 1) + vfs_scanopt(mp->mnt_optnew, "mode", "%ho", &root_mode) != 1) root_mode = va.va_mode; if(vfs_scanopt(mp->mnt_optnew, "inodes", "%d", &nodes_max) != 1) nodes_max = 0; From owner-p4-projects@FreeBSD.ORG Mon Nov 12 20:38:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDC4816A419; Mon, 12 Nov 2007 20:38:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81D9216A477 for ; Mon, 12 Nov 2007 20:38:00 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 558B413C4CA for ; Mon, 12 Nov 2007 20:38:00 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACKc0kZ043641 for ; Mon, 12 Nov 2007 20:38:00 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACKc0oU043638 for perforce@freebsd.org; Mon, 12 Nov 2007 20:38:00 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 12 Nov 2007 20:38:00 GMT Message-Id: <200711122038.lACKc0oU043638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 128990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 20:38:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=128990 Change 128990 by swise@swise:vic10:iwarp on 2007/11/12 20:37:28 Added buf_ring_free. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#3 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#3 (text+ko) ==== @@ -322,3 +322,10 @@ return (br); } + +void +buf_ring_free(struct buf_ring *br) +{ + free(br->br_ring, M_DEVBUF); + free(br, M_DEVBUF); +} From owner-p4-projects@FreeBSD.ORG Mon Nov 12 21:13:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFA0316A421; Mon, 12 Nov 2007 21:13:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7191D16A419 for ; Mon, 12 Nov 2007 21:13:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 612B713C4B0 for ; Mon, 12 Nov 2007 21:13:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACLDcLO055408 for ; Mon, 12 Nov 2007 21:13:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACLDcos055405 for perforce@freebsd.org; Mon, 12 Nov 2007 21:13:38 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 12 Nov 2007 21:13:38 GMT Message-Id: <200711122113.lACLDcos055405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 21:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=128992 Change 128992 by kmacy@kmacy_home:ethng on 2007/11/12 21:13:31 make mbuf_put as close to skb_put as possible in the absence of head and tailroom Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_compat.h#8 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/linux_compat.h#8 (text+ko) ==== @@ -64,12 +64,11 @@ static __inline caddr_t mbuf_put(struct mbuf *m, unsigned int len) { - caddr_t tmp = m->m_data; + caddr_t tmp = mtod(m, caddr_t); - panic("FIXME"); - - m->m_data += len; m->m_len += len; + if (m->m_flags & M_PKTHDR) + m->m_pkthdr.len += len; return (tmp); } From owner-p4-projects@FreeBSD.ORG Mon Nov 12 21:17:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6039E16A420; Mon, 12 Nov 2007 21:17:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EC0316A41A for ; Mon, 12 Nov 2007 21:17:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFC4C13C4B9 for ; Mon, 12 Nov 2007 21:17:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lACLHuWZ056393 for ; Mon, 12 Nov 2007 21:17:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lACLHgVW056355 for perforce@freebsd.org; Mon, 12 Nov 2007 21:17:42 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 12 Nov 2007 21:17:42 GMT Message-Id: <200711122117.lACLHgVW056355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2007 21:17:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=128993 Change 128993 by kmacy@freefall_kmacy_iwarp on 2007/11/12 21:16:51 IFethng 128992 Affected files ... .. //depot/projects/iwarp/Makefile.inc1#3 integrate .. //depot/projects/iwarp/ObsoleteFiles.inc#3 integrate .. //depot/projects/iwarp/bin/mv/mv.1#2 integrate .. //depot/projects/iwarp/bin/ps/keyword.c#3 integrate .. //depot/projects/iwarp/bin/ps/ps.c#3 integrate .. //depot/projects/iwarp/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/iwarp/contrib/libreadline/complete.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/display.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/input.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/misc.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/readline.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/text.c#2 integrate .. //depot/projects/iwarp/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/iwarp/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/iwarp/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/VERSION#2 integrate .. //depot/projects/iwarp/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/iwarp/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/iwarp/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/iwarp/contrib/openbsm/configure#2 integrate .. //depot/projects/iwarp/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/iwarp/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/iwarp/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/iwarp/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/iwarp/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/iwarp/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/iwarp/contrib/sendmail/CACerts#2 integrate .. //depot/projects/iwarp/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/iwarp/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/iwarp/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/iwarp/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/iwarp/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/iwarp/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/iwarp/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/iwarp/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/iwarp/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/iwarp/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/iwarp/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/iwarp/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/iwarp/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/iwarp/etc/Makefile#3 integrate .. //depot/projects/iwarp/etc/defaults/Makefile#2 integrate .. //depot/projects/iwarp/etc/defaults/pccard.conf#2 delete .. //depot/projects/iwarp/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/iwarp/etc/namedb/named.root#2 integrate .. //depot/projects/iwarp/etc/network.subr#2 integrate .. //depot/projects/iwarp/etc/pf.conf#2 delete .. //depot/projects/iwarp/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/iwarp/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/iwarp/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/iwarp/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/iwarp/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/iwarp/include/_ctype.h#3 integrate .. //depot/projects/iwarp/include/pthread.h#2 integrate .. //depot/projects/iwarp/include/pthread_np.h#2 integrate .. //depot/projects/iwarp/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/iwarp/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/iwarp/lib/libc/net/ethers.3#2 integrate .. //depot/projects/iwarp/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/iwarp/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/iwarp/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/iwarp/libexec/Makefile#2 integrate .. //depot/projects/iwarp/release/Makefile#2 integrate .. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/iwarp/release/scripts/package-split.py#2 integrate .. //depot/projects/iwarp/release/scripts/src-install.sh#2 integrate .. //depot/projects/iwarp/rescue/rescue/Makefile#3 integrate .. //depot/projects/iwarp/sbin/geom/Makefile#2 integrate .. //depot/projects/iwarp/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/iwarp/sbin/geom/core/geom.c#2 integrate .. //depot/projects/iwarp/sbin/gpt/boot.c#2 integrate .. //depot/projects/iwarp/sbin/gpt/gpt.c#3 integrate .. //depot/projects/iwarp/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/iwarp/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/iwarp/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/iwarp/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/iwarp/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/iwarp/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/iwarp/sbin/rcorder/hash.c#2 integrate .. //depot/projects/iwarp/sbin/rcorder/hash.h#2 integrate .. //depot/projects/iwarp/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/iwarp/sbin/route/route.8#2 integrate .. //depot/projects/iwarp/sbin/route/route.c#2 integrate .. //depot/projects/iwarp/sbin/setkey/parse.y#2 integrate .. //depot/projects/iwarp/sbin/setkey/setkey.c#2 integrate .. //depot/projects/iwarp/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/iwarp/sbin/setkey/token.l#2 integrate .. //depot/projects/iwarp/share/doc/legal/Makefile#2 integrate .. //depot/projects/iwarp/share/doc/legal/intel_wpi/Makefile#1 branch .. //depot/projects/iwarp/share/examples/pf/Makefile#2 integrate .. //depot/projects/iwarp/share/examples/pf/ackpri#2 integrate .. //depot/projects/iwarp/share/examples/pf/faq-example1#2 integrate .. //depot/projects/iwarp/share/examples/pf/faq-example2#2 integrate .. //depot/projects/iwarp/share/examples/pf/faq-example3#2 integrate .. //depot/projects/iwarp/share/examples/pf/pf.conf#1 branch .. //depot/projects/iwarp/share/examples/pf/queue1#2 integrate .. //depot/projects/iwarp/share/examples/pf/queue2#2 integrate .. //depot/projects/iwarp/share/examples/pf/queue3#2 integrate .. //depot/projects/iwarp/share/examples/pf/queue4#2 integrate .. //depot/projects/iwarp/share/examples/pf/spamd#2 integrate .. //depot/projects/iwarp/share/man/man3/queue.3#2 integrate .. //depot/projects/iwarp/share/man/man4/Makefile#3 integrate .. //depot/projects/iwarp/share/man/man4/mac.4#2 integrate .. //depot/projects/iwarp/share/man/man4/md.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ng_car.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/iwarp/share/man/man4/nxge.4#2 integrate .. //depot/projects/iwarp/share/man/man4/wpi.4#1 branch .. //depot/projects/iwarp/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/iwarp/share/man/man5/quota.user.5#2 integrate .. //depot/projects/iwarp/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/iwarp/share/man/man5/xfs.5#2 integrate .. //depot/projects/iwarp/share/man/man7/tuning.7#2 integrate .. //depot/projects/iwarp/share/man/man9/Makefile#3 integrate .. //depot/projects/iwarp/share/man/man9/locking.9#2 integrate .. //depot/projects/iwarp/share/man/man9/rmlock.9#1 branch .. //depot/projects/iwarp/share/man/man9/uio.9#2 integrate .. //depot/projects/iwarp/share/misc/bsd-family-tree#2 integrate .. //depot/projects/iwarp/share/misc/committers-ports.dot#2 integrate .. //depot/projects/iwarp/share/misc/pci_vendors#2 integrate .. //depot/projects/iwarp/share/mk/sys.mk#3 integrate .. //depot/projects/iwarp/share/zoneinfo/asia#2 integrate .. //depot/projects/iwarp/share/zoneinfo/northamerica#2 integrate .. //depot/projects/iwarp/share/zoneinfo/pacificnew#1 branch .. //depot/projects/iwarp/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/iwarp/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/iwarp/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/iwarp/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/iwarp/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/iwarp/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/iwarp/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/iwarp/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/iwarp/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/iwarp/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/iwarp/sys/boot/common/loader.8#2 integrate .. //depot/projects/iwarp/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/iwarp/sys/bsm/audit.h#2 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/iwarp/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/iwarp/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/iwarp/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/iwarp/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/iwarp/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/iwarp/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/iwarp/sys/conf/NOTES#2 integrate .. //depot/projects/iwarp/sys/conf/files#4 integrate .. //depot/projects/iwarp/sys/conf/files.amd64#3 integrate .. //depot/projects/iwarp/sys/conf/files.i386#3 integrate .. //depot/projects/iwarp/sys/conf/options.arm#3 integrate .. //depot/projects/iwarp/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/iwarp/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/iwarp/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/iwarp/sys/dev/aac/aac.c#3 integrate .. //depot/projects/iwarp/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/iwarp/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/iwarp/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/iwarp/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/iwarp/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/iwarp/sys/dev/md/md.c#3 integrate .. //depot/projects/iwarp/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/iwarp/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/iwarp/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/iwarp/sys/dev/mii/miidevs#2 integrate .. //depot/projects/iwarp/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/iwarp/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/iwarp/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/iwarp/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/iwarp/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/iwarp/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/iwarp/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/iwarp/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/iwarp/sys/dev/safe/safe.c#2 integrate .. //depot/projects/iwarp/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/iwarp/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/iwarp/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/iwarp/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/iwarp/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/iwarp/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/iwarp/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/iwarp/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/iwarp/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/iwarp/sys/i386/conf/NOTES#2 integrate .. //depot/projects/iwarp/sys/i386/conf/PAE#3 integrate .. //depot/projects/iwarp/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/iwarp/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/iwarp/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/iwarp/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/iwarp/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/iwarp/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/iwarp/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_exec.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_fork.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_intr.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_kse.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_proc.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/iwarp/sys/kern/kern_sig.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_thr.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_thread.c#3 integrate .. //depot/projects/iwarp/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/iwarp/sys/kern/subr_lock.c#2 integrate .. //depot/projects/iwarp/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/iwarp/sys/kern/subr_smp.c#2 integrate .. //depot/projects/iwarp/sys/kern/sys_process.c#2 integrate .. //depot/projects/iwarp/sys/kern/tty_pty.c#2 integrate .. //depot/projects/iwarp/sys/modules/Makefile#3 integrate .. //depot/projects/iwarp/sys/modules/asmc/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/wpi/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/iwarp/sys/net/if_bridge.c#3 integrate .. //depot/projects/iwarp/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/iwarp/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/iwarp/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/iwarp/sys/netatalk/aarp.c#3 integrate .. //depot/projects/iwarp/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/iwarp/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/iwarp/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/iwarp/sys/netinet/if_ether.c#4 integrate .. //depot/projects/iwarp/sys/netinet/igmp.c#3 integrate .. //depot/projects/iwarp/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/iwarp/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/iwarp/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/iwarp/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/iwarp/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/iwarp/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/iwarp/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/iwarp/sys/netinet/sctputil.c#3 integrate .. //depot/projects/iwarp/sys/netinet/sctputil.h#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/iwarp/sys/netinet6/nd6.c#3 integrate .. //depot/projects/iwarp/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/iwarp/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/iwarp/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_ali.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_amd.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_ati.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_i810.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_intel.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_sis.c#2 integrate .. //depot/projects/iwarp/sys/pci/agp_via.c#2 integrate .. //depot/projects/iwarp/sys/pci/agppriv.h#2 integrate .. //depot/projects/iwarp/sys/pci/nfsmb.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit.c#3 integrate .. //depot/projects/iwarp/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/iwarp/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/iwarp/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/iwarp/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/iwarp/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/iwarp/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/iwarp/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/iwarp/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/iwarp/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/iwarp/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/iwarp/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/iwarp/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/iwarp/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/iwarp/sys/sys/_rmlock.h#1 branch .. //depot/projects/iwarp/sys/sys/linux_compat.h#6 integrate .. //depot/projects/iwarp/sys/sys/lock.h#2 integrate .. //depot/projects/iwarp/sys/sys/malloc.h#2 integrate .. //depot/projects/iwarp/sys/sys/pcpu.h#2 integrate .. //depot/projects/iwarp/sys/sys/proc.h#3 integrate .. //depot/projects/iwarp/sys/sys/rmlock.h#1 branch .. //depot/projects/iwarp/sys/sys/signalvar.h#2 integrate .. //depot/projects/iwarp/sys/sys/smp.h#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/iwarp/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/iwarp/sys/vm/phys_pager.c#2 integrate .. //depot/projects/iwarp/sys/vm/pmap.h#2 integrate .. //depot/projects/iwarp/sys/vm/swap_pager.c#3 integrate .. //depot/projects/iwarp/sys/vm/vm_extern.h#2 integrate .. //depot/projects/iwarp/sys/vm/vm_glue.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_kern.c#2 integrate .. //depot/projects/iwarp/sys/vm/vm_map.c#3 integrate .. //depot/projects/iwarp/sys/vm/vm_map.h#2 integrate .. //depot/projects/iwarp/sys/vm/vm_page.c#3 integrate .. //depot/projects/iwarp/tools/build/options/makeman#2 integrate .. //depot/projects/iwarp/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/iwarp/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/iwarp/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/iwarp/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/iwarp/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/iwarp/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/iwarp/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/iwarp/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/iwarp/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/iwarp/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/iwarp/usr.bin/calendar/io.c#2 integrate .. //depot/projects/iwarp/usr.bin/du/du.c#2 integrate .. //depot/projects/iwarp/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/iwarp/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/iwarp/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/iwarp/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/iwarp/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/iwarp/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/iwarp/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/iwarp/usr.bin/killall/killall.1#2 integrate .. //depot/projects/iwarp/usr.bin/killall/killall.c#2 integrate .. //depot/projects/iwarp/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/iwarp/usr.bin/mail/aux.c#2 integrate .. //depot/projects/iwarp/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/iwarp/usr.bin/mail/lex.c#2 integrate .. //depot/projects/iwarp/usr.bin/mail/list.c#2 integrate .. //depot/projects/iwarp/usr.bin/mail/main.c#2 integrate .. //depot/projects/iwarp/usr.bin/make/make.1#2 integrate .. //depot/projects/iwarp/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/iwarp/usr.bin/msgs/msgs.c#2 integrate .. //depot/projects/iwarp/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/iwarp/usr.bin/sed/main.c#2 integrate .. //depot/projects/iwarp/usr.bin/tail/read.c#3 integrate .. //depot/projects/iwarp/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/iwarp/usr.bin/tail/tail.c#2 integrate .. //depot/projects/iwarp/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/iwarp/usr.bin/xstr/xstr.1#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/iwarp/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/iwarp/usr.sbin/cron/lib/entry.c#2 integrate .. //depot/projects/iwarp/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/iwarp/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/iwarp/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/iwarp/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/iwarp/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/iwarp/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/iwarp/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/iwarp/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/iwarp/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/iwarp/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/iwarp/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/iwarp/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/iwarp/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/iwarp/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/iwarp/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/iwarp/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/iwarp/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/iwarp/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/options.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/pppd.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/sys-bsd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/iwarp/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rip6query/rip6query.c#2 integrate .. //depot/projects/iwarp/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/iwarp/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/iwarp/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/iwarp/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/iwarp/usr.sbin/rrenumd/rrenumd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/iwarp/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/iwarp/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/iwarp/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/iwarp/usr.sbin/sysinstall/dmenu.c#2 integrate .. //depot/projects/iwarp/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/iwarp/usr.sbin/tcpdrop/tcpdrop.c#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/iwarp/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/iwarp/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/iwarp/usr.sbin/wpa/hostapd/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/iwarp/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall ==== //depot/projects/iwarp/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,9 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd +OLD_FILES+=etc/cached.conf OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached OLD_FILES+=usr/share/man/man5/cached.conf.5.gz ==== //depot/projects/iwarp/bin/mv/mv.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/iwarp/bin/ps/keyword.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,9 +186,8 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, - {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, - NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/iwarp/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/iwarp/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/iwarp/contrib/libreadline/complete.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/iwarp/contrib/libreadline/display.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 13 00:25:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 179C516A418; Tue, 13 Nov 2007 00:25:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B68816A419 for ; Tue, 13 Nov 2007 00:25:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C4CC13C494 for ; Tue, 13 Nov 2007 00:25:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD0PQkm070394 for ; Tue, 13 Nov 2007 00:25:26 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD0PQsM070391 for perforce@freebsd.org; Tue, 13 Nov 2007 00:25:26 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 13 Nov 2007 00:25:26 GMT Message-Id: <200711130025.lAD0PQsM070391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 129005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 00:25:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=129005 Change 129005 by zec@zec_tpx32 on 2007/11/13 00:24:48 When detaching an ifnet, attempt to detach from any vlan, bridge, lagg or similar ifnets linked to us as early as possible. This fixes a panic that can be provoked as follows: ngctl mkpeer eiface ether ether ifconfig vlan create ifconfig vlan0 vlan 1 vlandev ngeth0 ifconfig vlan0 10.0.0.1 up ngctl shut ngeth0: The panic is reproducible both in HEAD and vimage branch. Reported by: Nikos Vassiliadis Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#22 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#22 (text+ko) ==== @@ -766,6 +766,14 @@ struct ifnet *iter; int found = 0; + /* + * Detach from any vlan, bridge or lagg ifnets linked to us. + * A small though unlikely window for a race from here to ifp + * unlinking from ifnet list is possible, hence we repeat the + * procedure once again further bellow. XXX. + */ + EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); + IFNET_WLOCK(); TAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { From owner-p4-projects@FreeBSD.ORG Tue Nov 13 00:54:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C831E16A41B; Tue, 13 Nov 2007 00:54:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19E3816A41A for ; Tue, 13 Nov 2007 00:54:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0403313C4C8 for ; Tue, 13 Nov 2007 00:54:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD0s9nN080307 for ; Tue, 13 Nov 2007 00:54:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD0rupt080300 for perforce@freebsd.org; Tue, 13 Nov 2007 00:53:56 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 13 Nov 2007 00:53:56 GMT Message-Id: <200711130053.lAD0rupt080300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 00:54:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=129006 Change 129006 by kmacy@kmacy:storage:toestack on 2007/11/13 00:53:18 IFethng #128992 Affected files ... .. //depot/projects/toestack/Makefile.inc1#5 integrate .. //depot/projects/toestack/ObsoleteFiles.inc#5 integrate .. //depot/projects/toestack/bin/mv/mv.1#2 integrate .. //depot/projects/toestack/bin/ps/keyword.c#3 integrate .. //depot/projects/toestack/bin/ps/ps.c#4 integrate .. //depot/projects/toestack/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/toestack/contrib/libreadline/complete.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/display.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/input.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/misc.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/readline.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/text.c#2 integrate .. //depot/projects/toestack/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/toestack/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/toestack/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/VERSION#2 integrate .. //depot/projects/toestack/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/toestack/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/toestack/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/toestack/contrib/openbsm/configure#2 integrate .. //depot/projects/toestack/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/toestack/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/toestack/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/toestack/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/toestack/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/toestack/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/sendmail/CACerts#2 integrate .. //depot/projects/toestack/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/toestack/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/toestack/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/toestack/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/toestack/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/toestack/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/toestack/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/toestack/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/toestack/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/toestack/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/toestack/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/toestack/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/toestack/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/toestack/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/toestack/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/toestack/etc/Makefile#4 integrate .. //depot/projects/toestack/etc/defaults/Makefile#2 integrate .. //depot/projects/toestack/etc/defaults/pccard.conf#2 delete .. //depot/projects/toestack/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/toestack/etc/namedb/named.root#2 integrate .. //depot/projects/toestack/etc/network.subr#2 integrate .. //depot/projects/toestack/etc/pf.conf#2 delete .. //depot/projects/toestack/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/toestack/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/toestack/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/toestack/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/toestack/include/_ctype.h#4 integrate .. //depot/projects/toestack/include/pthread.h#2 integrate .. //depot/projects/toestack/include/pthread_np.h#2 integrate .. //depot/projects/toestack/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/toestack/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/toestack/lib/libc/net/ethers.3#2 integrate .. //depot/projects/toestack/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/toestack/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/toestack/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/toestack/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/toestack/libexec/Makefile#2 integrate .. //depot/projects/toestack/release/Makefile#3 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/toestack/release/scripts/package-split.py#2 integrate .. //depot/projects/toestack/release/scripts/src-install.sh#2 integrate .. //depot/projects/toestack/rescue/rescue/Makefile#3 integrate .. //depot/projects/toestack/sbin/geom/Makefile#2 integrate .. //depot/projects/toestack/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/toestack/sbin/geom/core/geom.c#3 integrate .. //depot/projects/toestack/sbin/gpt/boot.c#2 integrate .. //depot/projects/toestack/sbin/gpt/gpt.c#3 integrate .. //depot/projects/toestack/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/toestack/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/toestack/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/toestack/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/toestack/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/toestack/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/toestack/sbin/rcorder/hash.c#2 integrate .. //depot/projects/toestack/sbin/rcorder/hash.h#2 integrate .. //depot/projects/toestack/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/toestack/sbin/route/route.8#2 integrate .. //depot/projects/toestack/sbin/route/route.c#2 integrate .. //depot/projects/toestack/sbin/setkey/parse.y#2 integrate .. //depot/projects/toestack/sbin/setkey/setkey.c#2 integrate .. //depot/projects/toestack/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/toestack/sbin/setkey/token.l#2 integrate .. //depot/projects/toestack/share/doc/legal/Makefile#2 integrate .. //depot/projects/toestack/share/doc/legal/intel_wpi/Makefile#1 branch .. //depot/projects/toestack/share/examples/pf/Makefile#2 integrate .. //depot/projects/toestack/share/examples/pf/ackpri#2 integrate .. //depot/projects/toestack/share/examples/pf/faq-example1#2 integrate .. //depot/projects/toestack/share/examples/pf/faq-example2#2 integrate .. //depot/projects/toestack/share/examples/pf/faq-example3#2 integrate .. //depot/projects/toestack/share/examples/pf/pf.conf#1 branch .. //depot/projects/toestack/share/examples/pf/queue1#2 integrate .. //depot/projects/toestack/share/examples/pf/queue2#2 integrate .. //depot/projects/toestack/share/examples/pf/queue3#2 integrate .. //depot/projects/toestack/share/examples/pf/queue4#2 integrate .. //depot/projects/toestack/share/examples/pf/spamd#2 integrate .. //depot/projects/toestack/share/man/man3/queue.3#2 integrate .. //depot/projects/toestack/share/man/man4/Makefile#4 integrate .. //depot/projects/toestack/share/man/man4/mac.4#2 integrate .. //depot/projects/toestack/share/man/man4/md.4#2 integrate .. //depot/projects/toestack/share/man/man4/ng_car.4#2 integrate .. //depot/projects/toestack/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/toestack/share/man/man4/nxge.4#2 integrate .. //depot/projects/toestack/share/man/man4/wpi.4#1 branch .. //depot/projects/toestack/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/toestack/share/man/man5/quota.user.5#2 integrate .. //depot/projects/toestack/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/toestack/share/man/man5/xfs.5#2 integrate .. //depot/projects/toestack/share/man/man7/tuning.7#2 integrate .. //depot/projects/toestack/share/man/man9/Makefile#7 integrate .. //depot/projects/toestack/share/man/man9/locking.9#2 integrate .. //depot/projects/toestack/share/man/man9/rmlock.9#1 branch .. //depot/projects/toestack/share/man/man9/uio.9#2 integrate .. //depot/projects/toestack/share/misc/bsd-family-tree#2 integrate .. //depot/projects/toestack/share/misc/committers-ports.dot#3 integrate .. //depot/projects/toestack/share/misc/pci_vendors#2 integrate .. //depot/projects/toestack/share/mk/sys.mk#3 integrate .. //depot/projects/toestack/share/zoneinfo/asia#3 integrate .. //depot/projects/toestack/share/zoneinfo/northamerica#2 integrate .. //depot/projects/toestack/share/zoneinfo/pacificnew#1 branch .. //depot/projects/toestack/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/toestack/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/toestack/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/toestack/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/toestack/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/toestack/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/toestack/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/toestack/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/toestack/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/toestack/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/toestack/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/toestack/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/toestack/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/toestack/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/toestack/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/toestack/sys/boot/common/loader.8#2 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/toestack/sys/bsm/audit.h#2 integrate .. //depot/projects/toestack/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/toestack/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/toestack/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/toestack/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/toestack/sys/conf/NOTES#3 integrate .. //depot/projects/toestack/sys/conf/files.amd64#6 integrate .. //depot/projects/toestack/sys/conf/files.i386#5 integrate .. //depot/projects/toestack/sys/conf/options.arm#3 integrate .. //depot/projects/toestack/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/toestack/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/toestack/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/toestack/sys/dev/aac/aac.c#3 integrate .. //depot/projects/toestack/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/toestack/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/toestack/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/toestack/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/toestack/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/toestack/sys/dev/md/md.c#3 integrate .. //depot/projects/toestack/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/toestack/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/miidevs#2 integrate .. //depot/projects/toestack/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/toestack/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/toestack/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/toestack/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/toestack/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/toestack/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/toestack/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/toestack/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/toestack/sys/dev/safe/safe.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/toestack/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/toestack/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/toestack/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/toestack/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/toestack/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/toestack/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/toestack/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/toestack/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/toestack/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/toestack/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/toestack/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/toestack/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/toestack/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/toestack/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/toestack/sys/i386/conf/NOTES#2 integrate .. //depot/projects/toestack/sys/i386/conf/PAE#3 integrate .. //depot/projects/toestack/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/toestack/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/toestack/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/toestack/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/toestack/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/toestack/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/toestack/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/toestack/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/toestack/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/toestack/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_exec.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_fork.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_intr.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_kse.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_proc.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/toestack/sys/kern/kern_sig.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_thr.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_thread.c#4 integrate .. //depot/projects/toestack/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/toestack/sys/kern/subr_lock.c#3 integrate .. //depot/projects/toestack/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/toestack/sys/kern/subr_smp.c#3 integrate .. //depot/projects/toestack/sys/kern/sys_process.c#4 integrate .. //depot/projects/toestack/sys/kern/tty_pty.c#2 integrate .. //depot/projects/toestack/sys/modules/Makefile#7 integrate .. //depot/projects/toestack/sys/modules/asmc/Makefile#1 branch .. //depot/projects/toestack/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/toestack/sys/modules/wpi/Makefile#1 branch .. //depot/projects/toestack/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/toestack/sys/net/if_bridge.c#4 integrate .. //depot/projects/toestack/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/toestack/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/toestack/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/toestack/sys/netatalk/aarp.c#3 integrate .. //depot/projects/toestack/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/toestack/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/toestack/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/toestack/sys/netinet/if_ether.c#11 integrate .. //depot/projects/toestack/sys/netinet/igmp.c#4 integrate .. //depot/projects/toestack/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/toestack/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/toestack/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/toestack/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/toestack/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/toestack/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/toestack/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/toestack/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/toestack/sys/netinet/sctputil.c#7 integrate .. //depot/projects/toestack/sys/netinet/sctputil.h#4 integrate .. //depot/projects/toestack/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/toestack/sys/netinet6/nd6.c#3 integrate .. //depot/projects/toestack/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/toestack/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/toestack/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/toestack/sys/pci/agp.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_ali.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_amd.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_ati.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_i810.c#3 integrate .. //depot/projects/toestack/sys/pci/agp_intel.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_sis.c#2 integrate .. //depot/projects/toestack/sys/pci/agp_via.c#3 integrate .. //depot/projects/toestack/sys/pci/agppriv.h#2 integrate .. //depot/projects/toestack/sys/pci/nfsmb.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/toestack/sys/security/audit/audit.c#3 integrate .. //depot/projects/toestack/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/toestack/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/toestack/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/toestack/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/toestack/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/toestack/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/toestack/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/toestack/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/toestack/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/toestack/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/toestack/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/toestack/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/toestack/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/toestack/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/toestack/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/toestack/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/toestack/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/toestack/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/toestack/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/toestack/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/toestack/sys/sys/_rmlock.h#1 branch .. //depot/projects/toestack/sys/sys/linux_compat.h#4 integrate .. //depot/projects/toestack/sys/sys/lock.h#2 integrate .. //depot/projects/toestack/sys/sys/malloc.h#2 integrate .. //depot/projects/toestack/sys/sys/pcpu.h#2 integrate .. //depot/projects/toestack/sys/sys/proc.h#5 integrate .. //depot/projects/toestack/sys/sys/rmlock.h#1 branch .. //depot/projects/toestack/sys/sys/signalvar.h#2 integrate .. //depot/projects/toestack/sys/sys/smp.h#2 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/toestack/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/toestack/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/toestack/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/toestack/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/toestack/sys/vm/phys_pager.c#2 integrate .. //depot/projects/toestack/sys/vm/pmap.h#2 integrate .. //depot/projects/toestack/sys/vm/swap_pager.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_extern.h#3 integrate .. //depot/projects/toestack/sys/vm/vm_glue.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_kern.c#2 integrate .. //depot/projects/toestack/sys/vm/vm_map.c#4 integrate .. //depot/projects/toestack/sys/vm/vm_map.h#2 integrate .. //depot/projects/toestack/sys/vm/vm_page.c#5 integrate .. //depot/projects/toestack/tools/build/options/makeman#2 integrate .. //depot/projects/toestack/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/toestack/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/toestack/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/toestack/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/toestack/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/toestack/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/toestack/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/toestack/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/toestack/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/toestack/usr.bin/calendar/io.c#2 integrate .. //depot/projects/toestack/usr.bin/du/du.c#2 integrate .. //depot/projects/toestack/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/toestack/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/toestack/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/toestack/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/toestack/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/toestack/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/toestack/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/toestack/usr.bin/killall/killall.1#2 integrate .. //depot/projects/toestack/usr.bin/killall/killall.c#2 integrate .. //depot/projects/toestack/usr.bin/lockf/lockf.1#3 integrate .. //depot/projects/toestack/usr.bin/mail/aux.c#2 integrate .. //depot/projects/toestack/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/toestack/usr.bin/mail/lex.c#2 integrate .. //depot/projects/toestack/usr.bin/mail/list.c#2 integrate .. //depot/projects/toestack/usr.bin/mail/main.c#2 integrate .. //depot/projects/toestack/usr.bin/make/make.1#2 integrate .. //depot/projects/toestack/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/toestack/usr.bin/msgs/msgs.c#2 integrate .. //depot/projects/toestack/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/toestack/usr.bin/sed/main.c#2 integrate .. //depot/projects/toestack/usr.bin/tail/read.c#3 integrate .. //depot/projects/toestack/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/toestack/usr.bin/tail/tail.c#2 integrate .. //depot/projects/toestack/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/toestack/usr.bin/xstr/xstr.1#2 integrate .. //depot/projects/toestack/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/toestack/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/toestack/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/toestack/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/toestack/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/toestack/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/toestack/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/toestack/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/toestack/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/toestack/usr.sbin/cron/lib/entry.c#2 integrate .. //depot/projects/toestack/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/toestack/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/toestack/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/toestack/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/toestack/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/toestack/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/toestack/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/toestack/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/toestack/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/toestack/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/toestack/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/toestack/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/toestack/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/toestack/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/toestack/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/toestack/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/toestack/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/toestack/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/toestack/usr.sbin/pciconf/pciconf.8#4 integrate .. //depot/projects/toestack/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/toestack/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/toestack/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/toestack/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/toestack/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/options.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/pppd.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/sys-bsd.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/toestack/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/toestack/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/toestack/usr.sbin/rip6query/rip6query.c#2 integrate .. //depot/projects/toestack/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/toestack/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/toestack/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/toestack/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/toestack/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/toestack/usr.sbin/rrenumd/rrenumd.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/toestack/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/dmenu.c#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/toestack/usr.sbin/tcpdrop/tcpdrop.c#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/toestack/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/toestack/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/toestack/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/toestack/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/toestack/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/toestack/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall ==== //depot/projects/toestack/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,9 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd +OLD_FILES+=etc/cached.conf OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached OLD_FILES+=usr/share/man/man5/cached.conf.5.gz ==== //depot/projects/toestack/bin/mv/mv.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/toestack/bin/ps/keyword.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); #include #include @@ -186,9 +186,8 @@ {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, - {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, - NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/toestack/bin/ps/ps.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/toestack/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/toestack/contrib/libreadline/complete.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/toestack/contrib/libreadline/display.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 13 00:55:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04B1A16A41B; Tue, 13 Nov 2007 00:55:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE07A16A419 for ; Tue, 13 Nov 2007 00:55:11 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE1B613C4C8 for ; Tue, 13 Nov 2007 00:55:11 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD0tB80080387 for ; Tue, 13 Nov 2007 00:55:11 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD0tBga080384 for perforce@freebsd.org; Tue, 13 Nov 2007 00:55:11 GMT (envelope-from swise@FreeBSD.org) Date: Tue, 13 Nov 2007 00:55:11 GMT Message-Id: <200711130055.lAD0tBga080384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 129007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 00:55:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=129007 Change 129007 by swise@swise:vic10:iwarp on 2007/11/13 00:54:56 iw_cxgb loads and registers with rdma_core. (still lots o' hacks). Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#4 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_osdep.h#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#2 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 (text+ko) ==== @@ -126,7 +126,7 @@ unsigned int udbell_len; /* user doorbell region length */ unsigned long udbell_physbase; /* user doorbell physical start addr */ void *kdb_addr; /* kernel doorbell register address */ - struct pci_dev *pdev; /* associated PCI device */ + struct device *pdev; /* associated PCI device */ }; /* ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#4 (text+ko) ==== @@ -303,6 +303,7 @@ req->rqt_base = t3_read_reg(adapter, A_ULPRX_RQ_LLIMIT); req->rqt_top = t3_read_reg(adapter, A_ULPRX_RQ_ULIMIT); req->kdb_addr = (void *)(rman_get_start(adapter->regs_res) + A_SG_KDOORBELL); + req->pdev = adapter->dev; break; } case RDMA_CQ_OP: { ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_osdep.h#3 (text+ko) ==== ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#2 (text+ko) ==== @@ -207,7 +207,7 @@ cq->sw_queue = malloc(size, M_DEVBUF, M_WAITOK|M_ZERO); if (!cq->sw_queue) return (ENOMEM); - cq->queue = dma_alloc_coherent(rdev_p->rnic_info.pdev->dev, + cq->queue = dma_alloc_coherent(rdev_p->rnic_info.pdev, (1UL << (cq->size_log2)) * sizeof(struct t3_cqe), &(cq->dma_addr), M_WAITOK); @@ -307,7 +307,7 @@ cxio_init_ucontext(struct cxio_rdev *rdev_p, struct cxio_ucontext *uctx) { TAILQ_INIT(&uctx->qpids); - mtx_init(&uctx->lock, "cxio ctx", NULL, MTX_DEF); + mtx_init(&uctx->lock, "cxio uctx", NULL, MTX_DEF|MTX_DUPOK); } int @@ -333,7 +333,7 @@ if (!wq->sq) goto err3; - wq->queue = dma_alloc_coherent(rdev_p->rnic_info.pdev->dev, + wq->queue = dma_alloc_coherent(rdev_p->rnic_info.pdev, depth * sizeof(union t3_wr), &(wq->dma_addr), M_WAITOK); if (!wq->queue) @@ -365,7 +365,7 @@ int err; err = cxio_hal_clear_cq_ctx(rdev_p, cq->cqid); free(cq->sw_queue, M_DEVBUF); - dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), + dma_free_coherent(&(rdev_p->rnic_info.pdev), (1UL << (cq->size_log2)) * sizeof(struct t3_cqe), cq->queue, pci_unmap_addr(cq, mapping)); @@ -377,7 +377,7 @@ cxio_destroy_qp(struct cxio_rdev *rdev_p, struct t3_wq *wq, struct cxio_ucontext *uctx) { - dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), + dma_free_coherent(&(rdev_p->rnic_info.pdev), (1UL << (wq->size_log2)) * sizeof(union t3_wr), wq->queue, pci_unmap_addr(wq, mapping)); @@ -571,7 +571,7 @@ goto err; } rdev_p->ctrl_qp.workq = dma_alloc_coherent( - rdev_p->rnic_info.pdev->dev, + rdev_p->rnic_info.pdev, (1 << T3_CTRL_QP_SIZE_LOG2) * sizeof(union t3_wr), &(rdev_p->ctrl_qp.dma_addr), @@ -587,8 +587,8 @@ memset(rdev_p->ctrl_qp.workq, 0, (1 << T3_CTRL_QP_SIZE_LOG2) * sizeof(union t3_wr)); - mtx_init(&rdev_p->ctrl_qp.lock, "qp lock", NULL, MTX_DEF); - cv_init(&rdev_p->ctrl_qp.waitq, "qp wait"); + mtx_init(&rdev_p->ctrl_qp.lock, "ctrl-qp lock", NULL, MTX_DEF|MTX_DUPOK); + cv_init(&rdev_p->ctrl_qp.waitq, "ctrl-qp wait"); /* update HW Ctrl QP context */ base_addr = rdev_p->ctrl_qp.dma_addr; @@ -625,7 +625,7 @@ static int cxio_hal_destroy_ctrl_qp(struct cxio_rdev *rdev_p) { - dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), + dma_free_coherent(&(rdev_p->rnic_info.pdev), (1UL << T3_CTRL_QP_SIZE_LOG2) * sizeof(union t3_wr), rdev_p->ctrl_qp.workq, pci_unmap_addr(&rdev_p->ctrl_qp, mapping)); @@ -1077,8 +1077,11 @@ int __init cxio_hal_init(void) { + TAILQ_INIT(&rdev_list); +#ifdef needed if (cxio_hal_init_rhdl_resource(T3_MAX_NUM_RI)) return (ENOMEM); +#endif t3_register_cpl_handler(CPL_ASYNC_NOTIF, cxio_hal_ev_handler); return 0; } @@ -1091,7 +1094,9 @@ t3_register_cpl_handler(CPL_ASYNC_NOTIF, NULL); TAILQ_FOREACH_SAFE(rdev, &rdev_list, entry, tmp) cxio_rdev_close(rdev); +#ifdef needed cxio_hal_destroy_rhdl_resource(); +#endif } static void ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#2 (text+ko) ==== @@ -87,8 +87,10 @@ #include #endif +#ifdef needed static struct buf_ring *rhdl_fifo; static struct mtx rhdl_fifo_lock; +#endif #define RANDOM_SIZE 16 @@ -101,7 +103,7 @@ u32 i, j, idx; u32 random_bytes; u32 rarray[16]; - mtx_init(fifo_lock, "cxio fifo", NULL, MTX_DEF); + mtx_init(fifo_lock, "cxio fifo", NULL, MTX_DEF|MTX_DUPOK); *fifo = buf_ring_alloc(nr, M_WAITOK); if (*fifo == NULL) @@ -172,6 +174,7 @@ return 0; } +#ifdef needed int cxio_hal_init_rhdl_resource(u32 nr_rhdl) { return cxio_init_resource_fifo(&rhdl_fifo, &rhdl_fifo_lock, nr_rhdl, 1, @@ -182,6 +185,7 @@ { buf_ring_free(rhdl_fifo); } +#endif /* nr_* must be power of 2 */ int cxio_hal_init_resource(struct cxio_rdev *rdev_p, @@ -191,7 +195,7 @@ int err = 0; struct cxio_hal_resource *rscp; - rscp = malloc(sizeof(*rscp), M_DEVBUF, M_WAITOK); + rscp = malloc(sizeof(*rscp), M_DEVBUF, M_WAITOK|M_ZERO); if (!rscp) return (ENOMEM); rdev_p->rscp = rscp; ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#2 (text+ko) ==== @@ -102,18 +102,11 @@ static void rnic_init(struct iwch_dev *rnicp) { - static int inited = 0; - - if (inited == 0) { - TAILQ_INIT(&dev_list); - inited = 1; - } - PDBG("%s iwch_dev %p\n", __FUNCTION__, rnicp); idr_init(&rnicp->cqidr); idr_init(&rnicp->qpidr); idr_init(&rnicp->mmidr); - mtx_init(&rnicp->lock, "iwch lock", NULL, MTX_DEF); + mtx_init(&rnicp->lock, "iwch rnic lock", NULL, MTX_DEF|MTX_DUPOK); rnicp->attr.vendor_id = 0x168; rnicp->attr.vendor_part_id = 7; @@ -210,11 +203,13 @@ mtx_unlock(&dev_mutex); } -#ifdef notyet static int __init iwch_init_module(void) { int err; + TAILQ_INIT(&dev_list); + mtx_init(&dev_mutex, "iwch dev_list lock", NULL, MTX_DEF); + err = cxio_hal_init(); if (err) return err; @@ -233,4 +228,41 @@ iwch_cm_term(); cxio_hal_exit(); } -#endif + +static int +iwch_load(module_t mod, int cmd, void *arg) +{ + int err = 0; + + switch (cmd) { + case MOD_LOAD: + printf("Loading iw_cxgb.\n"); + + iwch_init_module(); + break; + case MOD_QUIESCE: + break; + case MOD_UNLOAD: + printf("Unloading iw_cxgb.\n"); + iwch_exit_module(); + break; + case MOD_SHUTDOWN: + break; + default: + err = EOPNOTSUPP; + break; + } + + return (err); +} + +static moduledata_t mod_data = { + "iw_cxgb", + iwch_load, + 0 +}; + +MODULE_VERSION(iw_cxgb, 1); +DECLARE_MODULE(iw_cxgb, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); +MODULE_DEPEND(iw_cxgb, rdma_core, 1, 1, 1); +MODULE_DEPEND(iw_cxgb, if_cxgb, 1, 1, 1); ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#2 (text+ko) ==== @@ -1015,7 +1015,7 @@ __FUNCTION__, ibdev, port, index, gid); dev = to_iwch_dev(ibdev); BUG_ON(port == 0 || port > 2); - pi = ((struct port_info *)dev->rdev.ifp->if_softc); + pi = ((struct port_info *)dev->rdev.port_info.lldevs[port-1]->if_softc); memset(&(gid->raw[0]), 0, sizeof(gid->raw)); memcpy(&(gid->raw[0]), pi->hw_addr, 6); return 0; @@ -1034,8 +1034,10 @@ memcpy(&props->sys_image_guid, dev->rdev.t3cdev_p->lldev->if_addr.ifa_addr, 6); #endif props->device_cap_flags = dev->device_cap_flags; +#ifdef notyet props->vendor_id = (u32)dev->rdev.rnic_info.pdev->vendor; props->vendor_part_id = (u32)dev->rdev.rnic_info.pdev->device; +#endif props->max_mr_size = ~0ull; props->max_qp = dev->attr.max_qps; props->max_qp_wr = dev->attr.max_wrs; @@ -1116,8 +1118,12 @@ struct iwch_dev *dev = container_of(cdev, struct iwch_dev, ibdev.class_dev); PDBG("%s class dev 0x%p\n", __FUNCTION__, dev); +#ifdef notyet return sprintf(buf, "%x.%x\n", dev->rdev.rnic_info.pdev->vendor, dev->rdev.rnic_info.pdev->device); +#else + return sprintf(buf, "%x.%x\n", 0xdead, 0xbeef); /* XXX */ +#endif } static CLASS_DEVICE_ATTR(hw_rev, S_IRUGO, show_rev, NULL); @@ -1171,7 +1177,7 @@ memcpy(dev->ibdev.node_desc, IWCH_NODE_DESC, sizeof(IWCH_NODE_DESC)); dev->ibdev.phys_port_cnt = dev->rdev.port_info.nports; dev->ibdev.num_comp_vectors = 1; - dev->ibdev.dma_device = dev->rdev.rnic_info.pdev->dev; + dev->ibdev.dma_device = dev->rdev.rnic_info.pdev; dev->ibdev.query_device = iwch_query_device; dev->ibdev.query_port = iwch_query_port; dev->ibdev.modify_port = iwch_modify_port; From owner-p4-projects@FreeBSD.ORG Tue Nov 13 05:17:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 201D616A421; Tue, 13 Nov 2007 05:17:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5852C16A419 for ; Tue, 13 Nov 2007 05:17:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45DA613C480 for ; Tue, 13 Nov 2007 05:17:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD5HMjV032178 for ; Tue, 13 Nov 2007 05:17:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD5H2D3032175 for perforce@freebsd.org; Tue, 13 Nov 2007 05:17:02 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 13 Nov 2007 05:17:02 GMT Message-Id: <200711130517.lAD5H2D3032175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 05:17:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=129010 Change 129010 by kmacy@entropy_kmacy_xen31 on 2007/11/13 05:17:02 IFC 129008 Affected files ... .. //depot/projects/xen31/Makefile.inc1#2 integrate .. //depot/projects/xen31/ObsoleteFiles.inc#4 integrate .. //depot/projects/xen31/bin/mv/mv.1#2 integrate .. //depot/projects/xen31/bin/ps/ps.c#3 integrate .. //depot/projects/xen31/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31/contrib/libreadline/complete.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/display.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/input.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/misc.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/readline.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/text.c#2 integrate .. //depot/projects/xen31/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/xen31/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/xen31/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/VERSION#2 integrate .. //depot/projects/xen31/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/xen31/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/xen31/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/xen31/contrib/openbsm/configure#2 integrate .. //depot/projects/xen31/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/xen31/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/xen31/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/xen31/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/xen31/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/xen31/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/sendmail/CACerts#2 integrate .. //depot/projects/xen31/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/xen31/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/xen31/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/xen31/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/xen31/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/xen31/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/xen31/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/xen31/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/xen31/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/xen31/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/xen31/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/xen31/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/xen31/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/xen31/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/xen31/etc/Makefile#2 integrate .. //depot/projects/xen31/etc/defaults/Makefile#2 integrate .. //depot/projects/xen31/etc/defaults/pccard.conf#2 delete .. //depot/projects/xen31/etc/freebsd-update.conf#2 integrate .. //depot/projects/xen31/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/xen31/etc/namedb/named.root#2 integrate .. //depot/projects/xen31/etc/network.subr#2 integrate .. //depot/projects/xen31/etc/pf.conf#2 delete .. //depot/projects/xen31/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/xen31/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/xen31/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/xen31/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/xen31/include/_ctype.h#3 integrate .. //depot/projects/xen31/include/pthread.h#2 integrate .. //depot/projects/xen31/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/xen31/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/xen31/lib/libc/net/ethers.3#2 integrate .. //depot/projects/xen31/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/xen31/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/xen31/libexec/Makefile#2 integrate .. //depot/projects/xen31/release/Makefile#2 integrate .. //depot/projects/xen31/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/xen31/release/scripts/package-split.py#2 integrate .. //depot/projects/xen31/release/scripts/src-install.sh#2 integrate .. //depot/projects/xen31/rescue/rescue/Makefile#3 integrate .. //depot/projects/xen31/sbin/geom/Makefile#2 integrate .. //depot/projects/xen31/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/xen31/sbin/geom/core/geom.c#2 integrate .. //depot/projects/xen31/sbin/gpt/boot.c#2 integrate .. //depot/projects/xen31/sbin/gpt/gpt.c#3 integrate .. //depot/projects/xen31/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/xen31/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/xen31/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/xen31/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/xen31/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/xen31/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/xen31/sbin/rcorder/hash.c#2 integrate .. //depot/projects/xen31/sbin/rcorder/hash.h#2 integrate .. //depot/projects/xen31/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/xen31/sbin/route/route.8#2 integrate .. //depot/projects/xen31/sbin/route/route.c#3 integrate .. //depot/projects/xen31/sbin/setkey/parse.y#2 integrate .. //depot/projects/xen31/sbin/setkey/setkey.c#2 integrate .. //depot/projects/xen31/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/xen31/sbin/setkey/token.l#2 integrate .. //depot/projects/xen31/share/doc/legal/Makefile#2 integrate .. //depot/projects/xen31/share/doc/legal/intel_wpi/Makefile#1 branch .. //depot/projects/xen31/share/examples/pf/Makefile#2 integrate .. //depot/projects/xen31/share/examples/pf/ackpri#2 integrate .. //depot/projects/xen31/share/examples/pf/faq-example1#2 integrate .. //depot/projects/xen31/share/examples/pf/faq-example2#2 integrate .. //depot/projects/xen31/share/examples/pf/faq-example3#2 integrate .. //depot/projects/xen31/share/examples/pf/pf.conf#1 branch .. //depot/projects/xen31/share/examples/pf/queue1#2 integrate .. //depot/projects/xen31/share/examples/pf/queue2#2 integrate .. //depot/projects/xen31/share/examples/pf/queue3#2 integrate .. //depot/projects/xen31/share/examples/pf/queue4#2 integrate .. //depot/projects/xen31/share/examples/pf/spamd#2 integrate .. //depot/projects/xen31/share/man/man3/queue.3#2 integrate .. //depot/projects/xen31/share/man/man4/Makefile#2 integrate .. //depot/projects/xen31/share/man/man4/asmc.4#1 branch .. //depot/projects/xen31/share/man/man4/mac.4#2 integrate .. //depot/projects/xen31/share/man/man4/md.4#2 integrate .. //depot/projects/xen31/share/man/man4/ng_car.4#2 integrate .. //depot/projects/xen31/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/xen31/share/man/man4/nxge.4#2 integrate .. //depot/projects/xen31/share/man/man4/wpi.4#1 branch .. //depot/projects/xen31/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/xen31/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/xen31/share/man/man5/quota.user.5#2 integrate .. //depot/projects/xen31/share/man/man5/xfs.5#2 integrate .. //depot/projects/xen31/share/man/man7/tuning.7#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#3 integrate .. //depot/projects/xen31/share/man/man9/locking.9#2 integrate .. //depot/projects/xen31/share/man/man9/rmlock.9#1 branch .. //depot/projects/xen31/share/man/man9/uio.9#2 integrate .. //depot/projects/xen31/share/misc/bsd-family-tree#2 integrate .. //depot/projects/xen31/share/misc/committers-ports.dot#2 integrate .. //depot/projects/xen31/share/mk/sys.mk#3 integrate .. //depot/projects/xen31/share/zoneinfo/asia#2 integrate .. //depot/projects/xen31/share/zoneinfo/northamerica#2 integrate .. //depot/projects/xen31/share/zoneinfo/pacificnew#1 branch .. //depot/projects/xen31/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/xen31/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/xen31/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/xen31/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/xen31/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/xen31/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/xen31/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/xen31/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/xen31/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/xen31/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/xen31/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/xen31/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/xen31/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/xen31/sys/boot/common/loader.8#2 integrate .. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/xen31/sys/bsm/audit.h#2 integrate .. //depot/projects/xen31/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/xen31/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/xen31/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/xen31/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/xen31/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/xen31/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/xen31/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/xen31/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/xen31/sys/conf/NOTES#2 integrate .. //depot/projects/xen31/sys/conf/files#3 integrate .. //depot/projects/xen31/sys/conf/files.amd64#3 integrate .. //depot/projects/xen31/sys/conf/files.i386#3 integrate .. //depot/projects/xen31/sys/conf/files.pc98#3 integrate .. //depot/projects/xen31/sys/conf/kmod.mk#2 integrate .. //depot/projects/xen31/sys/conf/options.arm#3 integrate .. //depot/projects/xen31/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/xen31/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/xen31/sys/dev/aac/aac.c#2 integrate .. //depot/projects/xen31/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/xen31/sys/dev/agp/agp.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/xen31/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/xen31/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/xen31/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/xen31/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/xen31/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/xen31/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/xen31/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/xen31/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/xen31/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/xen31/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/xen31/sys/dev/md/md.c#2 integrate .. //depot/projects/xen31/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/xen31/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/xen31/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/xen31/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/xen31/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/xen31/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/xen31/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/xen31/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/xen31/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/xen31/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/xen31/sys/dev/re/if_re.c#2 integrate .. //depot/projects/xen31/sys/dev/safe/safe.c#2 integrate .. //depot/projects/xen31/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/xen31/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/xen31/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/xen31/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/xen31/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/xen31/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/xen31/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/xen31/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/xen31/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/xen31/sys/i386/conf/NOTES#2 integrate .. //depot/projects/xen31/sys/i386/conf/PAE#3 integrate .. //depot/projects/xen31/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/xen31/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/xen31/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/xen31/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/xen31/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/xen31/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/xen31/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_exec.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_fork.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_intr.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_kse.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_proc.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/xen31/sys/kern/kern_sig.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_thr.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#3 integrate .. //depot/projects/xen31/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/xen31/sys/kern/subr_lock.c#2 integrate .. //depot/projects/xen31/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/xen31/sys/kern/subr_smp.c#2 integrate .. //depot/projects/xen31/sys/kern/sys_process.c#2 integrate .. //depot/projects/xen31/sys/kern/tty_pty.c#2 integrate .. //depot/projects/xen31/sys/modules/Makefile#3 integrate .. //depot/projects/xen31/sys/modules/agp/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/asmc/Makefile#1 branch .. //depot/projects/xen31/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/wpi/Makefile#1 branch .. //depot/projects/xen31/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/xen31/sys/net/if_bridge.c#2 integrate .. //depot/projects/xen31/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/xen31/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/xen31/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/xen31/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/xen31/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/xen31/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/xen31/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/xen31/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/xen31/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/xen31/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/xen31/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/xen31/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/xen31/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/xen31/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/xen31/sys/netinet/sctputil.c#2 integrate .. //depot/projects/xen31/sys/netinet/sctputil.h#2 integrate .. //depot/projects/xen31/sys/netipsec/keysock.c#2 integrate .. //depot/projects/xen31/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/xen31/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/xen31/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/xen31/sys/pci/agp.c#2 delete .. //depot/projects/xen31/sys/pci/agp_ali.c#2 delete .. //depot/projects/xen31/sys/pci/agp_amd.c#2 delete .. //depot/projects/xen31/sys/pci/agp_amd64.c#2 delete .. //depot/projects/xen31/sys/pci/agp_ati.c#2 delete .. //depot/projects/xen31/sys/pci/agp_i810.c#2 delete .. //depot/projects/xen31/sys/pci/agp_if.m#2 delete .. //depot/projects/xen31/sys/pci/agp_intel.c#2 delete .. //depot/projects/xen31/sys/pci/agp_nvidia.c#2 delete .. //depot/projects/xen31/sys/pci/agp_sis.c#2 delete .. //depot/projects/xen31/sys/pci/agp_via.c#2 delete .. //depot/projects/xen31/sys/pci/agppriv.h#2 delete .. //depot/projects/xen31/sys/pci/agpreg.h#2 delete .. //depot/projects/xen31/sys/pci/agpvar.h#2 delete .. //depot/projects/xen31/sys/pci/nfsmb.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/xen31/sys/security/audit/audit.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/xen31/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/xen31/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/xen31/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/xen31/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/xen31/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/xen31/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/xen31/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/xen31/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/xen31/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/xen31/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/xen31/sys/sys/_rmlock.h#1 branch .. //depot/projects/xen31/sys/sys/lock.h#2 integrate .. //depot/projects/xen31/sys/sys/malloc.h#2 integrate .. //depot/projects/xen31/sys/sys/param.h#4 integrate .. //depot/projects/xen31/sys/sys/pcpu.h#2 integrate .. //depot/projects/xen31/sys/sys/proc.h#3 integrate .. //depot/projects/xen31/sys/sys/rmlock.h#1 branch .. //depot/projects/xen31/sys/sys/signalvar.h#2 integrate .. //depot/projects/xen31/sys/sys/smp.h#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/xen31/sys/vm/phys_pager.c#2 integrate .. //depot/projects/xen31/sys/vm/pmap.h#2 integrate .. //depot/projects/xen31/sys/vm/swap_pager.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_extern.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_glue.c#2 integrate .. //depot/projects/xen31/sys/vm/vm_kern.c#2 integrate .. //depot/projects/xen31/sys/vm/vm_map.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_map.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_page.c#3 integrate .. //depot/projects/xen31/tools/build/options/makeman#2 integrate .. //depot/projects/xen31/tools/sched/schedgraph.py#2 integrate .. //depot/projects/xen31/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/xen31/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/xen31/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/xen31/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/xen31/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/xen31/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/xen31/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/xen31/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/xen31/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/xen31/usr.bin/calendar/io.c#2 integrate .. //depot/projects/xen31/usr.bin/du/du.c#2 integrate .. //depot/projects/xen31/usr.bin/file2c/file2c.1#2 integrate .. //depot/projects/xen31/usr.bin/file2c/file2c.c#2 integrate .. //depot/projects/xen31/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/xen31/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/xen31/usr.bin/fstat/zfs/Makefile#1 branch .. //depot/projects/xen31/usr.bin/fstat/zfs/zfs.c#1 branch .. //depot/projects/xen31/usr.bin/killall/killall.1#2 integrate .. //depot/projects/xen31/usr.bin/killall/killall.c#2 integrate .. //depot/projects/xen31/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/xen31/usr.bin/mail/aux.c#2 integrate .. //depot/projects/xen31/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/xen31/usr.bin/mail/lex.c#2 integrate .. //depot/projects/xen31/usr.bin/mail/list.c#2 integrate .. //depot/projects/xen31/usr.bin/mail/main.c#2 integrate .. //depot/projects/xen31/usr.bin/make/make.1#2 integrate .. //depot/projects/xen31/usr.bin/mklocale/ldef.h#2 integrate .. //depot/projects/xen31/usr.bin/msgs/msgs.c#2 integrate .. //depot/projects/xen31/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/xen31/usr.bin/sed/main.c#2 integrate .. //depot/projects/xen31/usr.bin/tail/read.c#2 integrate .. //depot/projects/xen31/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/xen31/usr.bin/tail/tail.c#2 integrate .. //depot/projects/xen31/usr.bin/tftp/tftp.1#2 integrate .. //depot/projects/xen31/usr.bin/write/write.c#2 integrate .. //depot/projects/xen31/usr.bin/xstr/xstr.1#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/xen31/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/xen31/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate .. //depot/projects/xen31/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/xen31/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/xen31/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/xen31/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/xen31/usr.sbin/cron/cron/externs.h#2 integrate .. //depot/projects/xen31/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/xen31/usr.sbin/cron/lib/entry.c#2 integrate .. //depot/projects/xen31/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/xen31/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/xen31/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/xen31/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/xen31/usr.sbin/faithd/prefix.c#2 integrate .. //depot/projects/xen31/usr.sbin/faithd/prefix.h#2 integrate .. //depot/projects/xen31/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/xen31/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/xen31/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/xen31/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/xen31/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/xen31/usr.sbin/keyserv/keyserv.c#2 integrate .. //depot/projects/xen31/usr.sbin/keyserv/keyserv.h#2 integrate .. //depot/projects/xen31/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/xen31/usr.sbin/lpr/lpd/lpd.c#2 integrate .. //depot/projects/xen31/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/xen31/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/xen31/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/xen31/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/xen31/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/sign/extern.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/sign/gzip.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/sign/pgp.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/xen31/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/xen31/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/xen31/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/xen31/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/ccp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/chap.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/chap.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/chap_ms.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/chap_ms.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/demand.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/eui64.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/fsm.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/ipcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/ipcp.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/ipv6cp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/ipv6cp.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/lcp.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/magic.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/magic.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/options.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/pppd.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/sys-bsd.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/upap.c#2 integrate .. //depot/projects/xen31/usr.sbin/pppd/upap.h#2 integrate .. //depot/projects/xen31/usr.sbin/pppstats/pppstats.c#2 integrate .. //depot/projects/xen31/usr.sbin/rip6query/rip6query.c#2 integrate .. //depot/projects/xen31/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/xen31/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/xen31/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/check_bound.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/pmap_svc.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/rpcb_svc.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/rpcbind.h#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/util.c#2 integrate .. //depot/projects/xen31/usr.sbin/rpcbind/warmstart.c#2 integrate .. //depot/projects/xen31/usr.sbin/rrenumd/lexer.l#2 integrate .. //depot/projects/xen31/usr.sbin/rrenumd/parser.y#2 integrate .. //depot/projects/xen31/usr.sbin/rrenumd/rrenumd.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/advcap.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/config.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/config.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/dump.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/dump.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/if.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/if.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/rrenum.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/rtadvd.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/timer.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtadvd/timer.h#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/dump.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/probe.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/rtsock.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/rtsol.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/xen31/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/dmenu.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/xen31/usr.sbin/tcpdrop/tcpdrop.c#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timed/correct.c#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timed/extern.h#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timedc/extern.h#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/xen31/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/xen31/usr.sbin/wpa/hostapd/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/xen31/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall ==== //depot/projects/xen31/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,9 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd +OLD_FILES+=etc/cached.conf OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached OLD_FILES+=usr/share/man/man5/cached.conf.5.gz ==== //depot/projects/xen31/bin/mv/mv.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/xen31/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/xen31/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $ # # Official patch 001 imported as v5_2_p1 # Official patch 002 imported as v5_2_p2 +# Official patches 003-007 imported as v5_2_p3_p7 # rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf ==== //depot/projects/xen31/contrib/libreadline/complete.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2005 Free Software Foundation, Inc. @@ -429,7 +429,7 @@ return (1); if (c == 'n' || c == 'N' || c == RUBOUT) return (0); - if (c == ABORT_CHAR) + if (c == ABORT_CHAR || c < 0) _rl_abort_internal (); if (for_pager && (c == NEWLINE || c == RETURN)) return (2); ==== //depot/projects/xen31/contrib/libreadline/display.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */ /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2006 Free Software Foundation, Inc. @@ -1519,11 +1519,31 @@ { /* Non-zero if we're increasing the number of lines. */ int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin; + /* If col_lendiff is > 0, implying that the new string takes up more + screen real estate than the old, but lendiff is < 0, meaning that it + takes fewer bytes, we need to just output the characters starting + from the first difference. These will overwrite what is on the + display, so there's no reason to do a smart update. This can really + only happen in a multibyte environment. */ + if (lendiff < 0) + { + _rl_output_some_chars (nfd, temp); + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + /* If nfd begins before any invisible characters in the prompt, + adjust _rl_last_c_pos to account for wrap_offset and set + cpos_adjusted to let the caller know. */ + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + return; + } /* Sometimes it is cheaper to print the characters rather than use the terminal's capabilities. If we're growing the number of lines, make sure we actually cause the new line to wrap around on auto-wrapping terminals. */ - if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) + else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl)) { /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and _rl_horizontal_scroll_mode == 1, inserting the characters with @@ -1599,8 +1619,22 @@ temp = nls - nfd; if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + _rl_last_c_pos += _rl_col_width (nfd, 0, temp); + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { + _rl_last_c_pos -= wrap_offset; + cpos_adjusted = 1; + } + } + else + _rl_last_c_pos += temp; } } /* Otherwise, print over the existing material. */ @@ -1608,8 +1642,20 @@ { if (temp > 0) { + /* If nfd begins at the prompt, or before the invisible + characters in the prompt, we need to adjust _rl_last_c_pos + in a multibyte locale to account for the wrap offset and + set cpos_adjusted accordingly. */ _rl_output_some_chars (nfd, temp); _rl_last_c_pos += col_temp; /* XXX */ + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) + { + if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) + { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 13 05:23:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85BC916A468; Tue, 13 Nov 2007 05:23:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6BAF16A417 for ; Tue, 13 Nov 2007 05:23:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE7ED13C4B9 for ; Tue, 13 Nov 2007 05:23:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD5NSFJ032443 for ; Tue, 13 Nov 2007 05:23:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD5NSYA032440 for perforce@freebsd.org; Tue, 13 Nov 2007 05:23:28 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 13 Nov 2007 05:23:28 GMT Message-Id: <200711130523.lAD5NSYA032440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 05:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=129011 Change 129011 by kmacy@entropy_kmacy_xen31 on 2007/11/13 05:23:19 submit pmap.c from mainline as reference Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 13 07:54:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD3AB16A41B; Tue, 13 Nov 2007 07:54:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66DF216A419 for ; Tue, 13 Nov 2007 07:54:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5414813C4A3 for ; Tue, 13 Nov 2007 07:54:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD7sFOs049136 for ; Tue, 13 Nov 2007 07:54:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD7sFG4049115 for perforce@freebsd.org; Tue, 13 Nov 2007 07:54:15 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 13 Nov 2007 07:54:15 GMT Message-Id: <200711130754.lAD7sFG4049115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 07:54:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=129014 Change 129014 by kmacy@entropy_kmacy_xen31 on 2007/11/13 07:54:05 first cut at integrating xen support into latest pmap.c Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#2 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#2 (text+ko) ==== @@ -150,6 +150,9 @@ #include #endif +#include +#include + #if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif @@ -187,8 +190,12 @@ #define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) #define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_set_w(pte, v) ((v) ? atomic_set_int((u_int *)(pte), PG_W) : \ - atomic_clear_int((u_int *)(pte), PG_W)) +#define pmap_pte_set_w(pte, v) { \ + if (v) \ + PT_SET_VA_MA(pte, *pte | PG_W, TRUE); \ + else \ + PT_SET_VA_MA(pte, *pte & ~PG_W, TRUE); \ +} #define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) struct pmap kernel_pmap_store; @@ -248,6 +255,7 @@ static pt_entry_t *PMAP1 = 0, *PMAP2; static pt_entry_t *PADDR1 = 0, *PADDR2; #ifdef SMP +static int PMAP1_inuse = 0, PMAP2_inuse = 0; static int PMAP1cpu; static int PMAP1changedcpu; SYSCTL_INT(_debug, OID_AUTO, PMAP1changedcpu, CTLFLAG_RD, @@ -287,6 +295,8 @@ static void pmap_pte_release(pt_entry_t *pte); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t *); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); +static void pmap_copy_ma_range(vm_paddr_t src, vm_paddr_t dst, uint32_t soff, uint32_t eoff); + #ifdef PAE static void *pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #endif @@ -294,6 +304,31 @@ CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); +void +pd_set(struct pmap *pmap, vm_paddr_t *ptr, vm_paddr_t val, int type) +{ + vm_paddr_t shadow_pdir_ma = pmap->pm_pdir[PTDPTDI] & ~0xFFF; + vm_paddr_t shadow_offset = (vm_paddr_t)(ptr - pmap->pm_pdir)*sizeof(vm_paddr_t); + + switch (type) { + case SH_PD_SET_VA: + xen_queue_pt_update(shadow_pdir_ma + shadow_offset, + xpmap_ptom(val & ~(PG_RW|PG_M))); + xen_queue_pt_update(vtomach(ptr), + xpmap_ptom(val)); + break; + case SH_PD_SET_VA_MA: + xen_queue_pt_update(shadow_pdir_ma + shadow_offset, + val & ~(PG_RW|PG_M)); + xen_queue_pt_update(vtomach(ptr), val); + break; + case SH_PD_SET_VA_CLEAR: + xen_queue_pt_update(shadow_pdir_ma + shadow_offset, 0); + xen_queue_pt_update(vtomach(ptr), 0); + break; + } +} + /* * Move the kernel virtual free pointer to the next * 4MB. This is used to help improve performance @@ -382,7 +417,7 @@ } SYSMAP(caddr_t, CMAP1, CADDR1, 1) SYSMAP(caddr_t, CMAP3, CADDR3, 1) - *CMAP3 = 0; + PT_CLEAR_VA(CMAP3, TRUE); /* * Crashdump maps. @@ -408,14 +443,17 @@ mtx_init(&PMAP2mutex, "PMAP2", NULL, MTX_DEF); virtual_avail = va; - - *CMAP1 = 0; - + PT_CLEAR_VA(CMAP1, TRUE); + /* * Leave in place an identity mapping (virt == phys) for the low 1 MB * physical memory region that is used by the ACPI wakeup code. This * mapping must not have PG_G set. */ +#ifndef XEN + /* + * leave here deliberately to show that this is not supported + */ #ifdef XBOX /* FIXME: This is gross, but needed for the XBOX. Since we are in such * an early stadium, we cannot yet neatly map video memory ... :-( @@ -430,6 +468,7 @@ /* Turn on PG_G on kernel page(s) */ pmap_set_pg(); +#endif } /* @@ -555,6 +594,11 @@ pt_entry_t *pte; vm_offset_t va; + panic("IMPLEMENT XXX"); + + + + va = *head; if (va == 0) return (va); /* Out of memory */ @@ -754,6 +798,7 @@ smp_masked_invlpg(pmap->pm_active & other_cpus, va); } sched_unpin(); + PT_UPDATES_FLUSH(); } void @@ -779,6 +824,7 @@ sva, eva); } sched_unpin(); + PT_UPDATES_FLUSH(); } void @@ -822,6 +868,7 @@ if (pmap == kernel_pmap || pmap->pm_active) invlpg(va); + PT_UPDATES_FLUSH(); } PMAP_INLINE void @@ -832,6 +879,7 @@ if (pmap == kernel_pmap || pmap->pm_active) for (addr = sva; addr < eva; addr += PAGE_SIZE) invlpg(addr); + PT_UPDATES_FLUSH(); } PMAP_INLINE void @@ -874,18 +922,22 @@ { pd_entry_t newpf; pd_entry_t *pde; - + pd_entry_t tmppf; + pde = pmap_pde(pmap, va); - if (*pde & PG_PS) + if (PT_GET(pde) & PG_PS) return (pde); - if (*pde != 0) { + if (PT_GET(pde) != 0) { /* are we current address space or kernel? */ if (pmap_is_current(pmap)) return (vtopte(va)); mtx_lock(&PMAP2mutex); - newpf = *pde & PG_FRAME; - if ((*PMAP2 & PG_FRAME) != newpf) { - *PMAP2 = newpf | PG_RW | PG_V | PG_A | PG_M; + newpf = PT_GET(pde) & PG_FRAME; + tmppf = PT_GET(PMAP2) & PG_FRAME; + + if (tmppf != newpf) { + PT_SET_VA(PMAP2, newpf | PG_V | PG_A | PG_M/* XXX does PG_M cause problems? */, TRUE); + pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); } return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); @@ -910,6 +962,7 @@ { invlpg((u_int)caddr); + PT_UPDATES_FLUSH(); } /* @@ -927,7 +980,8 @@ { pd_entry_t newpf; pd_entry_t *pde; - + pd_entry_t tmppf; + pde = pmap_pde(pmap, va); if (*pde & PG_PS) return (pde); @@ -937,9 +991,11 @@ return (vtopte(va)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); - newpf = *pde & PG_FRAME; - if ((*PMAP1 & PG_FRAME) != newpf) { - *PMAP1 = newpf | PG_RW | PG_V | PG_A | PG_M; + + newpf = PT_GET(pde) & PG_FRAME; + tmppf = PT_GET(PMAP1) & PG_FRAME; + if (tmppf != newpf) { + PT_SET_VA(PMAP1, newpf | PG_V | PG_A | PG_M/* ??? */, TRUE); #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); #endif @@ -974,16 +1030,55 @@ rtval = 0; PMAP_LOCK(pmap); + pde = PT_GET(&pmap->pm_pdir[va >> PDRSHIFT]); + if (pde != 0) { + if ((pde & PG_PS) != 0) { + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); + PMAP_UNLOCK(pmap); + return rtval; + } + pte = pmap_pte(pmap, va); + rtval = (PT_GET(pte) & PG_FRAME) | (va & PAGE_MASK); + pmap_pte_release(pte); + if (PMAP2_inuse) { + PT_CLEAR_VA(PMAP2, TRUE); + PMAP2_inuse = 0; + } + } + PMAP_UNLOCK(pmap); + return (rtval); +} + +/* + * Routine: pmap_extract_ma + * Function: + * Like pmap_extract, but returns machine address + */ +vm_paddr_t +pmap_extract_ma(pmap_t pmap, vm_offset_t va) +{ + vm_paddr_t rtval; + pt_entry_t *pte; + pd_entry_t pde; + + rtval = 0; + PMAP_LOCK(pmap); pde = pmap->pm_pdir[va >> PDRSHIFT]; if (pde != 0) { if ((pde & PG_PS) != 0) { - rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); + rtval = (pde & ~PDRMASK) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } pte = pmap_pte(pmap, va); rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); +#ifdef XEN + if (PMAP2_inuse) { + PT_CLEAR_VA(PMAP2, TRUE); + PMAP2_inuse = 0; + } +#endif } PMAP_UNLOCK(pmap); return (rtval); @@ -1006,7 +1101,7 @@ m = NULL; vm_page_lock_queues(); PMAP_LOCK(pmap); - pde = *pmap_pde(pmap, va); + pde = PT_GET(pmap_pde(pmap, va)); if (pde != 0) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { @@ -1016,7 +1111,11 @@ } } else { sched_pin(); - pte = *pmap_pte_quick(pmap, va); + pte = PT_GET(pmap_pte_quick(pmap, va)); + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } if (pte != 0 && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { m = PHYS_TO_VM_PAGE(pte & PG_FRAME); @@ -1048,6 +1147,16 @@ } PMAP_INLINE void +pmap_kenter_ma(vm_offset_t va, vm_paddr_t ma) +{ + pt_entry_t *pte; + + pte = vtopte(va); + PT_SET_VA_MA(pte, ma | PG_RW | PG_V | pgeflag, TRUE); +} + + +PMAP_INLINE void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) { pt_entry_t *pte; @@ -1182,7 +1291,8 @@ /* * unmap the page table page */ - pmap->pm_pdir[m->pindex] = 0; + xen_pt_unpin(pmap->pm_pdir[m->pindex]); + PD_CLEAR_VA(pmap, &pmap->pm_pdir[m->pindex], TRUE); --pmap->pm_stats.resident_count; /* @@ -1221,7 +1331,7 @@ if (va >= VM_MAXUSER_ADDRESS) return 0; - ptepde = *pmap_pde(pmap, va); + ptepde = PT_GET(pmap_pde(pmap, va)); mpte = PHYS_TO_VM_PAGE(ptepde & PG_FRAME); return pmap_unwire_pte_hold(pmap, mpte, free); } @@ -1251,8 +1361,9 @@ int pmap_pinit(pmap_t pmap) { - vm_page_t m, ptdpg[NPGPTD]; - vm_paddr_t pa; + vm_page_t m, ptdpg[NPGPTD*2]; + vm_paddr_t ma, ma_shadow; + int npgptd = NPGPTD*2; static int color; int i; @@ -1295,30 +1406,53 @@ } pmap_qenter((vm_offset_t)pmap->pm_pdir, ptdpg, NPGPTD); - +#ifndef XEN for (i = 0; i < NPGPTD; i++) { if ((ptdpg[i]->flags & PG_ZERO) == 0) bzero(pmap->pm_pdir + (i * NPDEPG), PAGE_SIZE); } - +#endif mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); /* Wire in kernel global address entries. */ /* XXX copies current process, does not fill in MPPTDI */ - bcopy(PTD + KPTDI, pmap->pm_pdir + KPTDI, nkpt * sizeof(pd_entry_t)); + bcopy(kernel_pmap->pm_pdir + KPTDI, pmap->pm_pdir + KPTDI, + nkpt * sizeof(pd_entry_t)); + /* XXX need to copy global address entries to page directory's L1 shadow */ + ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD])); + /* L1 pin shadow page director{y,ies} */ + for (i = 0; i < NPGPTD; i++) { + ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD + i])); + pmap_copy_ma_range(kernel_pmap->pm_pdir[PTDPTDI + i] & ~(PG_RW|PG_M), ma, + KPTDI*sizeof(pd_entry_t), nkpt*sizeof(pd_entry_t)); + xen_pt_pin(ma); + } + #ifdef SMP - pmap->pm_pdir[MPPTDI] = PTD[MPPTDI]; + pmap->pm_pdir[MPPTDI] = kernel_pmap->pm_pdir[MPPTDI]; #endif - /* install self-referential address mapping entry(s) */ + /* pin and install L1 shadow */ for (i = 0; i < NPGPTD; i++) { - pa = VM_PAGE_TO_PHYS(ptdpg[i]); - pmap->pm_pdir[PTDPTDI + i] = pa | PG_V | PG_RW | PG_A | PG_M; + ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i])); + ma_shadow = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD+i])); + /* re-map page directory read-only and pin */ + PT_SET_MA(pmap->pm_pdir + i*PAGE_SIZE, + (ma | PG_V | PG_A)); + xen_pgd_pin(ma); + /* add L1 shadow of L2 */ + xen_queue_pt_update(vtomach(&pmap->pm_pdir[PTDPTDI + i]), + ma_shadow | PG_V | PG_A); + xen_queue_pt_update(ma_shadow + PTDPTDI*sizeof(vm_paddr_t), + vtomach(pmap->pm_pdir) | PG_V | PG_A); + #ifdef PAE - pmap->pm_pdpt[i] = pa | PG_V; + #error "unsupported currently" + pmap->pm_pdpt[i] = ma | PG_V; #endif } + xen_flush_queue(); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvchunk); @@ -1371,8 +1505,9 @@ pmap->pm_stats.resident_count++; ptepa = VM_PAGE_TO_PHYS(m); - pmap->pm_pdir[ptepindex] = - (pd_entry_t) (ptepa | PG_U | PG_RW | PG_V | PG_A | PG_M); + xen_pt_pin(xpmap_ptom(ptepa)); + PD_SET_VA(pmap, &pmap->pm_pdir[ptepindex], + (ptepa | PG_U | PG_RW | PG_V | PG_A | PG_M), TRUE); return m; } @@ -1396,7 +1531,7 @@ /* * Get the page directory entry */ - ptepa = pmap->pm_pdir[ptepindex]; + ptepa = PT_GET(&pmap->pm_pdir[ptepindex]); /* * This supports switching from a 4MB page to a @@ -1534,8 +1669,9 @@ void pmap_release(pmap_t pmap) { - vm_page_t m, ptdpg[NPGPTD]; - int i; + vm_page_t m, ptdpg[NPGPTD+1]; + vm_paddr_t ma; + int i, npgptd = NPGPTD + 1; KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", @@ -1547,19 +1683,26 @@ mtx_unlock_spin(&allpmaps_lock); for (i = 0; i < NPGPTD; i++) - ptdpg[i] = PHYS_TO_VM_PAGE(pmap->pm_pdir[PTDPTDI + i] & - PG_FRAME); + ptdpg[i] = PHYS_TO_VM_PAGE(PT_GET(&pmap->pm_pdir[PTDPTDI + i]) & PG_FRAME); + + ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir)); + for (i = 0; i < nkpt + NPGPTD; i++) + PD_CLEAR_VA(pmap, &pmap->pm_pdir[PTDPTDI + i], FALSE); + bzero(pmap->pm_pdir + PTDPTDI, (nkpt + NPGPTD) * sizeof(*pmap->pm_pdir)); #ifdef SMP - pmap->pm_pdir[MPPTDI] = 0; + PD_CLEAR_VA(pmap, &pmap->pm_pdir[MPPTDI], FALSE); #endif pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); - for (i = 0; i < NPGPTD; i++) { + for (i = 0; i < npgptd; i++) { m = ptdpg[i]; + ma = xpmap_ptom(VM_PAGE_TO_PHYS(m)); + /* unpinning L1 and L2 treated the same */ + xen_pgd_unpin(ma); #ifdef PAE KASSERT(VM_PAGE_TO_PHYS(m) == (pmap->pm_pdpt[i] & PG_FRAME), ("pmap_release: got wrong ptd page")); @@ -1642,13 +1785,14 @@ pmap_zero_page(nkpg); ptppaddr = VM_PAGE_TO_PHYS(nkpg); newpdir = (pd_entry_t) (ptppaddr | PG_V | PG_RW | PG_A | PG_M); - pdir_pde(PTD, kernel_vm_end) = newpdir; + PD_SET_VA(kernel_pmap, &pdir_pde(kernel_pmap->pm_pdir, kernel_vm_end), newpdir, TRUE); mtx_lock_spin(&allpmaps_lock); LIST_FOREACH(pmap, &allpmaps, pm_list) { pde = pmap_pde(pmap, kernel_vm_end); - pde_store(pde, newpdir); + PD_SET_VA(pmap, pde, newpdir, FALSE); } + PT_UPDATES_FLUSH(); mtx_unlock_spin(&allpmaps_lock); kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); if (kernel_vm_end - 1 >= kernel_map->max_offset) { @@ -2024,6 +2168,10 @@ return; pmap_remove_pte(pmap, pte, va, free); pmap_invalidate_page(pmap, va); + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } } /* @@ -2088,7 +2236,7 @@ * Check for large page. */ if ((ptpaddr & PG_PS) != 0) { - pmap->pm_pdir[pdirindex] = 0; + PD_CLEAR_VA(pmap, &pmap->pm_pdir[pdirindex], TRUE); pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; anyvalid = 1; continue; @@ -2117,6 +2265,10 @@ break; } } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } out: sched_unpin(); if (anyvalid) @@ -2188,6 +2340,10 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); } @@ -2259,7 +2415,9 @@ sva += PAGE_SIZE) { vm_page_t m; +#ifndef XEN retry: +#endif /* * Regardless of whether a pte is 32 or 64 bits in * size, PG_RW, PG_A, and PG_M are among the least @@ -2290,6 +2448,7 @@ #endif if (pbits != obits) { +#ifndef XEN #ifdef PAE if (!atomic_cmpset_64(pte, obits, pbits)) goto retry; @@ -2298,6 +2457,9 @@ pbits)) goto retry; #endif +#else + PT_SET_VA(pte, pbits, FALSE); +#endif if (obits & PG_G) pmap_invalidate_page(pmap, sva); else @@ -2305,6 +2467,10 @@ } } } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); if (anychanged) pmap_invalidate_all(pmap); @@ -2360,7 +2526,7 @@ #if 0 && defined(PMAP_DIAGNOSTIC) else { pd_entry_t *pdeaddr = pmap_pde(pmap, va); - origpte = *pdeaddr; + origpte = PT_GET(pdeaddr); if ((origpte & PG_V) == 0) { panic("pmap_enter: invalid kernel page table page, pdir=%p, pde=%p, va=%p\n", pmap->pm_pdir[PTDPTDI], origpte, va); @@ -2369,7 +2535,7 @@ #endif pde = pmap_pde(pmap, va); - if ((*pde & PG_PS) != 0) + if ((PT_GET(pde) & PG_PS) != 0) panic("pmap_enter: attempted pmap_enter on 4MB page"); pte = pmap_pte_quick(pmap, va); @@ -2383,7 +2549,7 @@ pa = VM_PAGE_TO_PHYS(m); om = NULL; - origpte = *pte; + origpte = PT_GET(pte); opa = origpte & PG_FRAME; /* @@ -2506,6 +2672,10 @@ } else pte_store(pte, newpte | PG_A); } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); @@ -2622,7 +2792,7 @@ * But that isn't as quick as vtopte. */ pte = vtopte(va); - if (*pte) { + if (PT_GET(pte)) { if (mpte != NULL) { mpte->wire_count--; mpte = NULL; @@ -2744,8 +2914,8 @@ pmap->pm_stats.resident_count += size >> PAGE_SHIFT; npdes = size >> PDRSHIFT; for(i = 0; i < npdes; i++) { - pde_store(&pmap->pm_pdir[ptepindex], - ptepa | PG_U | PG_RW | PG_V | PG_PS); + PD_SET_VA(pmap, &pmap->pm_pdir[ptepindex], + ptepa | PG_U | PG_RW | PG_V | PG_PS, FALSE); ptepa += NBPDR; ptepindex += 1; } @@ -2781,6 +2951,10 @@ */ pmap_pte_set_w(pte, wired); pmap_pte_release(pte); + if (PMAP2_inuse) { + PT_CLEAR_VA(PMAP2, TRUE); + PMAP2_inuse = 0; + } PMAP_UNLOCK(pmap); } @@ -2830,14 +3004,13 @@ pdnxt = (addr + NBPDR) & ~PDRMASK; ptepindex = addr >> PDRSHIFT; - srcptepaddr = src_pmap->pm_pdir[ptepindex]; + srcptepaddr = PT_GET(&src_pmap->pm_pdir[ptepindex]); if (srcptepaddr == 0) continue; if (srcptepaddr & PG_PS) { if (dst_pmap->pm_pdir[ptepindex] == 0) { - dst_pmap->pm_pdir[ptepindex] = srcptepaddr & - ~PG_W; + PD_SET_VA(dst_pmap, &dst_pmap->pm_pdir[ptepindex], srcptepaddr & ~PG_W, TRUE); dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } @@ -2872,8 +3045,8 @@ * accessed (referenced) bits * during the copy. */ - *dst_pte = ptetemp & ~(PG_W | PG_M | - PG_A); + PT_SET_VA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), FALSE); + dst_pmap->pm_stats.resident_count++; } else { free = NULL; @@ -2891,8 +3064,13 @@ src_pte++; } } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, FALSE); + PMAP1_inuse = 0; + } sched_unpin(); vm_page_unlock_queues(); + PT_UPDATES_FLUSH(); PMAP_UNLOCK(src_pmap); PMAP_UNLOCK(dst_pmap); } @@ -2928,9 +3106,11 @@ panic("pmap_zero_page: CMAP2 busy"); sched_pin(); *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; + PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); + invlcaddr(sysmaps->CADDR2); pagezero(sysmaps->CADDR2); - *sysmaps->CMAP2 = 0; + PT_CLEAR_VA(sysmaps->CMAP2, TRUE); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -2951,13 +3131,15 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); - *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; + PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); + invlcaddr(sysmaps->CADDR2); if (off == 0 && size == PAGE_SIZE) pagezero(sysmaps->CADDR2); else bzero((char *)sysmaps->CADDR2 + off, size); - *sysmaps->CMAP2 = 0; + + PT_CLEAR_VA(sysmaps->CMAP2, TRUE); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -2975,10 +3157,10 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); sched_pin(); - *CMAP3 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; + PT_SET_VA(CMAP3, PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M, TRUE); invlcaddr(CADDR3); pagezero(CADDR3); - *CMAP3 = 0; + PT_CLEAR_VA(CMAP3, TRUE); sched_unpin(); } @@ -3002,15 +3184,45 @@ sched_pin(); invlpg((u_int)sysmaps->CADDR1); invlpg((u_int)sysmaps->CADDR2); - *sysmaps->CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; - *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; + PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, FALSE); + PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M, TRUE); bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); - *sysmaps->CMAP1 = 0; - *sysmaps->CMAP2 = 0; + PT_CLEAR_VA(sysmaps->CMAP1, FALSE); + PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + sched_unpin(); + mtx_unlock(&sysmaps->lock); +} + + + +void +pmap_copy_ma_range(vm_paddr_t src, vm_paddr_t dst, uint32_t soff, uint32_t len) +{ + struct sysmaps *sysmaps; + + sysmaps = &sysmaps_pcpu[PCPU_GET(cpuid)]; + + mtx_lock(&sysmaps->lock); + if (*sysmaps->CMAP1) + panic("pmap_copy_ma: CMAP1 busy"); + if (*sysmaps->CMAP2) + panic("pmap_copy_ma: CMAP2 busy"); + sched_pin(); + + invlpg((u_int)sysmaps->CADDR1); + invlpg((u_int)sysmaps->CADDR2); + + PT_SET_VA_MA(sysmaps->CMAP1, PG_V | src | PG_A, FALSE); + PT_SET_VA_MA(sysmaps->CMAP2, PG_V | PG_RW | dst | PG_A | PG_M, TRUE); + + bcopy(sysmaps->CADDR1 + soff, sysmaps->CADDR2 + soff, len); + PT_CLEAR_VA(sysmaps->CMAP1, FALSE); + PT_CLEAR_VA(sysmaps->CMAP2, TRUE); sched_unpin(); mtx_unlock(&sysmaps->lock); } + /* * Returns true if the pmap's pv is one of the first * 16 pvs linked to from this page. This count may @@ -3078,7 +3290,7 @@ inuse &= ~bitmask; pte = vtopte(pv->pv_va); - tpte = *pte; + tpte = PT_GET(pte); if (tpte == 0) { printf( @@ -3140,6 +3352,10 @@ pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc); } } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); pmap_invalidate_all(pmap); vm_page_unlock_queues(); @@ -3176,6 +3392,10 @@ if (rv) break; } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); return (rv); } @@ -3193,6 +3413,13 @@ boolean_t rv; rv = FALSE; + /* XXX + * in order for writable pagetables to help, + * this has to work - check if we aren't doing + * an invlpg on the page tables linear mappings + */ + return (rv); + PMAP_LOCK(pmap); if (*pmap_pde(pmap, addr)) { pte = vtopte(addr); @@ -3202,6 +3429,43 @@ return (rv); } + +void +pmap_map_readonly(pmap_t pmap, vm_offset_t va, int len) +{ + int i, npages = round_page(len) >> PAGE_SHIFT; + for (i = 0; i < npages; i++) { + pt_entry_t *pte; + pte = pmap_pte(pmap, (vm_offset_t)(va + i*PAGE_SIZE)); + pte_store(pte, xpmap_mtop(*pte & ~(PG_RW|PG_M))); + PMAP_MARK_PRIV(xpmap_mtop(*pte)); + pmap_pte_release(pte); + } + PT_UPDATES_FLUSH(); + if (PMAP2_inuse) { + PT_CLEAR_VA(PMAP2, TRUE); + PMAP2_inuse = 0; + } +} + +void +pmap_map_readwrite(pmap_t pmap, vm_offset_t va, int len) +{ + int i, npages = round_page(len) >> PAGE_SHIFT; + for (i = 0; i < npages; i++) { + pt_entry_t *pte; + pte = pmap_pte(pmap, (vm_offset_t)(va + i*PAGE_SIZE)); + PMAP_MARK_UNPRIV(xpmap_mtop(*pte)); + pte_store(pte, xpmap_mtop(*pte) | (PG_RW|PG_M)); + pmap_pte_release(pte); + } + PT_UPDATES_FLUSH(); + if (PMAP2_inuse) { + PT_CLEAR_VA(PMAP2, TRUE); + PMAP2_inuse = 0; + } +} + /* * Clear the write and modified bits in each of the given page's mappings. */ @@ -3221,17 +3485,23 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); +#ifndef XEN retry: - oldpte = *pte; +#endif + oldpte = PT_GET(pte); if ((oldpte & PG_RW) != 0) { /* * Regardless of whether a pte is 32 or 64 bits * in size, PG_RW and PG_M are among the least * significant 32 bits. */ +#ifndef XEN if (!atomic_cmpset_int((u_int *)pte, oldpte, oldpte & ~(PG_RW | PG_M))) goto retry; +#else + PT_SET_VA(pte, oldpte & ~(PG_RW|PG_M), TRUE); +#endif if ((oldpte & PG_M) != 0) vm_page_dirty(m); pmap_invalidate_page(pmap, pv->pv_va); @@ -3239,6 +3509,10 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); } @@ -3260,6 +3534,8 @@ pv_entry_t pv, pvf, pvn; pmap_t pmap; pt_entry_t *pte; + vm_paddr_t v; + int rtval = 0; if (m->flags & PG_FICTITIOUS) @@ -3275,8 +3551,13 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - if ((*pte & PG_A) != 0) { + if (pte && ((v = PT_GET(pte)) & PG_A) != 0) { +#ifndef XEN atomic_clear_int((u_int *)pte, PG_A); +#else + PT_SET_VA(pte, v & ~PG_A, TRUE); +#endif + pmap_invalidate_page(pmap, pv->pv_va); rtval++; if (rtval > 4) @@ -3285,6 +3566,10 @@ PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); } + if (PMAP1_inuse) { + PT_CLEAR_VA(PMAP1, TRUE); + PMAP1_inuse = 0; + } sched_unpin(); return (rtval); } @@ -3298,7 +3583,8 @@ pv_entry_t pv; pmap_t pmap; pt_entry_t *pte; - + vm_paddr_t val; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((m->flags & PG_FICTITIOUS) != 0) return; @@ -3307,14 +3593,20 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - if ((*pte & PG_M) != 0) { + val = PT_GET(pte); + + if ((val & PG_M) != 0) { /* * Regardless of whether a pte is 32 or 64 bits * in size, PG_M is among the least significant * 32 bits. */ +#ifndef XEN atomic_clear_int((u_int *)pte, PG_M); +#else + PT_SET_VA(pv->pv_va, val & ~PG_M, FALSE); pmap_invalidate_page(pmap, pv->pv_va); +#endif } PMAP_UNLOCK(pmap); } @@ -3332,7 +3624,8 @@ pv_entry_t pv; pmap_t pmap; pt_entry_t *pte; - + vm_paddr_t val; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((m->flags & PG_FICTITIOUS) != 0) return; @@ -3341,13 +3634,18 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); - if ((*pte & PG_A) != 0) { + val = PT_GET(pte); + if ((val & PG_A) != 0) { /* * Regardless of whether a pte is 32 or 64 bits * in size, PG_A is among the least significant * 32 bits. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 13 08:08:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B38B16A46C; Tue, 13 Nov 2007 08:08:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E99EB16A418 for ; Tue, 13 Nov 2007 08:08:30 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D863D13C4C2 for ; Tue, 13 Nov 2007 08:08:30 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAD88UvH052448 for ; Tue, 13 Nov 2007 08:08:30 GMT (envelope-from avatar@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAD88UVS052445 for perforce@freebsd.org; Tue, 13 Nov 2007 08:08:30 GMT (envelope-from avatar@freebsd.org) Date: Tue, 13 Nov 2007 08:08:30 GMT Message-Id: <200711130808.lAD88UVS052445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to avatar@freebsd.org using -f From: Tai-hwa Liang To: Perforce Change Reviews Cc: Subject: PERFORCE change 129015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 08:08:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=129015 Change 129015 by avatar@avatar_t40 on 2007/11/13 08:08:19 Adding a comment to state the fact that an_stats_update() is now called via callout(9) with a lock held. Submitted by: ambrisko MFP4 after: 1 day Affected files ... .. //depot/projects/wifi/sys/dev/an/if_an.c#21 edit Differences ... ==== //depot/projects/wifi/sys/dev/an/if_an.c#21 (text+ko) ==== @@ -1143,6 +1143,8 @@ * is important because we don't want to allow transmissions until * the NIC has synchronized to the current cell (either as the master * in an ad-hoc group, or as a station connected to an access point). + * + * Note that this function will be called via callout(9) with a lock held. */ static void an_stats_update(void *xsc) From owner-p4-projects@FreeBSD.ORG Tue Nov 13 20:32:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA13916A41A; Tue, 13 Nov 2007 20:32:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BB8216A417 for ; Tue, 13 Nov 2007 20:32:12 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9018713C459 for ; Tue, 13 Nov 2007 20:32:12 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lADKWCjb042627 for ; Tue, 13 Nov 2007 20:32:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lADKWCpm042624 for perforce@freebsd.org; Tue, 13 Nov 2007 20:32:12 GMT (envelope-from peter@freebsd.org) Date: Tue, 13 Nov 2007 20:32:12 GMT Message-Id: <200711132032.lADKWCpm042624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 20:32:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=129038 Change 129038 by peter@peter_overcee on 2007/11/13 20:31:55 Fix off-by-one in pmap.h that caused a lockup at boot. Cosmetic tweaks. Affected files ... .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#70 edit .. //depot/projects/hammer/sys/i386/include/pmap.h#32 edit Differences ... ==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#70 (text+ko) ==== @@ -506,11 +506,10 @@ /* Get per-cpu data */ pc = &__pcpu[myid]; - /* prime data pabe or it to use */ + /* prime data page for it to use */ pcpu_init(pc, myid, sizeof(struct pcpu)); pc->pc_apic_id = cpu_apic_ids[myid]; pc->pc_prvspace = pc; - pc->pc_curthread = 0; gdt_segs[GPRIV_SEL].ssd_base = (int) pc; gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; @@ -763,7 +762,7 @@ for (cpu = 1; cpu < mp_ncpus; cpu++) { apic_id = cpu_apic_ids[cpu]; - /* allocate and set up an idle stack data page */ + /* allocate and set up a boot stack data page */ bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); /* setup a vector to our boot code */ @@ -803,6 +802,7 @@ outb(CMOS_DATA, mpbiosreason); #endif + /* Clear out V==P hack for mpboot above */ for (i = 0; i < NKPT; i++) PTD[i] = 0; pmap_invalidate_range(kernel_pmap, 0, NKPT * NBPDR - 1); ==== //depot/projects/hammer/sys/i386/include/pmap.h#32 (text+ko) ==== @@ -121,12 +121,8 @@ #endif #ifndef NKPDE -#ifdef SMP -#define NKPDE (KVA_PAGES - 1) /* number of page tables/pde's */ -#else #define NKPDE (KVA_PAGES) /* number of page tables/pde's */ #endif -#endif /* * The *PTDI values control the layout of virtual memory From owner-p4-projects@FreeBSD.ORG Tue Nov 13 23:32:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A94E16A418; Tue, 13 Nov 2007 23:32:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4364016A417 for ; Tue, 13 Nov 2007 23:32:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9BF13C455 for ; Tue, 13 Nov 2007 23:32:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lADNWSd9075759 for ; Tue, 13 Nov 2007 23:32:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lADNWR81075756 for perforce@freebsd.org; Tue, 13 Nov 2007 23:32:27 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Nov 2007 23:32:27 GMT Message-Id: <200711132332.lADNWR81075756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2007 23:32:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=129044 Change 129044 by jb@jb_freebsd1 on 2007/11/13 23:32:04 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#19 integrate .. //depot/projects/dtrace/src/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/dtrace/src/etc/freebsd-update.conf#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#23 integrate .. //depot/projects/dtrace/src/share/man/man4/asmc.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/ipw.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/iwi.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/wlan.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/dtrace/src/share/man/man5/freebsd-update.conf.5#3 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#20 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/files#51 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#22 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#26 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#16 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#10 integrate .. //depot/projects/dtrace/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_ihash.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/locore.s#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#21 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#10 integrate .. //depot/projects/dtrace/src/sys/modules/agp/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/netipsec/keysock.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#10 delete .. //depot/projects/dtrace/src/sys/pci/agp_ali.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_amd.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#7 delete .. //depot/projects/dtrace/src/sys/pci/agp_ati.c#6 delete .. //depot/projects/dtrace/src/sys/pci/agp_i810.c#8 delete .. //depot/projects/dtrace/src/sys/pci/agp_if.m#4 delete .. //depot/projects/dtrace/src/sys/pci/agp_intel.c#6 delete .. //depot/projects/dtrace/src/sys/pci/agp_nvidia.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_sis.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_via.c#6 delete .. //depot/projects/dtrace/src/sys/pci/agppriv.h#6 delete .. //depot/projects/dtrace/src/sys/pci/agpreg.h#6 delete .. //depot/projects/dtrace/src/sys/pci/agpvar.h#4 delete .. //depot/projects/dtrace/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#10 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#24 integrate .. //depot/projects/dtrace/src/tools/regression/priv/Makefile#4 integrate .. //depot/projects/dtrace/src/tools/regression/priv/main.c#4 integrate .. //depot/projects/dtrace/src/tools/regression/priv/main.h#4 integrate .. //depot/projects/dtrace/src/tools/regression/priv/priv_netinet_ipsec.c#1 branch .. //depot/projects/dtrace/src/tools/sched/schedgraph.py#6 integrate .. //depot/projects/dtrace/src/usr.bin/tee/tee.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/write/write.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.sh#7 integrate .. //depot/projects/dtrace/src/usr.sbin/pciconf/cap.c#4 integrate .. //depot/projects/dtrace/www/en/where.sgml#12 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 (text+ko) ==== @@ -1,7 +1,7 @@ 700053 - 7.0-STABLE after MFC of wide and single byte + 7.0-CURRENT after MFC of wide and single byte ctype separation. 700054 - 700055 after ABI backwards compatibility + 7.0-CURRENT after ABI backwards compatibility to the FreeBSD 4/5/6 versions of the PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which required the ABI of the PCIOCGETCONF IOCTL to be @@ -11629,6 +11629,11 @@ broken again 800003 + + 8.0-CURRENT after agp(4) driver moved from + src/sys/pci to src/sys/dev/agp + 800004 + ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#19 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.442 2007/10/27 17:13:28 bmah Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.443 2007/11/13 16:23:53 brueffer Exp $ --> @@ -3257,6 +3257,7 @@ + @@ -3767,6 +3768,7 @@ + ==== //depot/projects/dtrace/src/etc/freebsd-update.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.1 2006/08/31 09:51:33 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.2 2007/11/12 04:47:57 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from telling you to @@ -23,9 +23,13 @@ # Paths which start with anything matching an entry in an UpdateIfUnmodified # statement will only be updated if the contents of the file have not been -# modified by the user. +# modified by the user (unless changes are merged; see below). UpdateIfUnmodified /etc/ /var/ +# When upgrading to a new FreeBSD release, files which match MergeChanges +# will have any local changes merged into the version from the new release. +MergeChanges /etc/ /var/named/etc/ + ### Default configuration options: # Directory in which to store downloaded updates and temporary @@ -46,3 +50,9 @@ # FreeBSD Update retain this modified metadata when installing a new version # of that file? # KeepModifiedMetadata yes + +# When upgrading between releases, should the list of Components be +# read strictly (StrictComponents yes) or merely as a list of components +# which *might* be installed of which FreeBSD Update should figure out +# which actually are installed and upgrade those (StrictComponents no)? +# StrictComponents no ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326 2007/09/26 21:30:50 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.327 2007/11/13 16:27:29 brueffer Exp $ 2000 @@ -793,6 +793,9 @@ [&arch.i386;] NCR / AT&T / Lucent Technologies WaveLan T1-speed ISA/radio LAN cards (&man.wl.4; driver) + [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 3945ABG MiniPCI + network adapters (&man.wpi.4; driver) + &hwlist.zyd; ==== //depot/projects/dtrace/src/share/man/man4/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.397 2007/11/08 22:09:36 benjsc Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.399 2007/11/13 11:23:52 ru Exp $ MAN= aac.4 \ acpi.4 \ @@ -20,6 +20,7 @@ amr.4 \ an.4 \ arcmsr.4 \ + ${_asmc.4} \ asr.4 \ ata.4 \ atapicam.4 \ @@ -542,6 +543,7 @@ .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _acpi_dock.4= acpi_dock.4 _amdsmb.4= amdsmb.4 +_asmc.4= asmc.4 _coretemp.4= coretemp.4 _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 ==== //depot/projects/dtrace/src/share/man/man4/ipw.4#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.16 2007/03/06 13:17:05 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.17 2007/11/13 16:42:22 brueffer Exp $ .\" .Dd March 6, 2007 .Os @@ -140,6 +140,7 @@ .Xr iwi 4 , .Xr pci 4 , .Xr wlan 4 , +.Xr wpi 4 , .Xr ifconfig 8 .Sh AUTHORS The ==== //depot/projects/dtrace/src/share/man/man4/iwi.4#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.18 2007/03/06 13:17:05 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.19 2007/11/13 16:42:22 brueffer Exp $ .\" .Dd March 6, 2007 .Os @@ -145,6 +145,7 @@ .Xr ipw 4 , .Xr pci 4 , .Xr wlan 4 , +.Xr wpi 4 , .Xr ifconfig 8 .Sh AUTHORS The ==== //depot/projects/dtrace/src/share/man/man4/wlan.4#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.13 2007/09/10 17:20:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.14 2007/11/13 16:42:22 brueffer Exp $ .\" .Dd September 6, 2007 .Dt WLAN 4 @@ -51,6 +51,7 @@ .Xr rum 4 , .Xr ural 4 , .Xr wi 4 , +.Xr wpi 4 , and .Xr zyd 4 drivers, with other drivers to follow. @@ -135,6 +136,7 @@ .Xr wlan_tkip 4 , .Xr wlan_wep 4 , .Xr wlan_xauth 4 , +.Xr wpi 4 , .Xr zyd 4 .Sh STANDARDS More information can be found in the IEEE 802.11 Standard. ==== //depot/projects/dtrace/src/share/man/man4/wpi.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wpi.4,v 1.1 2007/11/08 21:54:42 benjsc Exp $ +.\" $FreeBSD: src/share/man/man4/wpi.4,v 1.2 2007/11/13 16:40:23 brueffer Exp $ .\" .Dd March 6, 2007 .Os @@ -52,7 +52,7 @@ firmware_load="YES" .Ed .Pp -In both cases, place the following lines in +In both cases, place the following line in .Xr loader.conf 5 to load the firmware modules: .Bd -literal -offset indent @@ -121,27 +121,29 @@ .It "wpi%d: fatal firmware error" An unknown error has occurred in the uploaded firmware, you may have to unload/reload the driver to continue. -.It "wpi%d: Radio Transmitteer is switched off" +.It "wpi%d: Radio transmitter is switched off" The hardware switch controlling the radio is currently turned off. -Data transmision is not possible in this state. +Data transmission is not possible in this state. .Sh BUGS Not all the error messages are documented here. .Pp Automatic recovery of firmware failures is not currently supported, nor is detection of toggling the radio switch on. .Pp -Background scanning is not currently supported +Background scanning is not currently supported. .El .Sh SEE ALSO .Xr altq 4 , +.Xr ipw 4 , .Xr iwi 4 , -.Xr ipw 4 , .Xr pci 4 , .Xr wlan 4 , .Xr ifconfig 8 .Sh AUTHORS +.An -nosplit The .Nm driver was written by .An Damien Bergamini Aq damien.bergamini@free.fr -.An and Benjamin Close Aq benjsc@FreeBSD.org . +and +.An Benjamin Close Aq benjsc@FreeBSD.org . ==== //depot/projects/dtrace/src/share/man/man5/freebsd-update.conf.5#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.2 2006/09/30 16:01:33 ru Exp $ +.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.3 2007/11/12 04:47:57 cperciva Exp $ .\" .Dd August 30, 2006 .Dt FREEBSD-UPDATE.CONF 5 @@ -93,7 +93,15 @@ The parameters following this keyword are regular expressions; updates to paths which start with a string matching one of these regular expressions will be ignored if the files have -been modified locally. +been modified locally (unless they are merged -- see MergeChanges +below). +.Pp +This option can be specified multiple times, and the parameters +accumulate. +.It Cm MergeChanges +The parameters following this keyword are regular expressions; +updates to paths which start with a string matching one of +these regular expressions will be merged with local modifications. .Pp This option can be specified multiple times, and the parameters accumulate. @@ -138,6 +146,24 @@ .Cm freebsd-update should keep existing file ownership, permissions, and flags when installing updates if these have been modified locally. +.It Cm StrictComponents +The single parameter following this keyword must be +.Dq yes +or +.Dq no +and specifies whether +.Cm freebsd-update +should interpret the list of components of +.Fx +specified via the +.Cm Components +option strictly as a list of components installed which +should be upgraded when the +.Cm upgrade +command is used ("yes"), or merely as a list of components +which might be installed, of which +.Cm freebsd-update +should identify which in fact are present ("no"). .El .Sh FILES .Bl -tag -width "/etc/freebsd-update.conf" ==== //depot/projects/dtrace/src/share/man/man9/Makefile#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.315 2007/11/10 16:47:38 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.316 2007/11/13 20:26:27 ru Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -925,6 +925,14 @@ rman.9 rman_set_bustag.9 \ rman.9 rman_set_rid.9 \ rman.9 rman_set_virtual.9 +MLINKS+=rmlock.9 rm_destroy.9 \ + rmlock.9 rm_init.9 \ + rmlock.9 rm_rlock.9 \ + rmlock.9 rm_runlock.9 \ + rmlock.9 RM_SYSINIT.9 \ + rmlock.9 rm_wlock.9 \ + rmlock.9 rm_wowned.9 \ + rmlock.9 rm_wunlock.9 MLINKS+=rtalloc.9 rtalloc1.9 \ rtalloc.9 rtalloc_ign.9 \ rtalloc.9 RTFREE.9 \ @@ -933,14 +941,6 @@ runqueue.9 procrunnable.9 \ runqueue.9 remrunqueue.9 \ runqueue.9 setrunqueue.9 -MLINKS+=rmlock.9 rm_destroy.9 \ - rmlock.9 rm_init.9 \ - rmlock.9 rm_rlock.9 \ - rmlock.9 rm_runlock.9 \ - rmlock.9 RM_SYSINIT.9 \ - rmlock.9 rm_wlock.9 \ - rmlock.9 rm_wowned.9 \ - rmlock.9 rm_wunlock.9 MLINKS+=rwlock.9 rw_assert.9 \ rwlock.9 rw_destroy.9 \ rwlock.9 rw_downgrade.9 \ ==== //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.53 2007/10/25 16:53:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.54 2007/11/12 23:53:43 bz Exp $"); /* * BIOS disk device handling. @@ -254,7 +254,7 @@ ((v86.ebx & 0xffff) == 0xaa55) && /* signature */ (v86.ecx & 0x1)) { /* packets mode ok */ bd->bd_flags |= BD_MODEEDD1; - if((v86.eax & 0xff00) > 0x300) + if((v86.eax & 0xff00) >= 0x3000) bd->bd_flags |= BD_MODEEDD3; } return(1); ==== //depot/projects/dtrace/src/sys/conf/files#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1250 2007/11/08 14:47:54 ups Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1251 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -423,6 +423,8 @@ dev/advansys/adwcam.c optional adw dev/advansys/adwlib.c optional adw dev/advansys/adwmcode.c optional adw +dev/agp/agp.c optional agp pci +dev/agp/agp_if.m optional agp pci dev/aha/aha.c optional aha dev/aha/aha_isa.c optional aha isa dev/aha/aha_mca.c optional aha mca @@ -2003,8 +2005,6 @@ opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto -pci/agp.c optional agp pci -pci/agp_if.m optional agp pci pci/alpm.c optional alpm pci pci/amdpm.c optional amdpm pci | nfpm pci pci/amdsmb.c optional amdsmb pci ==== //depot/projects/dtrace/src/sys/conf/files.amd64#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.113 2007/11/08 22:09:36 benjsc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.114 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -138,6 +138,9 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/acpica/acpi_if.m standard +dev/agp/agp_amd64.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp dev/arcmsr/arcmsr.c optional arcmsr pci dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc @@ -205,9 +208,6 @@ isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/link_elf_obj.c standard -pci/agp_amd64.c optional agp -pci/agp_i810.c optional agp -pci/agp_intel.c optional agp # # IA32 binary support # ==== //depot/projects/dtrace/src/sys/conf/files.i386#26 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.586 2007/11/08 22:09:36 benjsc Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.587 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -141,6 +141,15 @@ crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/advansys/adv_isa.c optional adv isa +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_amd64.c optional agp +dev/agp/agp_ati.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_nvidia.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_isa.c optional aic isa dev/arcmsr/arcmsr.c optional arcmsr pci dev/ar/if_ar.c optional ar @@ -447,15 +456,6 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard -pci/agp_ali.c optional agp -pci/agp_amd.c optional agp -pci/agp_amd64.c optional agp -pci/agp_ati.c optional agp -pci/agp_i810.c optional agp -pci/agp_intel.c optional agp -pci/agp_nvidia.c optional agp -pci/agp_sis.c optional agp -pci/agp_via.c optional agp i386/xbox/xbox.c optional xbox i386/xbox/xboxfb.c optional xboxfb dev/fb/boot_font.c optional xboxfb ==== //depot/projects/dtrace/src/sys/conf/files.pc98#16 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.357 2007/10/26 13:32:01 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.358 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -98,6 +98,13 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_nvidia.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_cbus.c optional aic isa dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci @@ -340,10 +347,3 @@ pc98/pc98/canbus_if.m optional canbus pc98/pc98/machdep.c standard pc98/pc98/pc98_machdep.c standard -pci/agp_ali.c optional agp -pci/agp_amd.c optional agp -pci/agp_i810.c optional agp -pci/agp_intel.c optional agp -pci/agp_nvidia.c optional agp -pci/agp_sis.c optional agp -pci/agp_via.c optional agp ==== //depot/projects/dtrace/src/sys/conf/kmod.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.220 2007/11/12 21:51:36 jhb Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -321,7 +321,7 @@ .endfor .endif -MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ +MFILES?= dev/acpica/acpi_if.m dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \ @@ -333,7 +333,7 @@ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ - pc98/pc98/canbus_if.m pci/agp_if.m + pc98/pc98/canbus_if.m .for _srcsrc in ${MFILES} .for _ext in c h ==== //depot/projects/dtrace/src/sys/dev/drm/drmP.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.18 2006/11/06 13:41:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.19 2007/11/12 21:51:37 jhb Exp $"); #ifndef _DRM_P_H_ #define _DRM_P_H_ @@ -77,7 +77,11 @@ #if defined(__FreeBSD__) #include #include +#if __FreeBSD_version >= 800004 +#include +#else #include +#endif #include #if __FreeBSD_version >= 500000 #include ==== //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#6 (text+ko) ==== @@ -32,12 +32,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.6 2006/12/28 21:55:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.7 2007/11/12 21:51:37 jhb Exp $"); #include "dev/drm/drmP.h" #ifdef __FreeBSD__ +#if __FreeBSD_version >= 800004 +#include +#else #include +#endif #include #endif ==== //depot/projects/dtrace/src/sys/dev/re/if_re.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95 2007/08/14 02:00:04 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.96 2007/11/12 15:44:00 remko Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -172,6 +172,8 @@ static struct rl_type re_devs[] = { { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169S, "D-Link DGE-528(T) Gigabit Ethernet Adapter" }, + { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169_8110SB, + "D-Link DGE-528(T) Rev.B1 Gigabit Ethernet Adapter" }, { RT_VENDORID, RT_DEVICEID_8139, RL_HWREV_8139CPLUS, "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E, ==== //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071102" #include -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.2 2007/11/08 21:57:08 benjsc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.3 2007/11/13 16:12:59 rink Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -663,8 +663,7 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_WEP /* s/w WEP */ - | IEEE80211_C_MONITOR /* monitor mode supported */ + IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ ==== //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_ihash.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.22 2005/10/31 15:41:20 rwatson Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.23 2007/11/13 19:34:06 maxim Exp $ */ #include @@ -73,6 +73,7 @@ void ntfs_nthashdestroy(void) { + hashdestroy(ntfs_nthashtbl, M_NTFSNTHASH, ntfs_nthash); lockdestroy(&ntfs_hashlock); mtx_destroy(&ntfs_nthash_mtx); } ==== //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ * allocate and release resources. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.11 2007/10/04 17:11:48 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.12 2007/11/12 18:57:33 delphij Exp $"); #include #include @@ -231,7 +231,7 @@ vfs_scanopt(mp->mnt_optnew, "uid", "%d", &root_uid) != 1) root_uid = va.va_uid; if (mp->mnt_cred->cr_ruid != 0 || - vfs_scanopt(mp->mnt_optnew, "mode", "%o", &root_mode) != 1) + vfs_scanopt(mp->mnt_optnew, "mode", "%ho", &root_mode) != 1) root_mode = va.va_mode; if(vfs_scanopt(mp->mnt_optnew, "inodes", "%d", &nodes_max) != 1) nodes_max = 0; ==== //depot/projects/dtrace/src/sys/i386/i386/locore.s#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.188 2007/03/24 19:53:22 alc Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.189 2007/11/13 23:00:24 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -72,17 +72,7 @@ .set PTD,PTmap + (PTDPTDI * PAGE_SIZE) .set PTDpde,PTD + (PTDPTDI * PDESIZE) -#ifdef SMP /* - * Define layout of per-cpu address space. - * This is "constructed" in locore.s on the BSP and in mp_machdep.c - * for each AP. DO NOT REORDER THESE WITHOUT UPDATING THE REST! - */ - .globl SMP_prvspace - .set SMP_prvspace,(MPPTDI << PDRSHIFT) -#endif /* SMP */ - -/* * Compiled KERNBASE location and the kernel load address */ .globl kernbase @@ -106,16 +96,6 @@ KERNend: .long 0 /* phys addr end of kernel (just after bss) */ physfree: .long 0 /* phys addr of next free page */ -#ifdef SMP - .globl cpu0prvpage -cpu0pp: .long 0 /* phys addr cpu0 private pg */ -cpu0prvpage: .long 0 /* relocated version */ - - .globl SMPpt -SMPptpa: .long 0 /* phys addr SMP page table */ -SMPpt: .long 0 /* relocated version */ -#endif /* SMP */ - .globl IdlePTD IdlePTD: .long 0 /* phys addr of kernel PTD */ @@ -763,20 +743,6 @@ addl $KERNBASE, %esi movl %esi, R(vm86paddr) -#ifdef SMP -/* Allocate cpu0's private data page */ - ALLOCPAGES(1) - movl %esi,R(cpu0pp) - addl $KERNBASE, %esi - movl %esi, R(cpu0prvpage) /* relocated to KVM space */ - -/* Allocate SMP page table page */ - ALLOCPAGES(1) - movl %esi,R(SMPptpa) - addl $KERNBASE, %esi - movl %esi, R(SMPpt) /* relocated to KVM space */ -#endif /* SMP */ - /* * Enable PSE and PGE. */ @@ -854,37 +820,6 @@ movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx fillkpt(R(vm86pa), $PG_RW|PG_U) -#ifdef SMP -/* Map cpu0's private page into global kmem (4K @ cpu0prvpage) */ - movl R(cpu0pp), %eax - movl $1, %ecx - fillkptphys($PG_RW) - -/* Map SMP page table page into global kmem FWIW */ - movl R(SMPptpa), %eax - movl $1, %ecx - fillkptphys($PG_RW) - -/* Map the private page into the SMP page table */ - movl R(cpu0pp), %eax - movl $0, %ebx /* pte offset = 0 */ - movl $1, %ecx /* one private page coming right up */ - fillkpt(R(SMPptpa), $PG_RW) - -/* ... and put the page table table in the pde. */ - movl R(SMPptpa), %eax - movl $MPPTDI, %ebx - movl $1, %ecx - fillkpt(R(IdlePTD), $PG_RW) - -/* Fakeup VA for the local apic to allow early traps. */ - ALLOCPAGES(1) - movl %esi, %eax - movl $(NPTEPG-1), %ebx /* pte offset = NTEPG-1 */ - movl $1, %ecx /* one private pt coming right up */ - fillkpt(R(SMPptpa), $PG_RW) -#endif /* SMP */ - /* * Create an identity mapping for low physical memory, including the kernel. * The part of this mapping that covers the first 1 MB of physical memory ==== //depot/projects/dtrace/src/sys/i386/i386/machdep.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.660 2007/11/05 11:36:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.661 2007/11/13 23:00:24 peter Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -127,7 +127,6 @@ #include #endif #ifdef SMP -#include #include #endif @@ -207,9 +206,7 @@ struct kva_md_info kmi; static struct trapframe proc0_tf; -#ifndef SMP -static struct pcpu __pcpu; -#endif +struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; @@ -2116,11 +2113,7 @@ gdt_segs[GUFS_SEL].ssd_limit = atop(0 - 1); gdt_segs[GUGS_SEL].ssd_limit = atop(0 - 1); -#ifdef SMP - pc = &SMP_prvspace[0].pcpu; -#else - pc = &__pcpu; -#endif + pc = &__pcpu[0]; gdt_segs[GPRIV_SEL].ssd_limit = atop(0 - 1); gdt_segs[GPRIV_SEL].ssd_base = (int) pc; gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; ==== //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.281 2007/08/02 21:17:57 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.282 2007/11/13 23:00:24 peter Exp $"); #include "opt_apic.h" #include "opt_cpu.h" @@ -78,7 +78,6 @@ #include #include #include -#include #define WARMBOOT_TARGET 0 #define WARMBOOT_OFF (KERNBASE + 0x0467) @@ -134,6 +133,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ @@ -144,12 +145,12 @@ char *bootSTK; static int bootAP; +/* Free these after use */ +void *bootstacks[MAXCPU]; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; -/* SMP page table page */ -extern pt_entry_t *SMPpt; - struct pcb stoppcbs[MAXCPU]; /* Variables needed for SMP tlb shootdown. */ @@ -493,6 +494,7 @@ void init_secondary(void) { + struct pcpu *pc; vm_offset_t addr; int gsel_tss; int x, myid; @@ -500,11 +502,18 @@ /* bootAP is set in start_ap() to our ID. */ myid = bootAP; - gdt_segs[GPRIV_SEL].ssd_base = (int) &SMP_prvspace[myid]; - gdt_segs[GPROC0_SEL].ssd_base = - (int) &SMP_prvspace[myid].pcpu.pc_common_tss; - SMP_prvspace[myid].pcpu.pc_prvspace = - &SMP_prvspace[myid].pcpu; + + /* Get per-cpu data */ + pc = &__pcpu[myid]; + + /* prime data page for it to use */ + pcpu_init(pc, myid, sizeof(struct pcpu)); + pc->pc_apic_id = cpu_apic_ids[myid]; + pc->pc_prvspace = pc; + pc->pc_curthread = 0; + + gdt_segs[GPRIV_SEL].ssd_base = (int) pc; + gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; for (x = 0; x < NGDT; x++) { ssdtosd(&gdt_segs[x], &gdt[myid * NGDT + x].sd); @@ -587,7 +596,6 @@ printf("SMP: cpuid = %d\n", PCPU_GET(cpuid)); printf("SMP: actual apic_id = %d\n", lapic_id()); printf("SMP: correct apic_id = %d\n", PCPU_GET(apic_id)); - printf("PTD[MPPTDI] = %#jx\n", (uintmax_t)PTD[MPPTDI]); panic("cpuid mismatch! boom!!"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 14 00:39:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 349B116A420; Wed, 14 Nov 2007 00:39:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D97A016A41A for ; Wed, 14 Nov 2007 00:39:08 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEC2B13C461 for ; Wed, 14 Nov 2007 00:39:08 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAE0d8J2079505 for ; Wed, 14 Nov 2007 00:39:08 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAE0c2sq079457 for perforce@freebsd.org; Wed, 14 Nov 2007 00:38:02 GMT (envelope-from marcel@freebsd.org) Date: Wed, 14 Nov 2007 00:38:02 GMT Message-Id: <200711140038.lAE0c2sq079457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 129046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2007 00:39:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=129046 Change 129046 by marcel@marcel_jnpr on 2007/11/14 00:38:01 IFC @129040 Affected files ... .. //depot/projects/powerpc/Makefile#4 integrate .. //depot/projects/powerpc/Makefile.inc1#9 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#11 integrate .. //depot/projects/powerpc/UPDATING#12 integrate .. //depot/projects/powerpc/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/powerpc/bin/mv/mv.1#3 integrate .. //depot/projects/powerpc/bin/ps/extern.h#2 integrate .. //depot/projects/powerpc/bin/ps/keyword.c#2 integrate .. //depot/projects/powerpc/bin/ps/print.c#2 integrate .. //depot/projects/powerpc/bin/ps/ps.c#2 integrate .. //depot/projects/powerpc/bin/sh/eval.c#2 integrate .. //depot/projects/powerpc/bin/sh/sh.1#2 integrate .. //depot/projects/powerpc/cddl/lib/Makefile#4 integrate .. //depot/projects/powerpc/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/powerpc/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/powerpc/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/powerpc/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/powerpc/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/powerpc/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/powerpc/contrib/gcc/opts.c#3 integrate .. //depot/projects/powerpc/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/powerpc/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/powerpc/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/BSD/Makefile#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/HISTORY#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/Makefile#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/ip_fil.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/ipsend/iptests.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/ipsend/sock.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/printnat.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/printpacket.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/printstate.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/radix_ipf.h#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/Makefile#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/powerpc/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/ipnat.c#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/lexer.c#3 integrate .. //depot/projects/powerpc/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/powerpc/contrib/less/NEWS#3 integrate .. //depot/projects/powerpc/contrib/less/README#3 integrate .. //depot/projects/powerpc/contrib/less/ch.c#3 integrate .. //depot/projects/powerpc/contrib/less/charset.c#3 integrate .. //depot/projects/powerpc/contrib/less/configure#3 integrate .. //depot/projects/powerpc/contrib/less/configure.ac#3 integrate .. //depot/projects/powerpc/contrib/less/filename.c#3 integrate .. //depot/projects/powerpc/contrib/less/funcs.h#3 integrate .. //depot/projects/powerpc/contrib/less/jump.c#3 integrate .. //depot/projects/powerpc/contrib/less/less.h#3 integrate .. //depot/projects/powerpc/contrib/less/less.man#3 integrate .. //depot/projects/powerpc/contrib/less/less.nro#3 integrate .. //depot/projects/powerpc/contrib/less/lessecho.man#3 integrate .. //depot/projects/powerpc/contrib/less/lessecho.nro#3 integrate .. //depot/projects/powerpc/contrib/less/lesskey.man#3 integrate .. //depot/projects/powerpc/contrib/less/lesskey.nro#3 integrate .. //depot/projects/powerpc/contrib/less/line.c#3 integrate .. //depot/projects/powerpc/contrib/less/main.c#4 integrate .. //depot/projects/powerpc/contrib/less/search.c#3 integrate .. //depot/projects/powerpc/contrib/less/signal.c#3 integrate .. //depot/projects/powerpc/contrib/less/version.c#3 integrate .. //depot/projects/powerpc/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/powerpc/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/powerpc/contrib/libpcap/FILES#2 integrate .. //depot/projects/powerpc/contrib/libpcap/INSTALL#2 delete .. //depot/projects/powerpc/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/powerpc/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/libpcap/README.dag#2 integrate .. //depot/projects/powerpc/contrib/libpcap/TODO#2 integrate .. //depot/projects/powerpc/contrib/libpcap/VERSION#2 integrate .. //depot/projects/powerpc/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/libpcap/configure#2 integrate .. //depot/projects/powerpc/contrib/libpcap/configure.in#2 integrate .. //depot/projects/powerpc/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/powerpc/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/powerpc/contrib/libpcap/inet.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/powerpc/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/powerpc/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/powerpc/contrib/libpcap/pf.h#2 delete .. //depot/projects/powerpc/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/powerpc/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/powerpc/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/powerpc/contrib/libreadline/complete.c#3 integrate .. //depot/projects/powerpc/contrib/libreadline/display.c#4 integrate .. //depot/projects/powerpc/contrib/libreadline/input.c#3 integrate .. //depot/projects/powerpc/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/powerpc/contrib/libreadline/misc.c#3 integrate .. //depot/projects/powerpc/contrib/libreadline/readline.c#3 integrate .. //depot/projects/powerpc/contrib/libreadline/text.c#3 integrate .. //depot/projects/powerpc/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/powerpc/contrib/one-true-awk/FIXES#3 integrate .. //depot/projects/powerpc/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/powerpc/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/powerpc/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/powerpc/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/VERSION#4 integrate .. //depot/projects/powerpc/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/powerpc/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/powerpc/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/powerpc/contrib/openbsm/configure#4 integrate .. //depot/projects/powerpc/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/powerpc/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/powerpc/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/powerpc/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/powerpc/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/powerpc/contrib/pf/pflogd/pflogd.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/CACerts#2 integrate .. //depot/projects/powerpc/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/powerpc/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/m4/proto.m4#3 integrate .. //depot/projects/powerpc/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/powerpc/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/powerpc/contrib/sendmail/doc/op/op.me#3 integrate .. //depot/projects/powerpc/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/conf.h#3 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/ldap.h#3 integrate .. //depot/projects/powerpc/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/engine.c#4 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/listener.c#4 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/main.c#4 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/smfi.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/ldap.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/Makefile.m4#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/conf.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/deliver.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/envelope.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/macro.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/map.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/milter.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/mime.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/parseaddr.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/readcf.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/recipient.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/powerpc/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/sm_resolve.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/usersmtp.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/util.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/vacation/vacation.c#3 integrate .. //depot/projects/powerpc/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/FILES#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/README#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/af.c#1 branch .. //depot/projects/powerpc/contrib/tcpdump/af.h#1 branch .. //depot/projects/powerpc/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/configure#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/ieee802_11.h#3 integrate .. //depot/projects/powerpc/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/powerpc/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/pf.h#2 delete .. //depot/projects/powerpc/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/powerpc/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/powerpc/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/powerpc/contrib/tcpdump/util.c#2 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.c#3 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.lex.c#4 integrate .. //depot/projects/powerpc/contrib/tcsh/sh.proc.c#3 integrate .. //depot/projects/powerpc/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/powerpc/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/powerpc/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/powerpc/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl_err.c#3 integrate .. //depot/projects/powerpc/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/powerpc/etc/Makefile#4 integrate .. //depot/projects/powerpc/etc/cached.conf#2 delete .. //depot/projects/powerpc/etc/defaults/Makefile#2 integrate .. //depot/projects/powerpc/etc/defaults/devfs.rules#2 integrate .. //depot/projects/powerpc/etc/defaults/pccard.conf#2 delete .. //depot/projects/powerpc/etc/defaults/rc.conf#8 integrate .. //depot/projects/powerpc/etc/freebsd-update.conf#2 integrate .. //depot/projects/powerpc/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/powerpc/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/powerpc/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/powerpc/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/powerpc/etc/mtree/README#2 integrate .. //depot/projects/powerpc/etc/namedb/named.root#2 integrate .. //depot/projects/powerpc/etc/network.subr#5 integrate .. //depot/projects/powerpc/etc/nscd.conf#1 branch .. //depot/projects/powerpc/etc/pf.conf#2 delete .. //depot/projects/powerpc/etc/rc.d/Makefile#4 integrate .. //depot/projects/powerpc/etc/rc.d/amd#2 integrate .. //depot/projects/powerpc/etc/rc.d/cached#2 delete .. //depot/projects/powerpc/etc/rc.d/early.sh#2 integrate .. //depot/projects/powerpc/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/powerpc/etc/rc.d/kerberos#3 integrate .. //depot/projects/powerpc/etc/rc.d/lockd#3 integrate .. //depot/projects/powerpc/etc/rc.d/named#2 integrate .. //depot/projects/powerpc/etc/rc.d/nfslocking#6 delete .. //depot/projects/powerpc/etc/rc.d/nscd#2 integrate .. //depot/projects/powerpc/etc/rc.d/ppp#3 integrate .. //depot/projects/powerpc/etc/rc.subr#6 integrate .. //depot/projects/powerpc/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/powerpc/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/powerpc/etc/services#4 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/powerpc/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/powerpc/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/powerpc/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/powerpc/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/powerpc/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/cc_int/Makefile#4 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/diff/Makefile#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/powerpc/include/Makefile#6 integrate .. //depot/projects/powerpc/include/_ctype.h#2 integrate .. //depot/projects/powerpc/include/ctype.h#2 integrate .. //depot/projects/powerpc/include/pthread.h#2 integrate .. //depot/projects/powerpc/include/pthread_np.h#2 integrate .. //depot/projects/powerpc/include/wctype.h#2 integrate .. //depot/projects/powerpc/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/powerpc/lib/Makefile#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#10 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/powerpc/lib/libbsm/Makefile#4 integrate .. //depot/projects/powerpc/lib/libc/Makefile#5 integrate .. //depot/projects/powerpc/lib/libc/arm/Symbol.map#4 integrate .. //depot/projects/powerpc/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/powerpc/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/powerpc/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/powerpc/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/powerpc/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/powerpc/lib/libc/ia64/Symbol.map#4 integrate .. //depot/projects/powerpc/lib/libc/locale/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/locale/big5.c#2 integrate .. //depot/projects/powerpc/lib/libc/locale/euc.c#2 integrate .. //depot/projects/powerpc/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/powerpc/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/powerpc/lib/libc/locale/gbk.c#3 integrate .. //depot/projects/powerpc/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/powerpc/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/powerpc/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/powerpc/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/powerpc/lib/libc/locale/none.c#3 integrate .. //depot/projects/powerpc/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/powerpc/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/powerpc/lib/libc/net/ethers.3#3 integrate .. //depot/projects/powerpc/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/powerpc/lib/libc/net/nscache.c#2 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_connectx.3#4 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_opt_info.3#4 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_recvmsg.3#4 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_send.3#4 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_sendmsg.3#4 integrate .. //depot/projects/powerpc/lib/libc/powerpc/Symbol.map#4 integrate .. //depot/projects/powerpc/lib/libc/rpc/auth_time.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/powerpc/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/powerpc/lib/libc/rpc/rpc_generic.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdlib/atoi.3#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/getenv.c#6 integrate .. //depot/projects/powerpc/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/powerpc/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/ntp_adjtime.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/ntp_gettime.2#2 delete .. //depot/projects/powerpc/lib/libc/sys/sctp_generic_recvmsg.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/sctp_generic_sendmsg.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/sctp_peeloff.2#3 integrate .. //depot/projects/powerpc/lib/libdisk/open_disk.c#3 integrate .. //depot/projects/powerpc/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/powerpc/lib/libelf/elf.3#3 integrate .. //depot/projects/powerpc/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/powerpc/lib/libelf/elf_update.3#3 integrate .. //depot/projects/powerpc/lib/libelf/elf_update.c#3 integrate .. //depot/projects/powerpc/lib/libelf/gelf_getphdr.3#3 integrate .. //depot/projects/powerpc/lib/libelf/gelf_newehdr.3#3 integrate .. //depot/projects/powerpc/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_convert.m4#3 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/powerpc/lib/libkse/Makefile#1 branch .. //depot/projects/powerpc/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/powerpc/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/powerpc/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/powerpc/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/powerpc/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/powerpc/lib/libkse/kse.map#1 branch .. //depot/projects/powerpc/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/powerpc/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/sys/lock.c#1 branch .. //depot/projects/powerpc/lib/libkse/sys/lock.h#1 branch .. //depot/projects/powerpc/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/Makefile#1 branch .. //depot/projects/powerpc/lib/libkse/test/README#1 branch .. //depot/projects/powerpc/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/powerpc/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/powerpc/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/powerpc/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/powerpc/lib/libkse/test/verify#1 branch .. //depot/projects/powerpc/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/powerpc/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/powerpc/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/powerpc/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/powerpc/lib/libpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/powerpc/lib/libpcap/Makefile#3 integrate .. //depot/projects/powerpc/lib/libpcap/config.h#2 integrate .. //depot/projects/powerpc/lib/libpthread/Makefile#4 delete .. //depot/projects/powerpc/lib/libpthread/arch/amd64/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/amd64/amd64/context.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/arm/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/arm/arm/context.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/arm/include/pthread_md.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/i386/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/i386/include/pthread_md.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/ia64/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/ia64/ia64/context.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/ia64/include/pthread_md.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/include/pthread_md.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete .. //depot/projects/powerpc/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/powerpc/lib/libpthread/pthread.map#3 delete .. //depot/projects/powerpc/lib/libpthread/support/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/support/thr_support.c#2 delete .. //depot/projects/powerpc/lib/libpthread/sys/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/sys/lock.c#2 delete .. //depot/projects/powerpc/lib/libpthread/sys/lock.h#2 delete .. //depot/projects/powerpc/lib/libpthread/sys/thr_error.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/Makefile#2 delete .. //depot/projects/powerpc/lib/libpthread/test/README#2 delete .. //depot/projects/powerpc/lib/libpthread/test/guard_b.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/powerpc/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/mutex_d.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/powerpc/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/sigsuspend_d.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/powerpc/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/powerpc/lib/libpthread/test/verify#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/Makefile.inc#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_accept.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_aio_suspend.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_atfork.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_destroy.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_get_np.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getdetachstate.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getscope.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getstack.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getstackaddr.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_getstacksize.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_init.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setdetachstate.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setscope.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setstack.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setstackaddr.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_attr_setstacksize.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_autoinit.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_barrier.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_barrierattr.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_cancel.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_clean.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_close.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_concurrency.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_cond.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_condattr_destroy.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_condattr_init.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_connect.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_creat.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_create.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_detach.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_equal.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_execve.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_exit.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_fcntl.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_find_thread.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_fork.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_fsync.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_getprio.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_getschedparam.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_info.c#4 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_init.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_join.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_kern.c#4 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_kill.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_main_np.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mattr_init.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mattr_kind_np.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_msync.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_multi_np.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mutex.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mutex_protocol.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_mutexattr_destroy.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_nanosleep.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_once.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_open.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_pause.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_poll.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_printf.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_priority_queue.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_private.h#4 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_pselect.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_pspinlock.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_raise.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_read.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_readv.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_resume_np.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_rtld.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_rwlock.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_rwlockattr.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_select.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_self.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sem.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_seterrno.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_setprio.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_setschedparam.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sig.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigaction.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigaltstack.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigmask.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigpending.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigprocmask.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigsuspend.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sigwait.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_single_np.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_sleep.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_spec.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_spinlock.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_stack.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_suspend_np.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_switch_np.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_symbols.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_system.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_tcdrain.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_vfork.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_wait.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_wait4.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_waitpid.c#2 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_write.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_writev.c#3 delete .. //depot/projects/powerpc/lib/libpthread/thread/thr_yield.c#3 delete .. //depot/projects/powerpc/lib/libstand/Makefile#2 integrate .. //depot/projects/powerpc/lib/libstand/tftp.c#2 integrate .. //depot/projects/powerpc/lib/libthr/Makefile#5 integrate .. //depot/projects/powerpc/lib/libthr/libthr.3#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/powerpc/lib/libutil/Makefile#4 integrate .. //depot/projects/powerpc/lib/libutil/expand_number.3#1 branch .. //depot/projects/powerpc/lib/libutil/expand_number.c#1 branch .. //depot/projects/powerpc/lib/libutil/flopen.3#3 integrate .. //depot/projects/powerpc/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/powerpc/lib/libutil/kld.3#2 integrate .. //depot/projects/powerpc/lib/libutil/libutil.h#3 integrate .. //depot/projects/powerpc/lib/libutil/pidfile.3#2 integrate .. //depot/projects/powerpc/lib/libutil/pidfile.c#4 integrate .. //depot/projects/powerpc/lib/ncurses/ncurses/Makefile#8 integrate .. //depot/projects/powerpc/libexec/Makefile#3 integrate .. //depot/projects/powerpc/libexec/atrun/Makefile#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/powerpc/release/Makefile#5 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/powerpc/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/powerpc/release/scripts/package-split.py#2 integrate .. //depot/projects/powerpc/release/scripts/src-install.sh#3 integrate .. //depot/projects/powerpc/rescue/rescue/Makefile#5 integrate .. //depot/projects/powerpc/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/powerpc/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/powerpc/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/powerpc/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/powerpc/sbin/geom/Makefile#2 integrate .. //depot/projects/powerpc/sbin/geom/class/Makefile#4 integrate .. //depot/projects/powerpc/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/powerpc/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/powerpc/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/powerpc/sbin/geom/class/virstor/Makefile#1 branch .. //depot/projects/powerpc/sbin/geom/class/virstor/geom_virstor.c#1 branch .. //depot/projects/powerpc/sbin/geom/class/virstor/gvirstor.8#1 branch .. //depot/projects/powerpc/sbin/geom/core/geom.8#2 integrate .. //depot/projects/powerpc/sbin/geom/core/geom.c#4 integrate .. //depot/projects/powerpc/sbin/ggate/Makefile#2 integrate .. //depot/projects/powerpc/sbin/gpt/Makefile#2 integrate .. //depot/projects/powerpc/sbin/gpt/add.c#2 integrate .. //depot/projects/powerpc/sbin/gpt/boot.c#1 branch .. //depot/projects/powerpc/sbin/gpt/gpt.8#2 integrate .. //depot/projects/powerpc/sbin/gpt/gpt.c#2 integrate .. //depot/projects/powerpc/sbin/gpt/gpt.h#2 integrate .. //depot/projects/powerpc/sbin/gpt/show.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/powerpc/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/powerpc/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/powerpc/sbin/mount/mount.8#3 integrate .. //depot/projects/powerpc/sbin/mount_unionfs/mount_unionfs.8#3 integrate .. //depot/projects/powerpc/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/powerpc/sbin/quotacheck/quotacheck.c#4 integrate .. //depot/projects/powerpc/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/powerpc/sbin/rcorder/ealloc.h#2 integrate .. //depot/projects/powerpc/sbin/rcorder/hash.c#2 integrate .. //depot/projects/powerpc/sbin/rcorder/hash.h#2 integrate .. //depot/projects/powerpc/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/powerpc/sbin/route/route.8#2 integrate .. //depot/projects/powerpc/sbin/route/route.c#2 integrate .. //depot/projects/powerpc/sbin/setkey/parse.y#3 integrate .. //depot/projects/powerpc/sbin/setkey/setkey.c#3 integrate .. //depot/projects/powerpc/sbin/setkey/test-pfkey.c#3 integrate .. //depot/projects/powerpc/sbin/setkey/token.l#4 integrate .. //depot/projects/powerpc/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/powerpc/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/powerpc/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/powerpc/share/doc/legal/Makefile#2 integrate .. //depot/projects/powerpc/share/doc/legal/intel_wpi/Makefile#1 branch .. //depot/projects/powerpc/share/examples/cvsup/cvs-supfile#4 integrate .. //depot/projects/powerpc/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/powerpc/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/powerpc/share/examples/cvsup/standard-supfile#3 integrate .. //depot/projects/powerpc/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/powerpc/share/examples/pf/Makefile#2 integrate .. //depot/projects/powerpc/share/examples/pf/ackpri#2 integrate .. //depot/projects/powerpc/share/examples/pf/faq-example1#2 integrate .. //depot/projects/powerpc/share/examples/pf/faq-example2#2 integrate .. //depot/projects/powerpc/share/examples/pf/faq-example3#2 integrate .. //depot/projects/powerpc/share/examples/pf/pf.conf#1 branch .. //depot/projects/powerpc/share/examples/pf/queue1#2 integrate .. //depot/projects/powerpc/share/examples/pf/queue2#2 integrate .. //depot/projects/powerpc/share/examples/pf/queue3#2 integrate .. //depot/projects/powerpc/share/examples/pf/queue4#2 integrate .. //depot/projects/powerpc/share/examples/pf/spamd#2 integrate .. //depot/projects/powerpc/share/man/man3/Makefile#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread.3#3 integrate .. //depot/projects/powerpc/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_barrierattr.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cond_timedwait.3#3 integrate .. //depot/projects/powerpc/share/man/man3/pthread_cond_wait.3#3 integrate .. //depot/projects/powerpc/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_spin_init.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/powerpc/share/man/man3/pthread_testcancel.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 14 02:45:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE1AA16A41B; Wed, 14 Nov 2007 02:45:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52C5316A418 for ; Wed, 14 Nov 2007 02:45:25 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4621913C459 for ; Wed, 14 Nov 2007 02:45:25 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAE2jP6O095761 for ; Wed, 14 Nov 2007 02:45:25 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAE2jOH1095758 for perforce@freebsd.org; Wed, 14 Nov 2007 02:45:24 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 14 Nov 2007 02:45:24 GMT Message-Id: <200711140245.lAE2jOH1095758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 129047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2007 02:45:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=129047 Change 129047 by zhouzhouyi@zhouzhouyi_mactest on 2007/11/14 02:44:25 Reformat the log adapting the MAC Framework change Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#11 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#3 (text+ko) ==== @@ -52,14 +52,12 @@ enum yytokentype { PID = 258, IDENTIFIER = 259, - NUM = 260, - MAC_TEST = 261 + NUM = 260 }; #endif #define PID 258 #define IDENTIFIER 259 #define NUM 260 -#define MAC_TEST 261 @@ -114,8 +112,8 @@ #line 34 "mactestparser.y" typedef union {long itype; char * namestring; struct mactestlog_record * mtpipetype; struct labelstrings * lstype; struct modes_or_flags * mftype;} yystype; -/* Line 188 of /usr/local/share/bison/yacc.c. */ -#line 119 "mactestparser.tab.c" +/* Line 193 of /usr/local/share/bison/yacc.c. */ +#line 117 "mactestparser.tab.c" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -136,7 +134,7 @@ /* Line 213 of /usr/local/share/bison/yacc.c. */ -#line 140 "mactestparser.tab.c" +#line 138 "mactestparser.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -234,20 +232,20 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 7 -#define YYLAST 31 +#define YYLAST 18 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 11 +#define YYNTOKENS 9 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 11 +#define YYNNTS 8 /* YYNRULES -- Number of rules. */ -#define YYNRULES 23 +#define YYNRULES 15 /* YYNRULES -- Number of states. */ -#define YYNSTATES 33 +#define YYNSTATES 22 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 261 +#define YYMAXUTOK 260 #define YYTRANSLATE(X) \ ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK) @@ -256,12 +254,12 @@ static const unsigned char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 10, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 9, 2, - 2, 7, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 8, 2, + 2, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -281,7 +279,7 @@ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6 + 5 }; #if YYDEBUG @@ -289,30 +287,25 @@ YYRHS. */ static const unsigned char yyprhs[] = { - 0, 0, 3, 4, 6, 8, 11, 14, 20, 27, - 34, 36, 38, 41, 44, 47, 50, 53, 56, 59, - 62, 65, 67, 69 + 0, 0, 3, 4, 6, 8, 11, 14, 20, 21, + 30, 32, 34, 37, 40, 42 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 12, 0, -1, -1, 13, -1, 14, -1, 13, 14, - -1, 13, 1, -1, 3, 7, 21, 15, 8, -1, - 3, 7, 21, 15, 16, 8, -1, 3, 7, 21, - 15, 17, 8, -1, 8, -1, 20, -1, 15, 19, - -1, 15, 1, -1, 9, 19, -1, 16, 19, -1, - 16, 1, -1, 18, 16, -1, 10, 19, -1, 18, - 19, -1, 18, 1, -1, 4, -1, 6, -1, 5, - -1 + 10, 0, -1, -1, 11, -1, 12, -1, 11, 12, + -1, 11, 1, -1, 3, 6, 16, 15, 7, -1, + -1, 3, 6, 16, 15, 13, 8, 14, 7, -1, + 7, -1, 15, -1, 14, 15, -1, 14, 1, -1, + 4, -1, 5, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned char yyrline[] = { - 0, 53, 53, 55, 59, 61, 62, 65, 67, 69, - 71, 74, 76, 77, 80, 82, 83, 86, 90, 92, - 93, 96, 99, 102 + 0, 48, 48, 50, 54, 56, 57, 60, 62, 62, + 64, 67, 69, 70, 75, 78 }; #endif @@ -321,11 +314,9 @@ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "PID", "IDENTIFIER", "NUM", "MAC_TEST", - "'='", "'\\n'", "':'", "'#'", "$accept", "program", - "mactestlog_records", "mactestlog_record", "hook_elements", - "label_elements", "modflag_and_label_elements", "modflag_elements", - "identifier", "mac_test", "pid", 0 + "$end", "error", "$undefined", "PID", "IDENTIFIER", "NUM", "'='", "'\\n'", + "':'", "$accept", "program", "mactestlog_records", "mactestlog_record", + "@1", "label_elements", "identifier", "pid", 0 }; #endif @@ -334,25 +325,22 @@ token YYLEX-NUM. */ static const unsigned short yytoknum[] = { - 0, 256, 257, 258, 259, 260, 261, 61, 10, 58, - 35 + 0, 256, 257, 258, 259, 260, 61, 10, 58 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 11, 12, 12, 13, 13, 13, 14, 14, 14, - 14, 15, 15, 15, 16, 16, 16, 17, 18, 18, - 18, 19, 20, 21 + 0, 9, 10, 10, 11, 11, 11, 12, 13, 12, + 12, 14, 14, 14, 15, 16 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { - 0, 2, 0, 1, 1, 2, 2, 5, 6, 6, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 1, 1, 1 + 0, 2, 0, 1, 1, 2, 2, 5, 0, 8, + 1, 1, 2, 2, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -361,65 +349,56 @@ static const unsigned char yydefact[] = { 2, 0, 10, 0, 0, 4, 0, 1, 6, 5, - 23, 0, 22, 0, 11, 13, 21, 7, 0, 0, - 0, 0, 0, 12, 14, 18, 16, 8, 15, 9, - 20, 0, 19 + 15, 0, 14, 8, 7, 0, 0, 0, 11, 13, + 9, 12 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yysigned_char yydefgoto[] = { - -1, 3, 4, 5, 13, 20, 21, 22, 28, 14, - 11 + -1, 3, 4, 5, 15, 17, 13, 11 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -9 +#define YYPACT_NINF -6 static const yysigned_char yypact[] = { - -2, -5, -9, 4, 12, -9, 23, -9, -9, -9, - -9, 11, -9, -1, -9, -9, -9, -9, 18, 18, - 17, 19, 15, -9, -9, -9, -9, -9, -9, -9, - -9, 22, -9 + 3, -2, -6, 9, 0, -6, 8, -6, -6, -6, + -6, 10, -6, 11, -6, 7, 10, 1, -6, -6, + -6, -6 }; /* YYPGOTO[NTERM-NUM]. */ static const yysigned_char yypgoto[] = { - -9, -9, -9, 25, -9, 9, -9, -9, -8, -9, - -9 + -6, -6, -6, 12, -6, -6, -5, -6 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, parse error. */ -#define YYTABLE_NINF -18 +#define YYTABLE_NINF -4 static const yysigned_char yytable[] = { - 15, 1, 6, 16, 7, 23, 2, 17, 18, 19, - 24, 25, -3, 8, 32, 1, 30, 12, 26, 16, - 2, 16, 16, 26, 18, 27, 16, 29, 10, 9, - -17, 31 + -3, 8, 19, 1, 6, 12, 1, 2, 20, 7, + 2, 18, 21, 10, 12, 16, 9, 0, 14 }; -static const unsigned char yycheck[] = +static const yysigned_char yycheck[] = { - 1, 3, 7, 4, 0, 13, 8, 8, 9, 10, - 18, 19, 0, 1, 22, 3, 1, 6, 1, 4, - 8, 4, 4, 1, 9, 8, 4, 8, 5, 4, - 8, 22 + 0, 1, 1, 3, 6, 4, 3, 7, 7, 0, + 7, 16, 17, 5, 4, 8, 4, -1, 7 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 3, 8, 12, 13, 14, 7, 0, 1, 14, - 5, 21, 6, 15, 20, 1, 4, 8, 9, 10, - 16, 17, 18, 19, 19, 19, 1, 8, 19, 8, - 1, 16, 19 + 0, 3, 7, 10, 11, 12, 6, 0, 1, 12, + 5, 16, 4, 15, 7, 13, 8, 14, 15, 1, + 7, 15 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -970,79 +949,53 @@ switch (yyn) { case 4: -#line 60 "mactestparser.y" +#line 55 "mactestparser.y" {inserttail_mactestlog_record_chain(yyvsp[0].mtpipetype);} break; case 5: -#line 61 "mactestparser.y" +#line 56 "mactestparser.y" {inserttail_mactestlog_record_chain(yyvsp[0].mtpipetype);} break; case 7: -#line 66 "mactestparser.y" +#line 61 "mactestparser.y" {yyval.mtpipetype = new_mactestlog_record(strdup(yyvsp[-1].namestring), yyvsp[-2].itype);} break; case 8: -#line 67 "mactestparser.y" - { - yyval.mtpipetype = new_mactestlog_record(stringsave, yyvsp[-3].itype);stringsave = 0;} +#line 62 "mactestparser.y" + {stringsave = strdup(yyvsp[0].namestring);} break; case 9: -#line 69 "mactestparser.y" +#line 62 "mactestparser.y" { - yyval.mtpipetype = new_mactestlog_record(stringsave, yyvsp[-3].itype);stringsave = 0;} + yyval.mtpipetype = new_mactestlog_record(stringsave, yyvsp[-5].itype);stringsave = 0;} break; case 10: -#line 71 "mactestparser.y" +#line 64 "mactestparser.y" {yyval.mtpipetype = 0;} break; case 11: -#line 75 "mactestparser.y" - {stringsave = strdup(yyvsp[0].namestring);} +#line 68 "mactestparser.y" + { new_labelstrings(strdup(yyvsp[0].namestring));} break; case 12: -#line 76 "mactestparser.y" - {} +#line 69 "mactestparser.y" + { new_labelstrings(strdup(yyvsp[0].namestring));} break; case 14: -#line 81 "mactestparser.y" - { new_labelstrings(strdup(yyvsp[0].namestring));} +#line 76 "mactestparser.y" + {} break; case 15: -#line 82 "mactestparser.y" - { new_labelstrings(strdup(yyvsp[0].namestring));} - break; - - case 18: -#line 91 "mactestparser.y" - { new_modes_or_flags(strdup(yyvsp[0].namestring));} - break; - - case 19: -#line 92 "mactestparser.y" - { new_modes_or_flags(strdup(yyvsp[0].namestring));} - break; - - case 21: -#line 97 "mactestparser.y" - {} - break; - - case 22: -#line 100 "mactestparser.y" - {} - break; - - case 23: -#line 103 "mactestparser.y" +#line 79 "mactestparser.y" {} break; @@ -1050,7 +1003,7 @@ } /* Line 1016 of /usr/local/share/bison/yacc.c. */ -#line 1054 "mactestparser.tab.c" +#line 1007 "mactestparser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -1269,7 +1222,7 @@ } -#line 108 "mactestparser.y" +#line 84 "mactestparser.y" int @@ -1370,8 +1323,6 @@ if (!strcmp(buf, "=")) return '='; - if (!strncmp(buf, "mac_test", 8)) - return MAC_TEST; return IDENTIFIER; } @@ -1391,7 +1342,6 @@ new->labelstring = labelstring; new->next = 0; new->prev = 0; - if (labelstring_chain == 0){ labelstring_chain = new; return; ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#4 (text+ko) ==== @@ -37,15 +37,10 @@ %token PID %token IDENTIFIER %token NUM -%token MAC_TEST %type identifier -%type mac_test %type mactestlog_records %type mactestlog_record -%type hook_elements %type label_elements -%type modflag_elements -%type modflag_and_label_elements %type pid %% /* Grammar rules and actions follow. */ @@ -63,42 +58,23 @@ ; mactestlog_record: - PID '=' pid hook_elements '\n' {$$ = new_mactestlog_record(strdup($4), $3);} - |PID '=' pid hook_elements label_elements '\n' { + PID '=' pid identifier '\n' {$$ = new_mactestlog_record(strdup($4), $3);} + |PID '=' pid identifier {stringsave = strdup($4);} ':' label_elements '\n' { $$ = new_mactestlog_record(stringsave, $3);stringsave = 0;} - |PID '=' pid hook_elements modflag_and_label_elements '\n' { - $$ = new_mactestlog_record(stringsave, $3);stringsave = 0;} |'\n' {$$ = 0;} ; -hook_elements: - mac_test {stringsave = strdup($1);} - |hook_elements identifier {} - |hook_elements error - ; - label_elements: - ':' identifier { new_labelstrings(strdup($2));} + identifier { new_labelstrings(strdup($1));} |label_elements identifier { new_labelstrings(strdup($2));} |label_elements error ; -modflag_and_label_elements: - modflag_elements label_elements - ; -modflag_elements: - '#' identifier { new_modes_or_flags(strdup($2));} - |modflag_elements identifier { new_modes_or_flags(strdup($2));} - |modflag_elements error - ; identifier: IDENTIFIER {} ; -mac_test: - MAC_TEST {} - ; pid: NUM {} ; @@ -205,8 +181,6 @@ if (!strcmp(buf, "=")) return '='; - if (!strncmp(buf, "mac_test", 8)) - return MAC_TEST; return IDENTIFIER; } @@ -226,7 +200,6 @@ new->labelstring = labelstring; new->next = 0; new->prev = 0; - if (labelstring_chain == 0){ labelstring_chain = new; return; ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#11 (text+ko) ==== @@ -118,14 +118,18 @@ char *currentchar; \ char *element1; \ char *buffer1; \ + char *submitbuffer; \ + int havelabel = 0; \ int error; \ struct thread *td1 = curthread; \ volatile int badmem = 0; \ error = 0; \ - buffer = malloc(1024, M_MAC_TEST_LOG, M_NOWAIT); \ + buffer = malloc(2048, M_MAC_TEST_LOG, M_NOWAIT); \ if (!buffer) \ badmem = 1; \ + bzero(buffer, 2048); \ element1 = buffer + 512; buffer1 = element1 + 256; \ + submitbuffer = buffer + 1024; \ /*element1 and buffer1 will not be used if badmem == 1*/ \ currentchar = buffer; @@ -137,10 +141,13 @@ #define COUNTER_INC(variable) do { \ atomic_add_int(&counter_##variable, 1); \ if (!badmem) { \ - strcpy(currentchar, #variable); \ - currentchar += strlen(currentchar); \ - sprintf(currentchar, "#pid = %d\n", td1->td_proc->p_pid);\ - mac_test_log_submit(buffer, strlen(buffer)); \ + if (havelabel) \ + sprintf(submitbuffer,"pid = %d %s:%s\n", \ + td1->td_proc->p_pid, #variable, buffer);\ + else \ + sprintf(submitbuffer,"pid = %d %s\n", \ + td1->td_proc->p_pid, #variable); \ + mac_test_log_submit(submitbuffer, strlen(submitbuffer));\ free(buffer, M_MAC_TEST_LOG); \ } \ } while (0) @@ -167,6 +174,7 @@ strcpy(buffer1,"NULL"); \ sprintf(currentchar, "%s ", buffer1); \ currentchar += strlen(currentchar); \ + havelabel = 1; \ } \ } while (0) From owner-p4-projects@FreeBSD.ORG Wed Nov 14 04:05:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D32B16A468; Wed, 14 Nov 2007 04:05:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B70AA16A420 for ; Wed, 14 Nov 2007 04:05:54 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93E7513C44B for ; Wed, 14 Nov 2007 04:05:54 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAE45suX001684 for ; Wed, 14 Nov 2007 04:05:54 GMT (envelope-from avatar@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAE45sD3001681 for perforce@freebsd.org; Wed, 14 Nov 2007 04:05:54 GMT (envelope-from avatar@freebsd.org) Date: Wed, 14 Nov 2007 04:05:54 GMT Message-Id: <200711140405.lAE45sD3001681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to avatar@freebsd.org using -f From: Tai-hwa Liang To: Perforce Change Reviews Cc: Subject: PERFORCE change 129048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2007 04:05:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=129048 Change 129048 by avatar@avatar_t40 on 2007/11/14 04:04:53 Eliminating an unnecessary check on an_gone inside an_stats_update() since a properly locked callout_stop(9) does do the right thing. Reviewed by: ambrisko, jhb MFP4 after: 1 day Affected files ... .. //depot/projects/wifi/sys/dev/an/if_an.c#22 edit Differences ... ==== //depot/projects/wifi/sys/dev/an/if_an.c#22 (text+ko) ==== @@ -1153,10 +1153,6 @@ struct ifnet *ifp; sc = xsc; - if (sc->an_gone) { - return; - } - AN_LOCK_ASSERT(sc); ifp = sc->an_ifp; From owner-p4-projects@FreeBSD.ORG Wed Nov 14 23:29:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0565B16A41A; Wed, 14 Nov 2007 23:28:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26B3A16A418 for ; Wed, 14 Nov 2007 23:28:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1455B13C468 for ; Wed, 14 Nov 2007 23:28:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAENSwgY030243 for ; Wed, 14 Nov 2007 23:28:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAENSuWi030240 for perforce@freebsd.org; Wed, 14 Nov 2007 23:28:56 GMT (envelope-from peter@freebsd.org) Date: Wed, 14 Nov 2007 23:28:56 GMT Message-Id: <200711142328.lAENSuWi030240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2007 23:29:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=129072 Change 129072 by peter@peter_daintree on 2007/11/14 23:28:55 IFC @129071 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#39 integrate .. //depot/projects/hammer/bin/ps/ps.c#22 integrate .. //depot/projects/hammer/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/etc/Makefile#60 integrate .. //depot/projects/hammer/etc/defaults/Makefile#7 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#18 delete .. //depot/projects/hammer/etc/freebsd-update.conf#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#40 integrate .. //depot/projects/hammer/etc/pf.conf#4 delete .. //depot/projects/hammer/etc/rc.d/hostapd#2 integrate .. //depot/projects/hammer/release/Makefile#95 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 integrate .. //depot/projects/hammer/release/picobsd/bridge/PICOBSD#6 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#9 integrate .. //depot/projects/hammer/release/picobsd/build/Makefile.conf#2 integrate .. //depot/projects/hammer/release/picobsd/build/picobsd#7 integrate .. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#6 integrate .. //depot/projects/hammer/release/scripts/src-install.sh#5 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#20 integrate .. //depot/projects/hammer/share/doc/legal/Makefile#2 integrate .. //depot/projects/hammer/share/examples/pf/Makefile#4 integrate .. //depot/projects/hammer/share/examples/pf/ackpri#2 integrate .. //depot/projects/hammer/share/examples/pf/faq-example1#2 integrate .. //depot/projects/hammer/share/examples/pf/faq-example2#2 integrate .. //depot/projects/hammer/share/examples/pf/faq-example3#2 integrate .. //depot/projects/hammer/share/examples/pf/pf.conf#1 branch .. //depot/projects/hammer/share/examples/pf/queue1#2 integrate .. //depot/projects/hammer/share/examples/pf/queue2#2 integrate .. //depot/projects/hammer/share/examples/pf/queue3#2 integrate .. //depot/projects/hammer/share/examples/pf/queue4#2 integrate .. //depot/projects/hammer/share/examples/pf/spamd#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#98 integrate .. //depot/projects/hammer/share/man/man4/asmc.4#1 branch .. //depot/projects/hammer/share/man/man4/ipw.4#14 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#16 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#11 integrate .. //depot/projects/hammer/share/man/man4/wpi.4#1 branch .. //depot/projects/hammer/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#17 integrate .. //depot/projects/hammer/share/man/man9/Makefile#73 integrate .. //depot/projects/hammer/share/man/man9/locking.9#5 integrate .. //depot/projects/hammer/share/man/man9/rmlock.9#1 branch .. //depot/projects/hammer/sys/amd64/amd64/trap.c#99 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#90 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#104 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#16 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#22 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#28 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#29 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#14 integrate .. //depot/projects/hammer/sys/conf/files#163 integrate .. //depot/projects/hammer/sys/conf/files.amd64#98 integrate .. //depot/projects/hammer/sys/conf/files.i386#84 integrate .. //depot/projects/hammer/sys/conf/files.pc98#63 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#65 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#42 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/hammer/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/hammer/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/hammer/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/hammer/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/hammer/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drmP.h#16 integrate .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#7 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#13 integrate .. //depot/projects/hammer/sys/dev/md/md.c#62 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#51 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#37 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#90 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_ihash.c#6 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#15 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#94 integrate .. //depot/projects/hammer/sys/i386/i386/locore.s#18 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#81 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#71 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#100 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#56 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#60 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#33 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#65 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#42 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#34 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#41 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#74 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/hammer/sys/kern/kern_rwlock.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#100 integrate .. //depot/projects/hammer/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#54 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#86 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_pcpu.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#26 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#32 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#40 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#26 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#65 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#35 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#42 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#35 integrate .. //depot/projects/hammer/sys/modules/Makefile#118 integrate .. //depot/projects/hammer/sys/modules/agp/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/asmc/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#31 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#51 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#21 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#15 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#20 integrate .. //depot/projects/hammer/sys/pci/agp.c#23 delete .. //depot/projects/hammer/sys/pci/agp_ali.c#15 delete .. //depot/projects/hammer/sys/pci/agp_amd.c#15 delete .. //depot/projects/hammer/sys/pci/agp_amd64.c#14 delete .. //depot/projects/hammer/sys/pci/agp_ati.c#5 delete .. //depot/projects/hammer/sys/pci/agp_i810.c#26 delete .. //depot/projects/hammer/sys/pci/agp_if.m#4 delete .. //depot/projects/hammer/sys/pci/agp_intel.c#21 delete .. //depot/projects/hammer/sys/pci/agp_nvidia.c#9 delete .. //depot/projects/hammer/sys/pci/agp_sis.c#19 delete .. //depot/projects/hammer/sys/pci/agp_via.c#21 delete .. //depot/projects/hammer/sys/pci/agppriv.h#6 delete .. //depot/projects/hammer/sys/pci/agpreg.h#16 delete .. //depot/projects/hammer/sys/pci/agpvar.h#3 delete .. //depot/projects/hammer/sys/pci/nfsmb.c#5 integrate .. //depot/projects/hammer/sys/powerpc/include/md_var.h#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#47 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#25 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#31 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#26 integrate .. //depot/projects/hammer/sys/sun4v/include/pcpu.h#5 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/hammer/sys/sys/_rmlock.h#1 branch .. //depot/projects/hammer/sys/sys/lock.h#20 integrate .. //depot/projects/hammer/sys/sys/malloc.h#14 integrate .. //depot/projects/hammer/sys/sys/param.h#96 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#13 integrate .. //depot/projects/hammer/sys/sys/proc.h#110 integrate .. //depot/projects/hammer/sys/sys/rmlock.h#1 branch .. //depot/projects/hammer/sys/sys/smp.h#14 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#32 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#19 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#49 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#46 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#45 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#12 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#18 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#50 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#27 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#66 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#22 integrate .. //depot/projects/hammer/tools/regression/priv/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/priv/main.c#3 integrate .. //depot/projects/hammer/tools/regression/priv/main.h#3 integrate .. //depot/projects/hammer/tools/regression/priv/priv_netinet_ipsec.c#1 branch .. //depot/projects/hammer/tools/sched/schedgraph.py#8 integrate .. //depot/projects/hammer/usr.bin/du/du.c#16 integrate .. //depot/projects/hammer/usr.bin/killall/killall.1#9 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#11 integrate .. //depot/projects/hammer/usr.bin/mail/aux.c#3 integrate .. //depot/projects/hammer/usr.bin/mail/cmd1.c#2 integrate .. //depot/projects/hammer/usr.bin/mail/lex.c#4 integrate .. //depot/projects/hammer/usr.bin/mail/list.c#2 integrate .. //depot/projects/hammer/usr.bin/mail/main.c#4 integrate .. //depot/projects/hammer/usr.bin/sed/main.c#11 integrate .. //depot/projects/hammer/usr.bin/tee/tee.1#3 integrate .. //depot/projects/hammer/usr.bin/write/write.c#4 integrate .. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/hammer/usr.sbin/pciconf/cap.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#21 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#15 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/perform.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#15 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/pathnames.h#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/version.h#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#31 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#12 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#45 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#11 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#39 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071108: Removed very crunch OLDCARD support file +OLD_FILES+=etc/defaults/pccard.conf # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/hammer/bin/ps/ps.c#22 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -706,9 +708,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -716,10 +718,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -736,6 +739,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -746,21 +751,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/hammer/etc/Makefile#60 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.364 2007/10/29 07:37:08 yar Exp $ +# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ .include @@ -14,7 +14,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ - portsnap.conf pf.conf pf.os phones profile protocols \ + portsnap.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ ==== //depot/projects/hammer/etc/defaults/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.8 2007/11/08 17:41:35 imp Exp $ -FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf +FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults ==== //depot/projects/hammer/etc/freebsd-update.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.1 2006/08/31 09:51:33 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.2 2007/11/12 04:47:57 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from telling you to @@ -23,9 +23,13 @@ # Paths which start with anything matching an entry in an UpdateIfUnmodified # statement will only be updated if the contents of the file have not been -# modified by the user. +# modified by the user (unless changes are merged; see below). UpdateIfUnmodified /etc/ /var/ +# When upgrading to a new FreeBSD release, files which match MergeChanges +# will have any local changes merged into the version from the new release. +MergeChanges /etc/ /var/named/etc/ + ### Default configuration options: # Directory in which to store downloaded updates and temporary @@ -46,3 +50,9 @@ # FreeBSD Update retain this modified metadata when installing a new version # of that file? # KeepModifiedMetadata yes + +# When upgrading between releases, should the list of Components be +# read strictly (StrictComponents yes) or merely as a list of components +# which *might* be installed of which FreeBSD Update should figure out +# which actually are installed and upgrade those (StrictComponents no)? +# StrictComponents no ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.329 2007/07/25 13:37:33 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.332 2007/11/10 22:47:46 sam Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -80,6 +80,8 @@ .. intel_iwi .. + intel_wpi + .. .. ncurses .. @@ -212,6 +214,8 @@ .. find_interface .. + hostapd + .. ibcs2 .. ipfilter @@ -304,6 +308,8 @@ .. tcsh .. + wpa_supplicant + .. .. games fortune ==== //depot/projects/hammer/etc/rc.d/hostapd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/hostapd,v 1.1 2006/02/03 01:35:36 flz Exp $ +# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $ # # PROVIDE: hostapd @@ -14,9 +14,11 @@ rcvar=`set_rcvar` conf_file="/etc/${name}.conf" +pidfile="/var/run/${name}.pid" -command_args="-B ${conf_file}" +command_args="-P ${pidfile} -B ${conf_file}" required_files="${conf_file}" +extra_commands="reload" load_rc_config ${name} run_rc_command "$1" ==== //depot/projects/hammer/release/Makefile#95 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.925 2007/10/11 04:28:07 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.926 2007/11/09 15:32:04 nyan Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -741,10 +741,6 @@ ln -sf /stand $$dir; \ done ) cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand -.if ${TARGET} == "pc98" - cp ${.CURDIR}/../etc/defaults/pccard.conf \ - ${RD}/mfsfd/etc/defaults/pccard.conf -.endif cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/ ( for F in defaults/rc.conf netconfig protocols ; do \ ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326 2007/09/26 21:30:50 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.327 2007/11/13 16:27:29 brueffer Exp $ 2000 @@ -793,6 +793,9 @@ [&arch.i386;] NCR / AT&T / Lucent Technologies WaveLan T1-speed ISA/radio LAN cards (&man.wl.4; driver) + [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 3945ABG MiniPCI + network adapters (&man.wpi.4; driver) + &hwlist.zyd; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1073 2007/11/05 00:24:05 gshapiro Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1074 2007/11/11 17:16:55 gshapiro Exp $ 2000 @@ -210,7 +210,7 @@ 4.1.23 to 4.1.28. sendmail has been updated from - 8.14.1 to 8.14.2. + 8.14.1 to 8.14.2. &merged; ==== //depot/projects/hammer/release/picobsd/bridge/PICOBSD#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.19 2006/09/18 06:34:51 marck Exp $ +# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.20 2007/11/14 05:42:53 luigi Exp $ # # Line starting with #PicoBSD contains PicoBSD build parameters #marker def_sz init MFS_inodes floppy_inodes @@ -7,7 +7,6 @@ options MD_ROOT_SIZE=3200 # same as def_sz hints "PICOBSD.hints" -machine i386 cpu I486_CPU cpu I586_CPU cpu I686_CPU ==== //depot/projects/hammer/release/picobsd/bridge/crunch.conf#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.21 2006/11/22 00:33:19 rodrigc Exp $ +# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.22 2007/11/14 05:42:53 luigi Exp $ # # configuration file for "bridge" floppy. # Depending on your needs, almost surely you will need to @@ -177,6 +177,7 @@ libs -lufs # used by mount ### ee uses ncurses instead of curses libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm -libs -lmytinfo -lz -lpcap -lwrap +# libs -lmytinfo +libs -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom ==== //depot/projects/hammer/release/picobsd/build/Makefile.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.18 2001/11/01 16:17:37 luigi Exp $ +# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.19 2007/11/14 05:42:53 luigi Exp $ # # Makefile for building PICOBSD kernels and running crunchgen # @@ -9,6 +9,7 @@ # When building a kernel, also need ${name} from the environment # and CONFIG may indicate an alternate config program +BINMAKE?=make SRC?=/usr/src CONFIG?=config MODULES?=-DNO_MODULES # do not build them as a default @@ -38,11 +39,11 @@ ${KERNFILE}: ${COMPILE} do_a_make_in_the_kernel_directory_anyways do_a_make_in_the_kernel_directory_anyways: - (cd ${COMPILE}; make KERNEL=kernel ${MODULES} ) + (cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} ) ${COMPILE}: ${CONF}/${CONFFILE} (cd ${CONF}; ${CONFIG} -d ${COMPILE} ${CONFFILE}; \ - cd ${COMPILE}; make KERNEL=kernel ${MODULES} depend ) + cd ${COMPILE}; ${BINMAKE} KERNEL=kernel ${MODULES} depend ) ${CONF}/${CONFFILE}: PICOBSD # -mkdir -p ${CONF} # XXX not needed yet. ==== //depot/projects/hammer/release/picobsd/build/picobsd#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/release/picobsd/build/picobsd,v 1.39 2006/05/17 09:33:06 phk Exp $ +# $FreeBSD: src/release/picobsd/build/picobsd,v 1.41 2007/11/14 07:38:22 luigi Exp $ # This file requires sysutils/makefs to run # # The new PicoBSD build script. Invoked as @@ -75,19 +75,17 @@ # log something on stdout if verbose. o_verbose=0 # this needs to be here! log() { - if [ ${o_verbose} -gt 0 ] ; then - printf "\n*** %s\n" "$*" - if [ ${o_verbose} -gt 1 ] ; then - read -p "=== Press enter to continue" foo - fi - fi + local foo + [ ${o_verbose} -gt 0 ] && printf "\n*** %s\n" "$*" + [ ${o_verbose} -gt 1 ] && read -p "=== Press enter to continue" foo + return 0 } logverbose() { local foo - printf "\n*** %s\n" "$*" read -p "=== Press enter to continue" foo + return 0 } set_defaults() { @@ -164,6 +162,7 @@ ) } +# entry for 4.x and earlier trees create_includes_and_libraries() { local e i @@ -208,33 +207,32 @@ # set_type looks in user or system directories for the floppy type # specified as first argument, and sets variables according to the config. -# file. Also sets MY_TREE and BUILDDIR and SITE +# file. Sets THETYPE, SITE, name, MY_TREE and BUILDDIR set_type() { local a i - log "set_type()" + log "set_type() : Type '$1' site '$2'" THETYPE=$1 SITE=$2 a=$1 + name="" # clear in case of errors for i in ${c_startdir}/${a} ${PICO_TREE}/${a} ; do log "set_type: checking $i" - if [ -d $i -a -f $i/PICOBSD -a -f $i/crunch.conf ] ; then - set -- `cat $i/PICOBSD | \ + [ -d $i -a -f $i/PICOBSD -a -f $i/crunch.conf ] || continue + set -- `cat $i/PICOBSD | \ awk '/^#PicoBSD/ {print $2, $3, $4, $5, $6}'` - if [ "$1" != "" ]; then - MFS_SIZE=$1 ; init_name=$2 - mfs_inodes=$3 ; fd_inodes=$4 - name=`(cd $i ; pwd) ` - name=`basename $name` - MY_TREE=$i - BUILDDIR=${c_startdir}/build_dir-${name} - log "Matching file $name in $i" - return ; - fi - fi + [ x"$1" != "x" ] || continue + MFS_SIZE=$1 ; init_name=$2 + mfs_inodes=$3 ; fd_inodes=$4 + name=`(cd $i ; pwd) ` + name=`basename $name` + MY_TREE=$i + BUILDDIR=${c_startdir}/build_dir-${name} + log "Matching file $name in $i" + return ; done - echo "Type $a NOT FOUND" + logverbose "Type $a NOT FOUND" } clean_tree() { @@ -280,10 +278,9 @@ log "PICO_OBJ is ${PICO_OBJ}" if [ ${OSVERSION} -ge 500035 ] ; then - MAKEOBJDIRPREFIX=${l_objtree} - export MAKEOBJDIRPREFIX - log `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV` - eval export `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV` + export MAKEOBJDIRPREFIX=${l_objtree} + eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\"" + eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV` fi # create build directory and subtree mkdir -p ${BUILDDIR}/crunch @@ -304,12 +301,16 @@ local z msg log "build_package()" - touch build.status + rm -rf build.status echo "##############################################" >>build.status echo "## `date` ">>build.status echo "##############################################" >>build.status for z in bridge dial router net isp ; do set_type ${z} + if [ "${name}" = "" ] ; then + echo "*** TYPE=${z} not found" >>build.status + continue + fi echo "---------------------------------------------">>build.status echo "Building TYPE=${z}, SIZE=${MFS_SIZE}" >>build.status msg="(ok)" # error message @@ -454,16 +455,14 @@ #------------------------------------------------------------------- -# invoke the Makefile to compile the kernel. +# invoke the picobsd Makefile to compile the kernel. +# if MODULES is set (value is irrelevant) the makefile will build modules. do_kernel() { # OK log "do_kernel() Preparing kernel \"$name\" in $MY_TREE" (cd $MY_TREE; export name SRC BUILDDIR # used in this makefile ; # export CONFIG - if [ "${o_do_modules}" = "yes" ] ; then - MODULES="" - export MODULES - fi - make -m ${SRC}/share/mk -v -f ${PICO_TREE}/build/Makefile.conf ) || \ + [ "${o_do_modules}" = "yes" ] && export MODULES="" + ${BINMAKE} -v -f ${PICO_TREE}/build/Makefile.conf ) || \ fail $? missing_kernel } @@ -491,8 +490,8 @@ excl=${MY_TREE}/floppy.tree.exclude if [ -f ${excl} ] ; then + log "Files excluded from generic tree: `echo;cat ${excl}`" excl="--exclude-from ${excl}" - log "Files excluded from generic tree: `echo;cat ${excl}`" else excl="" fi @@ -561,13 +560,13 @@ log "Making and installing crunch1 from `pwd` src ${SRC}..." a=${BUILDDIR}/crunch1.conf ( export BUILDDIR SRC MY_TREE PICO_OBJ ; - make -m ${SRC}/share/mk \ + ${BINMAKE} \ -v -f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk ) log "Libs are ${LIBS} " export SRC # used by crunch.mk # export LIBS CFLAGS log "Now make -f crunch.mk" - make -m ${SRC}/share/mk ${o_makeopts} -f ${BUILDDIR}/crunch.mk + ${BINMAKE} ${o_makeopts} -f ${BUILDDIR}/crunch.mk strip --remove-section=.note --remove-section=.comment crunch1 mv crunch1 ${dst}/stand/crunch chmod 555 ${dst}/stand/crunch @@ -824,7 +823,8 @@ # arguments. set_defaults -while [ true ]; do +args="" +while [ x"$1" != x ]; do case $1 in --src) # set the source path instead of /usr/src SRC=`(cd $2; pwd)` @@ -865,23 +865,22 @@ o_makeopts="-d l" # be verbose ;; *) - break ; + args="$args $1" # accumulate args ;; esac shift done set_build_parameters # things that depend on ${SRC} -set_type $1 $2 # type and site, respectively # If $1="package", it creates a neat set of floppies +set -- ${args} +[ "$1" = "package" ] && build_package + +set_type $args # type and site, respectively -if [ "$1" = "package" ] ; then - build_package -fi -if [ "${o_interactive}" != "NO" ] ; then - main_dialog -fi +[ "${o_interactive}" != "NO" ] && main_dialog + if [ "${o_clean}" = "YES" ] ; then clean_tree else ==== //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#6 (text+ko) ==== @@ -1,15 +1,15 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.5 2006/03/17 18:54:30 ru Exp $ +# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.6 2007/11/14 05:42:54 luigi Exp $ .include .PATH: ${.CURDIR}/../../../../usr.bin/login PROG= login -SRCS= pico-login.c login_access.c login_fbtab.c -MAN= login.1 login.access.5 +SRCS= pico-login.c login_fbtab.c +MAN= login.1 -CFLAGS+=-DLOGIN_ACCESS -DLOGALL +CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBCRYPT} LDADD= -lutil -lcrypt ==== //depot/projects/hammer/release/scripts/src-install.sh#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/src-install.sh,v 1.11 2007/06/28 18:26:35 jhb Exp $ +# $FreeBSD: src/release/scripts/src-install.sh,v 1.12 2007/11/09 08:50:02 ru Exp $ # if [ "`id -u`" != "0" ]; then @@ -11,8 +11,8 @@ echo "You must specify which components of src to extract" echo "possible subcomponents are:" echo - echo "base bin cddl contrib crypto etc games gnu include krb5 lib" - echo "libexec release rescue sbin secure share sys tools ubin" + echo "base bin cddl compat contrib crypto etc games gnu include krb5" + echo "lib libexec release rescue sbin secure share sys tools ubin" echo "usbin" echo echo "You may also specify all to extract all subcomponents." @@ -20,7 +20,7 @@ fi if [ "$1" = "all" ]; then - dists="base bin cddl contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" + dists="base bin cddl compat contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" else dists="$*" fi ==== //depot/projects/hammer/sbin/mdconfig/mdconfig.8#20 (text+ko) ==== @@ -39,9 +39,9 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37 2007/05/18 13:57:17 keramida Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.40 2007/11/11 08:14:22 keramida Exp $ .\" -.Dd May 18, 2007 +.Dd November 11, 2007 .Dt MDCONFIG 8 .Os .Sh NAME @@ -96,7 +96,7 @@ .It Cm vnode A file specified with .Fl f Ar file -becomes the backingstore for this memory disk. +becomes the backing store for this memory disk. .It Cm swap Swap space is used to back this memory disk. .El @@ -185,7 +185,7 @@ .Pa /dev/md4 with .Pa /tmp/boot.flp -as backing: +as backing storage: .Pp .Dl mdconfig -a -t vnode -f /tmp/boot.flp -u 4 .Pp @@ -194,7 +194,9 @@ .Pp .Dl mdconfig -d -u 4 .Pp -To create and mount a 128MByte swap backed file system on +To create a 128MByte swap backed disk, initialize an +.Xr ffs 7 +file system on it, and mount it on .Pa /tmp : .Bd -literal -offset indent mdconfig -a -t swap -s 128M -u 10 @@ -203,10 +205,10 @@ chmod 1777 /tmp .Ed .Pp -To create a 5MB file-backed disk ( -.Fl -a +To create a 5MB file-backed disk +.Ns ( Fl a and -.Fl -t Ar vnode +.Fl t Ar vnode are implied): .Bd -literal -offset indent dd if=/dev/zero of=somebackingfile bs=1k count=5k @@ -216,13 +218,21 @@ mount /dev/md0c /mnt .Ed .Pp -To mount an ISO 9660 CD image file: +To create an +.Xr md 4 +device out of an ISO 9660 CD image file +.Ns ( Fl a +and +.Fl t Ar vnode +are implied), using the first available +.Xr md 4 +device, and then mount the new memory disk: .Bd -literal -offset indent -mdconfig -a -t vnode -u 10 -f cdimage.iso -mount_cd9660 /dev/md10 /mnt +mount -t cd9660 /dev/`mdconfig -f cdimage.iso` /mnt .Ed .Sh SEE ALSO .Xr md 4 , +.Xr ffs 7 , .Xr bsdlabel 8 , .Xr fdisk 8 , .Xr mdmfs 8 , ==== //depot/projects/hammer/share/doc/legal/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/share/doc/legal/Makefile,v 1.1 2007/03/02 11:42:54 flz Exp $ +# $FreeBSD: src/share/doc/legal/Makefile,v 1.2 2007/11/08 22:09:35 benjsc Exp $ SUBDIR= intel_ipw \ - intel_iwi + intel_iwi \ + intel_wpi .include ==== //depot/projects/hammer/share/examples/pf/Makefile#4 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/share/examples/pf/Makefile,v 1.3 2004/12/21 08:46:53 ru Exp $ +# $FreeBSD: src/share/examples/pf/Makefile,v 1.4 2007/11/11 01:16:51 mlaier Exp $ NO_OBJ= FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ + pf.conf \ spamd FILESDIR= ${SHAREDIR}/examples/pf ==== //depot/projects/hammer/share/examples/pf/ackpri#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/share/examples/pf/ackpri,v 1.1 2004/09/14 01:07:18 mlaier Exp $ -# $OpenBSD: ackpri,v 1.2 2003/03/10 14:24:33 henning Exp $ +# $FreeBSD: src/share/examples/pf/ackpri,v 1.2 2007/11/11 01:16:51 mlaier Exp $ +# $OpenBSD: ackpri,v 1.3 2006/10/07 04:48:01 mcbride Exp $ # Use a simple priority queue to prioritize empty (no payload) TCP ACKs, # which dramatically improves throughput on (asymmetric) links when the @@ -25,9 +25,7 @@ queue q_pri priority 7 queue q_def priority 1 priq(default) -pass out on $ext_if proto tcp from $ext_if to any flags S/SA \ - keep state queue (q_def, q_pri) +pass out on $ext_if proto tcp from $ext_if to any queue (q_def, q_pri) -pass in on $ext_if proto tcp from any to $ext_if flags S/SA \ - keep state queue (q_def, q_pri) +pass in on $ext_if proto tcp from any to $ext_if queue (q_def, q_pri) ==== //depot/projects/hammer/share/examples/pf/faq-example1#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/share/examples/pf/faq-example1,v 1.1 2004/09/14 01:07:18 mlaier Exp $ -# $OpenBSD: faq-example1,v 1.2 2003/08/06 16:04:45 henning Exp $ +# $FreeBSD: src/share/examples/pf/faq-example1,v 1.2 2007/11/11 01:16:51 mlaier Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 15 05:25:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A62EC16A468; Thu, 15 Nov 2007 05:25:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A78BC16A41B for ; Thu, 15 Nov 2007 05:25:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 974F313C455 for ; Thu, 15 Nov 2007 05:25:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAF5PUnD002537 for ; Thu, 15 Nov 2007 05:25:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAF5PUDe002534 for perforce@freebsd.org; Thu, 15 Nov 2007 05:25:30 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 05:25:30 GMT Message-Id: <200711150525.lAF5PUDe002534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 05:25:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=129076 Change 129076 by jb@jb_freebsd1 on 2007/11/15 05:25:23 Branch RELENG_7 Affected files ... .. //depot/projects/dtrace7/src/COPYRIGHT#1 branch .. //depot/projects/dtrace7/src/LOCKS#1 branch .. //depot/projects/dtrace7/src/MAINTAINERS#1 branch .. //depot/projects/dtrace7/src/Makefile#1 branch .. //depot/projects/dtrace7/src/Makefile.inc1#1 branch .. //depot/projects/dtrace7/src/ObsoleteFiles.inc#1 branch .. //depot/projects/dtrace7/src/README#1 branch .. //depot/projects/dtrace7/src/UPDATING#1 branch .. //depot/projects/dtrace7/src/bin/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/bin/cat/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/cat/cat.1#1 branch .. //depot/projects/dtrace7/src/bin/cat/cat.c#1 branch .. //depot/projects/dtrace7/src/bin/chflags/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/chflags/chflags.1#1 branch .. //depot/projects/dtrace7/src/bin/chflags/chflags.c#1 branch .. //depot/projects/dtrace7/src/bin/chio/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/chio/chio.1#1 branch .. //depot/projects/dtrace7/src/bin/chio/chio.c#1 branch .. //depot/projects/dtrace7/src/bin/chio/defs.h#1 branch .. //depot/projects/dtrace7/src/bin/chio/pathnames.h#1 branch .. //depot/projects/dtrace7/src/bin/chmod/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/chmod/chmod.1#1 branch .. //depot/projects/dtrace7/src/bin/chmod/chmod.c#1 branch .. //depot/projects/dtrace7/src/bin/cp/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/cp/cp.1#1 branch .. //depot/projects/dtrace7/src/bin/cp/cp.c#1 branch .. //depot/projects/dtrace7/src/bin/cp/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/cp/utils.c#1 branch .. //depot/projects/dtrace7/src/bin/csh/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/dtrace7/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/dtrace7/src/bin/csh/config.h#1 branch .. //depot/projects/dtrace7/src/bin/csh/config_p.h#1 branch .. //depot/projects/dtrace7/src/bin/csh/host.defs#1 branch .. //depot/projects/dtrace7/src/bin/csh/iconv.h#1 branch .. //depot/projects/dtrace7/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/dtrace7/src/bin/date/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/date/date.1#1 branch .. //depot/projects/dtrace7/src/bin/date/date.c#1 branch .. //depot/projects/dtrace7/src/bin/date/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/date/netdate.c#1 branch .. //depot/projects/dtrace7/src/bin/date/vary.c#1 branch .. //depot/projects/dtrace7/src/bin/date/vary.h#1 branch .. //depot/projects/dtrace7/src/bin/dd/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/dd/args.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/conv.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/dd.1#1 branch .. //depot/projects/dtrace7/src/bin/dd/dd.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/dd.h#1 branch .. //depot/projects/dtrace7/src/bin/dd/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/dd/gen.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/misc.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/position.c#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.ascii#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.ibm#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.lcase#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.pareven#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.parnone#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.parodd#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.parset#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.swab#1 branch .. //depot/projects/dtrace7/src/bin/dd/ref.ucase#1 branch .. //depot/projects/dtrace7/src/bin/df/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/df/df.1#1 branch .. //depot/projects/dtrace7/src/bin/df/df.c#1 branch .. //depot/projects/dtrace7/src/bin/domainname/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/domainname/domainname.1#1 branch .. //depot/projects/dtrace7/src/bin/domainname/domainname.c#1 branch .. //depot/projects/dtrace7/src/bin/echo/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/echo/echo.1#1 branch .. //depot/projects/dtrace7/src/bin/echo/echo.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/ed/POSIX#1 branch .. //depot/projects/dtrace7/src/bin/ed/README#1 branch .. //depot/projects/dtrace7/src/bin/ed/buf.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/cbc.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/ed.1#1 branch .. //depot/projects/dtrace7/src/bin/ed/ed.h#1 branch .. //depot/projects/dtrace7/src/bin/ed/glbl.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/io.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/main.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/re.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/sub.c#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/=.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/README#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/TODO#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/a.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/a.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/a.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/a1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/a2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/addr.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/addr.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/addr.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/c.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/c.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/c.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/c1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/c2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/d.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/d.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/d.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/d.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e2.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e2.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e2.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e3.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e3.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e3.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e3.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e4.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e4.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/e4.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/f1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/f2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g2.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g2.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g2.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g3.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g3.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g3.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g3.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g4.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g4.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g4.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g5.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g5.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/g5.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/h.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/i.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/i.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/i.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/i1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/i2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/i3.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/j.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/j.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/j.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k3.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/k4.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/l.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/l.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/l.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/m.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/m.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/m.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/m.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/n.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/n.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/n.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/p.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/p.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/p.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/q.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/q.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/q.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/q1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r2.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r2.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r2.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r3.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r3.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/r3.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s10.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s2.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s2.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s2.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s3.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s3.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s3.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s3.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s4.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s5.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s6.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s7.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s8.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/s9.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t1.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t1.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t1.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t2.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t2.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/t2.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/u.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/u.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/u.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/u.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/v.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/v.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/v.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/w.d#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/w.r#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/w.t#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/w1.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/w2.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/w3.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/x.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/test/z.err#1 branch .. //depot/projects/dtrace7/src/bin/ed/undo.c#1 branch .. //depot/projects/dtrace7/src/bin/expr/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/expr/expr.1#1 branch .. //depot/projects/dtrace7/src/bin/expr/expr.y#1 branch .. //depot/projects/dtrace7/src/bin/getfacl/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/dtrace7/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/dtrace7/src/bin/hostname/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/hostname/hostname.1#1 branch .. //depot/projects/dtrace7/src/bin/hostname/hostname.c#1 branch .. //depot/projects/dtrace7/src/bin/kenv/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/kenv/kenv.1#1 branch .. //depot/projects/dtrace7/src/bin/kenv/kenv.c#1 branch .. //depot/projects/dtrace7/src/bin/kill/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/kill/kill.1#1 branch .. //depot/projects/dtrace7/src/bin/kill/kill.c#1 branch .. //depot/projects/dtrace7/src/bin/ln/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/ln/ln.1#1 branch .. //depot/projects/dtrace7/src/bin/ln/ln.c#1 branch .. //depot/projects/dtrace7/src/bin/ln/symlink.7#1 branch .. //depot/projects/dtrace7/src/bin/ls/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/ls/cmp.c#1 branch .. //depot/projects/dtrace7/src/bin/ls/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/ls/ls.1#1 branch .. //depot/projects/dtrace7/src/bin/ls/ls.c#1 branch .. //depot/projects/dtrace7/src/bin/ls/ls.h#1 branch .. //depot/projects/dtrace7/src/bin/ls/print.c#1 branch .. //depot/projects/dtrace7/src/bin/ls/util.c#1 branch .. //depot/projects/dtrace7/src/bin/mkdir/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/dtrace7/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/dtrace7/src/bin/mv/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/mv/mv.1#1 branch .. //depot/projects/dtrace7/src/bin/mv/mv.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/pax/ar_io.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/cache.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/cache.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/cpio.1#1 branch .. //depot/projects/dtrace7/src/bin/pax/cpio.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/cpio.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/file_subs.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/ftree.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/ftree.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/options.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/options.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/pax.1#1 branch .. //depot/projects/dtrace7/src/bin/pax/pax.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/pax.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/tables.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/tables.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/tar.1#1 branch .. //depot/projects/dtrace7/src/bin/pax/tar.c#1 branch .. //depot/projects/dtrace7/src/bin/pax/tar.h#1 branch .. //depot/projects/dtrace7/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/dtrace7/src/bin/ps/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/ps/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/ps/fmt.c#1 branch .. //depot/projects/dtrace7/src/bin/ps/keyword.c#1 branch .. //depot/projects/dtrace7/src/bin/ps/nlist.c#1 branch .. //depot/projects/dtrace7/src/bin/ps/print.c#1 branch .. //depot/projects/dtrace7/src/bin/ps/ps.1#1 branch .. //depot/projects/dtrace7/src/bin/ps/ps.c#1 branch .. //depot/projects/dtrace7/src/bin/ps/ps.h#1 branch .. //depot/projects/dtrace7/src/bin/pwd/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/pwd/pwd.1#1 branch .. //depot/projects/dtrace7/src/bin/pwd/pwd.c#1 branch .. //depot/projects/dtrace7/src/bin/rcp/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/rcp/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/rcp/rcp.1#1 branch .. //depot/projects/dtrace7/src/bin/rcp/rcp.c#1 branch .. //depot/projects/dtrace7/src/bin/rcp/util.c#1 branch .. //depot/projects/dtrace7/src/bin/realpath/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/realpath/realpath.1#1 branch .. //depot/projects/dtrace7/src/bin/realpath/realpath.c#1 branch .. //depot/projects/dtrace7/src/bin/rm/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/rm/rm.1#1 branch .. //depot/projects/dtrace7/src/bin/rm/rm.c#1 branch .. //depot/projects/dtrace7/src/bin/rmail/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/rmdir/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/dtrace7/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/file.c#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/mask.c#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/merge.c#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/remove.c#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/dtrace7/src/bin/setfacl/util.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/sh/TOUR#1 branch .. //depot/projects/dtrace7/src/bin/sh/alias.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/alias.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/arith.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/arith.y#1 branch .. //depot/projects/dtrace7/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/dtrace7/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/dtrace7/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/builtins.def#1 branch .. //depot/projects/dtrace7/src/bin/sh/cd.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/cd.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/error.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/error.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/eval.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/eval.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/exec.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/exec.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/expand.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/expand.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/kill#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/login#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/popd#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/dtrace7/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/dtrace7/src/bin/sh/histedit.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/init.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/input.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/input.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/jobs.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/jobs.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/mail.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/mail.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/main.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/main.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/memalloc.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/memalloc.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/dtrace7/src/bin/sh/mkinit.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/mknodes.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/mktokens#1 branch .. //depot/projects/dtrace7/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/mystring.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/mystring.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/dtrace7/src/bin/sh/nodetypes#1 branch .. //depot/projects/dtrace7/src/bin/sh/options.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/options.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/output.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/output.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/parser.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/parser.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/redir.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/redir.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/sh.1#1 branch .. //depot/projects/dtrace7/src/bin/sh/shell.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/show.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/show.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/trap.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/trap.h#1 branch .. //depot/projects/dtrace7/src/bin/sh/var.c#1 branch .. //depot/projects/dtrace7/src/bin/sh/var.h#1 branch .. //depot/projects/dtrace7/src/bin/sleep/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/sleep/sleep.1#1 branch .. //depot/projects/dtrace7/src/bin/sleep/sleep.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/stty/cchar.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/extern.h#1 branch .. //depot/projects/dtrace7/src/bin/stty/gfmt.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/key.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/modes.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/print.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/stty.1#1 branch .. //depot/projects/dtrace7/src/bin/stty/stty.c#1 branch .. //depot/projects/dtrace7/src/bin/stty/stty.h#1 branch .. //depot/projects/dtrace7/src/bin/stty/util.c#1 branch .. //depot/projects/dtrace7/src/bin/sync/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/sync/sync.8#1 branch .. //depot/projects/dtrace7/src/bin/sync/sync.c#1 branch .. //depot/projects/dtrace7/src/bin/test/Makefile#1 branch .. //depot/projects/dtrace7/src/bin/test/TEST.README#1 branch .. //depot/projects/dtrace7/src/bin/test/TEST.csh#1 branch .. //depot/projects/dtrace7/src/bin/test/TEST.sh#1 branch .. //depot/projects/dtrace7/src/bin/test/test.1#1 branch .. //depot/projects/dtrace7/src/bin/test/test.c#1 branch .. //depot/projects/dtrace7/src/cddl/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/cddl/lib/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/sbin/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/dtrace7/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/dtrace7/src/contrib/amd/BUGS#1 branch .. //depot/projects/dtrace7/src/contrib/amd/COPYING#1 branch .. //depot/projects/dtrace7/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/dtrace7/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/dtrace7/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/dtrace7/src/contrib/amd/INSTALL#1 branch .. //depot/projects/dtrace7/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/dtrace7/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/dtrace7/src/contrib/amd/NEWS#1 branch .. //depot/projects/dtrace7/src/contrib/amd/README#1 branch .. //depot/projects/dtrace7/src/contrib/amd/README.ldap#1 branch .. //depot/projects/dtrace7/src/contrib/amd/README.y2k#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/dtrace7/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/bootstrap#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/dtrace7/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/dtrace7/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/dtrace7/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/dtrace7/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/dtrace7/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/dtrace7/src/contrib/amd/tasks#1 branch .. //depot/projects/dtrace7/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/dtrace7/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/dtrace7/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/FAQ#1 branch .. //depot/projects/dtrace7/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/dtrace7/src/contrib/bc/INSTALL#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/NEWS#1 branch .. //depot/projects/dtrace7/src/contrib/bc/README#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/signum#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/dtrace7/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/config.h.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/configure#1 branch .. //depot/projects/dtrace7/src/contrib/bc/configure.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/dtrace7/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/dtrace7/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/dtrace7/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/dtrace7/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/dtrace7/src/contrib/bc/h/number.h#1 branch .. //depot/projects/dtrace7/src/contrib/bc/install-sh#1 branch .. //depot/projects/dtrace7/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/dtrace7/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bc/missing#1 branch .. //depot/projects/dtrace7/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/dtrace7/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/FAQ#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/README#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/README.idnkit#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/config.guess#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/config.sub#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/configure.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 15 11:46:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED1D116A41B; Thu, 15 Nov 2007 11:46:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B1F316A417 for ; Thu, 15 Nov 2007 11:46:25 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A52413C458 for ; Thu, 15 Nov 2007 11:46:25 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFBkMfN040952 for ; Thu, 15 Nov 2007 11:46:22 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFBkMmx040949 for perforce@freebsd.org; Thu, 15 Nov 2007 11:46:22 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 15 Nov 2007 11:46:22 GMT Message-Id: <200711151146.lAFBkMmx040949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 129083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 11:46:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=129083 Change 129083 by zhouzhouyi@zhouzhouyi_mactest on 2007/11/15 11:46:10 Modify the code style according to style(9), and modify the error handling style to make the code more mature Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#12 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_if.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#7 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#12 (text+ko) ==== @@ -82,6 +82,9 @@ SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0, "TrustedBSD mac_test policy controls"); +SYSCTL_PROC(_security_mac_test, OID_AUTO, pseudoinit, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + mac_test_init_if, "I", "set to setup the pseudo interfaces for MAC test"); + #define MAGIC_BPF 0xfe1ad1b6 #define MAGIC_DEVFS 0x9ee79c32 #define MAGIC_IFNET 0xc218b120 @@ -2725,9 +2728,15 @@ { LOG_DECL - LABEL_CHECK(cred->cr_label, MAGIC_CRED); - LABEL_CHECK(vplabel, MAGIC_VNODE); - COUNTER_INC(vnode_check_setextattr); + if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM && !strcmp(name, "mac_test") + && uio->uio_iov->iov_len && !strncmp(uio->uio_iov->iov_base, "mac_test", 8)) + LABEL_INIT(vplabel, MAGIC_MACTESTLOG); + else { + LABEL_CHECK(cred->cr_label, MAGIC_CRED); + LABEL_CHECK(vplabel, MAGIC_VNODE); + COUNTER_INC(vnode_check_setextattr); + } + return (0); } ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_if.c#4 (text+ko) ==== @@ -28,8 +28,7 @@ /* * Developed by the TrustedBSD Project. - * Generic mandatory access module that does nothing. - * Generate a pair of pseudo ethernet nodes + * Generate a pair of pseudo ethernet nodes for test */ /* @@ -79,6 +78,7 @@ #include #include #include "mac_test_private.h" + #ifdef KDB #define DEBUGGER(x) kdb_enter(x) #else @@ -101,7 +101,7 @@ ifp0->if_input(ifp0, mbuf); } } - + static void pseudoread1 (void *arg) { @@ -135,17 +135,13 @@ IFQ_DRV_DEQUEUE(&ifp->if_snd, mbuf); if (mbuf == NULL) break; -/* mbuf = m_defrag(m, M_DONTWAIT); - if (mbuf == NULL){ - m_freem(m); - return; - }*/ + eh = mtod(mbuf, struct ether_header *); - /* (void)memcpy(eaddrdst, eh->ether_dhost, sizeof(eaddrdst)); - (void)memcpy(eaddrsrc, eh->ether_shost, sizeof(eaddrsrc));*/ + ether_type = ntohs(eh->ether_type); ether_typesave = eh->ether_type; m_adj(mbuf, ETHER_HDR_LEN); + switch (ether_type) { case ETHERTYPE_IP: ip = mtod(mbuf, struct ip *); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#6 (text+ko) ==== @@ -60,10 +60,8 @@ #include #include #include - +#include -#include -#define MAC_TEST_LOG_FILENAME "mactest" char *elements="?biba,?lomac,?mls,?sebsd"; static struct cdev *mac_test_log_dev; @@ -83,6 +81,8 @@ static TAILQ_HEAD(, mac_test_log_entry) mac_test_log_list; +static struct proc *mac_test_thread; + static struct vnode *logvnode = 0; @@ -95,7 +95,9 @@ int flags, vfslocked; struct mount *mp; struct vattr vat; - + struct uio auio; + struct iovec aiov; + /* Only one process may open the device at a time. */ mtx_lock(&mac_test_log_mtx); if (!mac_test_log_isopen) { @@ -105,32 +107,57 @@ error = EBUSY; mtx_unlock(&mac_test_log_mtx); + if (error) + goto out; + +/* copy from kern/vfs_extattr.c */ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_SYSSPACE, "/var/log/mactest", curthread); flags = O_CREAT|O_TRUNC|FWRITE; error = vn_open(&nd, &flags, S_IRUSR| S_IWUSR, NULL); + if (error) + goto out; + vfslocked = NDHASGIANT(&nd); logvnode = nd.ni_vp; VOP_UNLOCK(logvnode, 0, curthread); - /*truncate it to zero*/ - vn_start_write(logvnode, &mp, V_WAIT | PCATCH); + + if ((error = vn_start_write(logvnode, &mp, V_WAIT))) + goto bad; + VOP_LEASE(logvnode, curthread, curthread->td_ucred, LEASE_WRITE); VATTR_NULL(&vat); vat.va_size = 0; vn_lock(logvnode, LK_EXCLUSIVE | LK_RETRY, curthread); - VOP_SETATTR(logvnode, &vat, curthread->td_ucred, curthread); + /*do truncate */ + error = VOP_SETATTR(logvnode, &vat, curthread->td_ucred, curthread); + + + /*set the external attribute */ + aiov.iov_base = "mac_test"; + aiov.iov_len = strlen("mac_test"); + auio.uio_iov = &aiov; + auio.uio_iovcnt = 1; + auio.uio_offset = 0; + auio.uio_resid = strlen("mac_test"); + auio.uio_rw = UIO_WRITE; + auio.uio_segflg = UIO_SYSSPACE; + auio.uio_td = curthread; + + mac_vnode_check_setextattr(curthread->td_ucred, logvnode, + EXTATTR_NAMESPACE_SYSTEM, "mac_test", &auio); + error = VOP_SETEXTATTR(logvnode, EXTATTR_NAMESPACE_SYSTEM, + "mac_test", &auio, curthread->td_ucred, curthread); VOP_UNLOCK(logvnode, 0, curthread); vn_finished_write(mp); - extattr_set_vp1(logvnode, EXTATTR_NAMESPACE_SYSTEM, "mac_test", - "mac_test", strlen("mac_test"), curthread); - +bad: NDFREE(&nd, NDF_ONLY_PNBUF); - VFS_UNLOCK_GIANT(vfslocked); - + VFS_UNLOCK_GIANT(vfslocked); +out: return (error); } @@ -148,9 +175,9 @@ continue; } mtx_unlock(&mac_test_wait_close); - vn_close(logvnode, O_CREAT|O_TRUNC|FWRITE, curthread->td_ucred, + return vn_close(logvnode, O_CREAT|O_TRUNC|FWRITE, curthread->td_ucred, curthread); - return (0); + } static int @@ -176,9 +203,18 @@ if (!mac_test_can_log) return; + + mte = malloc(sizeof(*mte), M_MAC_TEST_LOG, M_NOWAIT | M_ZERO); + if (NULL == mte) { + return; + } - mte = malloc(sizeof(*mte), M_MAC_TEST_LOG, M_NOWAIT | M_ZERO); mte->mte_record = malloc(record_len, M_MAC_TEST_LOG, M_NOWAIT); + if (NULL == mte->mte_record) { + free(mte, M_MAC_TEST_LOG); + return; + } + bcopy(record, mte->mte_record, record_len); mte->mte_record_len = record_len; mtx_lock(&mac_test_submit_mtx); @@ -225,7 +261,6 @@ } } -static struct proc *mac_test_thread; static void mac_test_log_cdev_init(void *unused) { ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#7 (text+ko) ==== @@ -39,8 +39,11 @@ #include #include +#define MAC_TEST_LOG_FILENAME "mactest" + void mac_test_log_submit(void *record, u_int record_len); + int mac_test_init_if(SYSCTL_HANDLER_ARGS); @@ -61,276 +64,5 @@ static MALLOC_DEFINE(M_MAC_TEST_LOG, "mac_test_log", "mac test logs"); -#define MAC_TEST_LOG_SUBMIT_WITHPID(string,length) do { \ - char *buffer; \ - char *charpoint; \ - struct thread *td = curthread; \ - buffer = malloc(1024, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!buffer) \ - goto exit6; \ - sprintf(buffer,"pid = %d ", td->td_proc->p_pid); \ - charpoint = buffer + strlen(buffer); \ - strcpy(charpoint, string); \ - charpoint += strlen(charpoint); - - -#define MAC_TEST_LOG_DO_SUBMIT \ - mac_test_log_submit(buffer, strlen(buffer)); \ - free(buffer, M_MAC_TEST_LOG); \ -exit6: \ - ; \ -}while(0) - -#define MAC_TEST_LOG_SUBMIT_LABEL(type,label) { \ - int error; \ - int strleng = 0; \ - char *buffer1; \ - char *elements1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!elements1) \ - goto exit1; \ - strcpy(elements1, elements); \ - buffer1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!buffer1) \ - goto exit; \ - if (!label) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type,label, elements1, buffer1, 256); \ - strleng = strlen(buffer1); \ - *(buffer1 + strleng) = '\n'; \ - *(buffer1 + strleng + 1) = 0; \ - strcpy(charpoint, buffer1); \ - mac_test_log_submit(buffer, strlen(buffer)); \ - free(buffer1, M_MAC_TEST_LOG); \ -exit: \ - free(elements1, M_MAC_TEST_LOG); \ -exit1: \ - free(buffer, M_MAC_TEST_LOG); \ -exit6: \ - ;/*extra ; to avoid label at the end of compound statement*/ \ -}}while(0) - -#define MAC_TEST_LOG_SUBMIT_LABEL2(type,label,type1,label1) { \ - int error; \ - char *buffer1; \ - int strleng = 0; \ - char *elements1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!elements1) \ - goto exit3; \ - strcpy(elements1, elements); \ - buffer1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!buffer1) \ - goto exit2; \ - if (!label) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type,label, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label1) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type1,label1, elements1, buffer1, 256); \ - strleng = strlen(buffer1); \ - *(buffer1 + strleng) = '\n'; \ - *(buffer1 + strleng + 1) = 0; \ - strcpy(charpoint, buffer1); \ - mac_test_log_submit(buffer, strlen(buffer)); \ - free(buffer1, M_MAC_TEST_LOG); \ -exit2: \ - free(elements1, M_MAC_TEST_LOG); \ -exit3: \ - free(buffer, M_MAC_TEST_LOG); \ -exit6: \ - ;/*extra ; to avoid label at the end of compound statement*/ \ -}}while(0) - -#define MAC_TEST_LOG_SUBMIT_LABEL3(type,label,type1,label1,type2,label2) { \ - int error; \ - int strleng = 0; \ - char *buffer1; \ - char *elements1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!elements1) \ - goto exit5; \ - strcpy(elements1, elements); \ - buffer1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!buffer1) \ - goto exit4; \ - if (!label) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type,label, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label1) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type1,label1, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label2) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type2,label2, elements1, buffer1, 256); \ - strleng = strlen(buffer1); \ - *(buffer1 + strleng) = '\n'; \ - *(buffer1 + strleng + 1) = 0; \ - strcpy(charpoint, buffer1); \ - mac_test_log_submit(buffer, strlen(buffer)); \ - free(buffer1, M_MAC_TEST_LOG); \ -exit4: \ - free(elements1, M_MAC_TEST_LOG); \ -exit5: \ - free(buffer, M_MAC_TEST_LOG); \ -exit6: \ - ;/*extra ; to avoid label at the end of compound statement*/ \ -}}while(0) - - -#define MAC_TEST_LOG_SUBMIT_LABEL4(type,label,type1,label1,type2,label2,\ - type3,label3) \ - { \ - int error; \ - int strleng = 0; \ - char *buffer1; \ - char *elements1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!elements1) \ - goto exit8; \ - strcpy(elements1, elements); \ - buffer1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!buffer1) \ - goto exit7; \ - if (!label) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type,label, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label1) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type1,label1, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label2) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type2,label2, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label3) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type3,label3, elements1, buffer1, 256); \ - strleng = strlen(buffer1); \ - *(buffer1 + strleng) = '\n'; \ - *(buffer1 + strleng + 1) = 0; \ - strcpy(charpoint, buffer1); \ - mac_test_log_submit(buffer, strlen(buffer)); \ - free(buffer1, M_MAC_TEST_LOG); \ -exit7: \ - free(elements1, M_MAC_TEST_LOG); \ -exit8: \ - free(buffer, M_MAC_TEST_LOG); \ -exit6: \ - ;/*extra ; to avoid label at the end of compound statement*/ \ -}}while(0) - - -#define MAC_TEST_LOG_SUBMIT_LABEL5(type,label,type1,label1,type2,label2,\ - type3,label3, type4, label4) \ - { \ - int error; \ - int strleng = 0; \ - char *buffer1; \ - char *elements1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!elements1) \ - goto exit10; \ - strcpy(elements1, elements); \ - buffer1 = malloc(256, M_MAC_TEST_LOG, M_NOWAIT); \ - if (!buffer1) \ - goto exit9; \ - if (!label) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type,label, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label1) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type1,label1, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label2) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type2,label2, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label3) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type3,label3, elements1, buffer1, 256); \ - sprintf(charpoint, "%s ", buffer1); \ - charpoint += strlen(charpoint); \ - strcpy(elements1, elements); \ - if (!label4) \ - strcpy(buffer1,"NULL"); \ - else \ - MAC_EXTERNALIZE(type4,label4, elements1, buffer1, 256); \ - strleng = strlen(buffer1); \ - *(buffer1 + strleng) = '\n'; \ - *(buffer1 + strleng + 1) = 0; \ - strcpy(charpoint, buffer1); \ - mac_test_log_submit(buffer, strlen(buffer)); \ - free(buffer1, M_MAC_TEST_LOG); \ -exit9: \ - free(elements1, M_MAC_TEST_LOG); \ -exit10: \ - free(buffer, M_MAC_TEST_LOG); \ -exit6: \ - ;/*extra ; to avoid label at the end of compound statement*/ \ -}}while(0) - -#define extattr_set_vp1(vp, attrnamespace, attrname, data, nbytes, td)do\ -{ \ - struct mount *mp; \ - struct uio auio; \ - struct iovec aiov; \ - ssize_t count; \ - int error; \ - VFS_ASSERT_GIANT(vp->v_mount); \ - error = vn_start_write(vp, &mp, V_WAIT | PCATCH); \ - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); \ - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); \ - aiov.iov_base = data; \ - aiov.iov_len = nbytes; \ - auio.uio_iov = &aiov; \ - auio.uio_iovcnt = 1; \ - auio.uio_offset = 0; \ - auio.uio_resid = nbytes; \ - auio.uio_rw = UIO_WRITE; \ - auio.uio_segflg = UIO_SYSSPACE; \ - auio.uio_td = td; \ - count = nbytes; \ - mac_vnode_check_setextattr(td->td_ucred, vp, attrnamespace, \ - attrname, &auio); \ - error = VOP_SETEXTATTR(vp, attrnamespace, attrname, &auio, \ - td->td_ucred, td); \ - count -= auio.uio_resid; \ - td->td_retval[0] = count; \ - VOP_UNLOCK(vp, 0, td); \ - vn_finished_write(mp); \ -}while(0) #endif /* ! _SECURITY_MAC_TEST_PRIVATE_H */ From owner-p4-projects@FreeBSD.ORG Thu Nov 15 21:42:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E34D716A421; Thu, 15 Nov 2007 21:42:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8922616A41B for ; Thu, 15 Nov 2007 21:42:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77E3113C459 for ; Thu, 15 Nov 2007 21:42:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFLg6Lp017555 for ; Thu, 15 Nov 2007 21:42:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFLg6mx017552 for perforce@freebsd.org; Thu, 15 Nov 2007 21:42:06 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 21:42:06 GMT Message-Id: <200711152142.lAFLg6mx017552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 21:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=129098 Change 129098 by jb@jb_freebsd1 on 2007/11/15 21:41:47 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.d#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#7 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c#3 (text+ko) ==== @@ -20,20 +20,21 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include +#include +#include /*ARGSUSED*/ int main(int argc, char **argv) { for (;;) { - (void) mmap(NULL, 1, 2, 3, -1, 0x12345678); + (void) syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678); } return (0); ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.d#3 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,5 +42,5 @@ tick-1s /i++ == 3/ { - exit(0); + exit(1); } ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#7 (text) ==== @@ -212,6 +212,8 @@ static char *tmpname = NULL; static int dynsym; int debug_level = DEBUG_LEVEL; +static size_t maxpgsize = 0x400000; + void usage(void) @@ -235,7 +237,7 @@ bigheap(void) { size_t big, *size; - int sizes, i; + int sizes; struct memcntl_mha mha; /* @@ -244,12 +246,16 @@ if ((sizes = getpagesizes(NULL, 0)) == -1) return; - if ((size = alloca(sizeof (size_t) * sizes)) == NULL) + if (sizes == 1 || (size = alloca(sizeof (size_t) * sizes)) == NULL) return; - if (getpagesizes(size, sizes) == -1 || sizes == 1) + if (getpagesizes(size, sizes) == -1) return; + while (size[sizes - 1] > maxpgsize) + sizes--; + + /* set big to the largest allowed page size */ big = size[sizes - 1]; if (big & (big - 1)) { /* @@ -266,21 +272,13 @@ return; /* - * Finally, set our heap to use the largest page size for which the - * MC_HAT_ADVISE doesn't return EAGAIN. + * set the preferred page size for the heap */ mha.mha_cmd = MHA_MAPSIZE_BSSBRK; mha.mha_flags = 0; + mha.mha_pagesize = big; - for (i = sizes - 1; i >= 0; i--) { - mha.mha_pagesize = size[i]; - - if (memcntl(NULL, 0, MC_HAT_ADVISE, (caddr_t)&mha, 0, 0) != -1) - break; - - if (errno != EAGAIN) - break; - } + (void) memcntl(NULL, 0, MC_HAT_ADVISE, (caddr_t)&mha, 0, 0); } #endif From owner-p4-projects@FreeBSD.ORG Thu Nov 15 21:48:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F4B016A421; Thu, 15 Nov 2007 21:48:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FC7B16A41B for ; Thu, 15 Nov 2007 21:48:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F207313C457 for ; Thu, 15 Nov 2007 21:48:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFLmDSC017839 for ; Thu, 15 Nov 2007 21:48:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFLmDQS017836 for perforce@freebsd.org; Thu, 15 Nov 2007 21:48:13 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 21:48:13 GMT Message-Id: <200711152148.lAFLmDQS017836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 21:48:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=129100 Change 129100 by jb@jb_freebsd1 on 2007/11/15 21:48:03 IFC Affected files ... .. //depot/projects/dtrace/src/contrib/gdb/gdb/i386fbsd-nat.c#4 integrate .. //depot/projects/dtrace/src/etc/etc.amd64/ttys#5 integrate .. //depot/projects/dtrace/src/etc/etc.arm/ttys#5 integrate .. //depot/projects/dtrace/src/etc/etc.i386/ttys#5 integrate .. //depot/projects/dtrace/src/etc/etc.ia64/ttys#5 integrate .. //depot/projects/dtrace/src/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/dtrace/src/etc/etc.sparc64/ttys#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/hostapd#4 integrate .. //depot/projects/dtrace/src/release/picobsd/bridge/PICOBSD#5 integrate .. //depot/projects/dtrace/src/release/picobsd/bridge/crunch.conf#5 integrate .. //depot/projects/dtrace/src/release/picobsd/build/Makefile.conf#4 integrate .. //depot/projects/dtrace/src/release/picobsd/build/picobsd#5 integrate .. //depot/projects/dtrace/src/release/picobsd/tinyware/login/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/dtrace/src/share/man/man4/wpi.4#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#15 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/trap.c#10 integrate .. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.h#8 integrate .. //depot/projects/dtrace/src/sys/i386/bios/apm.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#19 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/trap.c#11 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_clock.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/kern_kse.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sx.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/subr_pcpu.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/subr_trap.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#8 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#18 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/trap.c#9 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/vm_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#20 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vm_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/sys/eventhandler.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#26 integrate .. //depot/projects/dtrace/src/usr.bin/lsvfs/lsvfs.c#5 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#13 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/gdb/gdb/i386fbsd-nat.c#4 (text+ko) ==== @@ -91,7 +91,7 @@ #ifdef KERN_PS_STRINGS { int mib[2]; - int ps_strings; + u_long ps_strings; size_t len; mib[0] = CTL_KERN; ==== //depot/projects/dtrace/src/etc/etc.amd64/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.12 2007/11/15 16:22:58 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/dtrace/src/etc/etc.arm/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.4 2007/08/12 17:13:06 cognet Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.5 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/dtrace/src/etc/etc.i386/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.12 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/dtrace/src/etc/etc.ia64/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.ia64/ttys,v 1.6 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.ia64/ttys,v 1.7 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 15 21:52:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88B8516A420; Thu, 15 Nov 2007 21:52:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DD0816A41B for ; Thu, 15 Nov 2007 21:52:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF30E13C44B for ; Thu, 15 Nov 2007 21:52:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFLqMUZ018026 for ; Thu, 15 Nov 2007 21:52:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFLqId9018022 for perforce@freebsd.org; Thu, 15 Nov 2007 21:52:18 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 21:52:18 GMT Message-Id: <200711152152.lAFLqId9018022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 21:52:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=129101 Change 129101 by jb@jb_freebsd1 on 2007/11/15 21:52:00 IF6 Affected files ... .. //depot/projects/dtrace6/src/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/README#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/configure#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_warn#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/dtrace6/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/dtrace6/src/etc/defaults/devfs.rules#2 integrate .. //depot/projects/dtrace6/src/etc/freebsd-update.conf#2 integrate .. //depot/projects/dtrace6/src/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/dtrace6/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/dtrace6/src/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/dtrace6/src/sys/bsm/audit.h#2 integrate .. //depot/projects/dtrace6/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/dtrace6/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/dtrace6/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/menus.c#3 integrate Differences ... ==== //depot/projects/dtrace6/src/contrib/openbsm/HISTORY#2 (text) ==== @@ -1,3 +1,41 @@ +OpenBSM 1.0 + +- Fix bug in auditreduce(8) which resulted in a memory fault/crash when + the user specified an event name with -m. +- Remove AU_.* hard-coded audit class constants, as udit classes are now + entirely dynamically configured using /etc/security/audit_class. + +OpenBSM 1.0 alpha 15 + +- Fix bug when processing in_addr_ex tokens. +- Restore the behavior of printing the string/text specified while + auditing arg32 tokens. +- Synchronized audit event list to Solaris, picking up the *at(2) system call + definitions, now required for FreeBSD and Linux. Added additional events + for *at(2) system calls not present in Solaris. +- Bugs in auditreduce(8) fixed allowing partial date strings to be used in + filtering events. + +OpenBSM 1.0 alpha 14 + +- Fix endian issues when processing IPv6 addresses for extended subject + and process tokens. +- gcc41 warnings clean. +- Teach audit_submit(3) about getaudit_addr(2). +- Add support for zonename tokens. + +OpenBSM 1.0 alpha 13 + +- compat/clock_gettime.h now provides a compatibility implementation of + clock_gettime(), which fixes building on Mac OS X. +- Countless man page improvements, markup fixes, content fixs, etc. +- XML printing support via "praudit -x". +- audit.log.5 expanded to include additional BSM token types. +- Added encoding and decoding routines for process64_ex, process32_ex, + subject32_ex, header64, and attr64 tokens. +- Additional audit event identifiers for listen, mlockall/munlockall, + getpath, POSIX message queues, and mandatory access control. + OpenBSM 1.0 alpha 12 - Correct bug in auditreduce which prevented the -c option from working @@ -264,4 +302,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#39 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#57 $ ==== //depot/projects/dtrace6/src/contrib/openbsm/Makefile.in#2 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,17 +15,13 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#5 $ # -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,18 +35,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ $(top_srcdir)/configure TODO config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/ltmain.sh config/missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = @@ -58,10 +54,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -77,8 +76,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -105,8 +102,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ -HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -118,9 +115,8 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -130,20 +126,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -155,28 +149,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = \ bsm \ libbsm \ @@ -231,7 +236,7 @@ config/config.h: config/stamp-h1 @if test ! -f $@; then \ rm -f config/stamp-h1; \ - $(MAKE) config/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ else :; fi config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @@ -253,7 +258,6 @@ distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -286,8 +290,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -389,24 +392,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/config - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -420,7 +421,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -428,6 +429,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -435,7 +438,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -510,7 +513,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -580,12 +583,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -606,24 +617,26 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ==== //depot/projects/dtrace6/src/contrib/openbsm/README#2 (text) ==== @@ -3,11 +3,13 @@ Introduction OpenBSM provides an open source implementation of Sun's BSM Audit API. -Originally created under contract to Apple Computer by McAfee Research, -this implementation is now maintained by volunteers and the generous -contribution of several organizations. Coupled with a kernel audit -implementation, OpenBSM can be used to maintain system audit streams, and -is a foundation for an Audit-enabled system. +Originally created under contract to Apple Computer by McAfee Research, this +implementation is now maintained by volunteers and the generous contribution +of several organizations. Coupled with a kernel audit implementation, +OpenBSM can be used to maintain system audit streams, and is a foundation for +an Audit-enabled system. Portions of OpenBSM, including include files and +token-building routines, are reusable in a kernel audit implementation, and +may be found in the FreeBSD and Mac OS X kernels. Contents @@ -15,13 +17,22 @@ bin/ Audit-related command line tools bsm/ System include files for BSM + compat/ Compatibility code to build on various OS's etc/ Sample /etc/security configuration files libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages + modules/ Directory for auditfilterd module source + test/ Test token sets and geneneration program + tools/ Tool directory, including audump to dump databases -OpenBSM currently builds on FreeBSD and Darwin. With Makefile adjustment -and minor tweaks, it should build without problems on a broad range of -POSIX-like systems. +The following programs are included with OpenBSM: + + audit Command line audit control tool + auditd Audit management daemon + auditfilterd Experimental event monitoring framework + auditreduce Audit trail reduction tool + audump Debugging tool to parse and print audit databases + praudit Tool to print audit trails Building @@ -29,7 +40,7 @@ for building on a range of operating systems, including FreeBSD, Mac OS X, and Linux. Depending on the availability of audit facilities in the underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using +support are built conditionally. Typically, build will be performed using: ./configure make @@ -51,13 +62,12 @@ You will need to manually propagate openbsm/etc/* into /etc on your system; this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not -configurable. +configuration. Currently, the locations of these files is not configurable. Credits -The following organizations and individuals have contributed substantially -to the development of OpenBSM: +The following organizations and individuals have contributed substantially to +the development of OpenBSM: Apple Computer, Inc. McAfee Research, McAfee, Inc. @@ -76,6 +86,10 @@ Martin Fong Pawel Worach Martin Englund + Ruslan Ermilov + Martin Voros + Diego Giagio + Alex Samorukov In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -97,4 +111,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#19 $ +$P4: //depot/projects/trustedbsd/openbsm/README#24 $ ==== //depot/projects/dtrace6/src/contrib/openbsm/TODO#2 (text) ==== @@ -1,4 +1,3 @@ -- Teach praudit how to general XML format BSM streams. - Teach libbsm about any additional 64-bit token types that are present in more recent Solaris versions. - Build a regression test suite for libbsm that generates each token @@ -20,4 +19,4 @@ - Put hostname in trail file name. - Document audit_warn event arguments. -$P4: //depot/projects/trustedbsd/openbsm/TODO#8 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#9 $ ==== //depot/projects/dtrace6/src/contrib/openbsm/VERSION#2 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_12 +OPENBSM_1_0 ==== //depot/projects/dtrace6/src/contrib/openbsm/aclocal.m4#2 (text) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL +# serial 51 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -163,6 +168,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -175,17 +181,17 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -233,6 +239,9 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER @@ -259,9 +268,10 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -272,9 +282,10 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE @@ -289,12 +300,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -525,13 +544,17 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -548,6 +571,9 @@ ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -580,6 +606,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -603,7 +645,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -622,9 +664,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -644,19 +686,20 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi @@ -731,6 +774,12 @@ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -744,25 +793,39 @@ esac fi ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -775,7 +838,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -783,7 +846,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -849,6 +912,8 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] @@ -859,7 +924,7 @@ case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -871,7 +936,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -942,7 +1007,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -955,7 +1020,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -987,7 +1052,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -995,7 +1061,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 15 21:53:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A611816A419; Thu, 15 Nov 2007 21:53:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B02016A474 for ; Thu, 15 Nov 2007 21:53:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59A8A13C509 for ; Thu, 15 Nov 2007 21:53:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFLrOwP018068 for ; Thu, 15 Nov 2007 21:53:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFLrOkk018065 for perforce@freebsd.org; Thu, 15 Nov 2007 21:53:24 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 21:53:24 GMT Message-Id: <200711152153.lAFLrOkk018065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 21:53:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=129102 Change 129102 by jb@jb_freebsd1 on 2007/11/15 21:53:10 IF7 Affected files ... .. //depot/projects/dtrace7/src/bin/ps/ps.c#2 integrate .. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/dtrace7/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/ata.h#2 integrate .. //depot/projects/dtrace7/src/usr.bin/locate/locate/updatedb.sh#2 integrate .. //depot/projects/dtrace7/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#2 integrate Differences ... ==== //depot/projects/dtrace7/src/bin/ps/ps.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111.2.1 2007/11/15 15:56:59 jhb Exp $"); #include #include @@ -74,6 +74,8 @@ #include "ps.h" +#define _PATH_PTS "/dev/pts/" + #define W_SEP " \t" /* "Whitespace" list separators */ #define T_SEP "," /* "Terminate-element" list separators */ @@ -705,9 +707,9 @@ /*- * The user can specify a device via one of three formats: - * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console - * 2) missing "/dev", e.g.: ttyp0 console - * 3) two-letters, e.g.: p0 co + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0 + * 2) missing "/dev", e.g.: ttyp0 console pts/0 + * 3) two-letters, e.g.: p0 co 0 * (matching letters that would be seen in the "TT" column) */ static int @@ -715,10 +717,11 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX]; ttypath = NULL; pathbuf2[0] = '\0'; + pathbuf3[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -735,6 +738,8 @@ ttypath = pathbuf; if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; + if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0) + break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; /* Check to see if /dev/tty${elem} exists */ @@ -745,21 +750,30 @@ ttypath = NULL; break; } + /* Check to see if /dev/pts/${elem} exists */ + strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3)); + strlcat(pathbuf3, elem, sizeof(pathbuf3)); + if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - if (pathbuf2[0] != '\0') - warn("%s and %s", pathbuf2, ttypath); + if (pathbuf3[0] != '\0') + warn("%s, %s, and %s", pathbuf3, pathbuf2, + ttypath); else warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - if (pathbuf2[0] != '\0') - warnx("%s and %s: Not a terminal", pathbuf2, - ttypath); + if (pathbuf3[0] != '\0') + warnx("%s, %s, and %s: Not a terminal", + pathbuf3, pathbuf2, ttypath); else warnx("%s: Not a terminal", ttypath); optfatal = 1; ==== //depot/projects/dtrace7/src/sys/cam/scsi/scsi_all.h#2 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28 2006/12/04 23:04:13 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28.2.1 2007/11/15 16:27:59 scottl Exp $ */ /* @@ -170,8 +170,11 @@ #define SMS_PAGE_CODE 0x3F #define SMS_VENDOR_SPECIFIC_PAGE 0x00 #define SMS_DISCONNECT_RECONNECT_PAGE 0x02 +#define SMS_CACHE_PAGE 0x08 #define SMS_PERIPHERAL_DEVICE_PAGE 0x09 #define SMS_CONTROL_MODE_PAGE 0x0A +#define SMS_PROTO_SPECIFIC_PAGE 0x19 +#define SMS_INFO_EXCEPTIONS_PAGE 0x1C #define SMS_ALL_PAGES_PAGE 0x3F #define SMS_PAGE_CTRL_MASK 0xC0 #define SMS_PAGE_CTRL_CURRENT 0x00 @@ -257,6 +260,8 @@ #define SLS_ERROR_VERIFY_PAGE 0x05 #define SLS_ERROR_NONMEDIUM_PAGE 0x06 #define SLS_ERROR_LASTN_PAGE 0x07 +#define SLS_SELF_TEST_PAGE 0x10 +#define SLS_IE_PAGE 0x2f #define SLS_PAGE_CTRL_MASK 0xC0 #define SLS_PAGE_CTRL_THRESHOLD 0x00 #define SLS_PAGE_CTRL_CUMULATIVE 0x40 @@ -329,6 +334,55 @@ u_int8_t aen_holdoff_period[2]; }; +struct scsi_cache_page { + u_int8_t page_code; +#define SCHP_PAGE_SAVABLE 0x80 /* Page is savable */ + u_int8_t page_length; + u_int8_t cache_flags; +#define SCHP_FLAGS_WCE 0x04 /* Write Cache Enable */ +#define SCHP_FLAGS_MF 0x02 /* Multiplication factor */ +#define SCHP_FLAGS_RCD 0x01 /* Read Cache Disable */ + u_int8_t rw_cache_policy; + u_int8_t dis_prefetch[2]; + u_int8_t min_prefetch[2]; + u_int8_t max_prefetch[2]; + u_int8_t max_prefetch_ceil[2]; +}; + +struct scsi_info_exceptions_page { + u_int8_t page_code; +#define SIEP_PAGE_SAVABLE 0x80 /* Page is savable */ + u_int8_t page_length; + u_int8_t info_flags; +#define SIEP_FLAGS_PERF 0x80 +#define SIEP_FLAGS_EBF 0x20 +#define SIEP_FLAGS_EWASC 0x10 +#define SIEP_FLAGS_DEXCPT 0x08 +#define SIEP_FLAGS_TEST 0x04 +#define SIEP_FLAGS_EBACKERR 0x02 +#define SIEP_FLAGS_LOGERR 0x01 + u_int8_t mrie; + u_int8_t interval_timer[4]; + u_int8_t report_count[4]; +}; + +struct scsi_proto_specific_page { + u_int8_t page_code; +#define SPSP_PAGE_SAVABLE 0x80 /* Page is savable */ + u_int8_t page_length; + u_int8_t protocol; +#define SPSP_PROTO_FC 0x00 +#define SPSP_PROTO_SPI 0x01 +#define SPSP_PROTO_SSA 0x02 +#define SPSP_PROTO_1394 0x03 +#define SPSP_PROTO_RDMA 0x04 +#define SPSP_PROTO_ISCSI 0x05 +#define SPSP_PROTO_SAS 0x06 +#define SPSP_PROTO_ADT 0x07 +#define SPSP_PROTO_ATA 0x08 +#define SPSP_PROTO_NONE 0x0f +}; + struct scsi_reserve { u_int8_t opcode; @@ -468,6 +522,47 @@ u_int8_t control; }; +struct ata_pass_12 { + u_int8_t opcode; + u_int8_t protocol; +#define AP_MULTI 0xe0 + u_int8_t flags; +#define AP_T_LEN 0x03 +#define AP_BB 0x04 +#define AP_T_DIR 0x08 +#define AP_CK_COND 0x20 +#define AP_OFFLINE 0x60 + u_int8_t features; + u_int8_t sector_count; + u_int8_t lba_low; + u_int8_t lba_mid; + u_int8_t lba_high; + u_int8_t device; + u_int8_t command; + u_int8_t reserved; + u_int8_t control; +}; + +struct ata_pass_16 { + u_int8_t opcode; + u_int8_t protocol; +#define AP_EXTEND 0x01 + u_int8_t flags; + u_int8_t features_ext; + u_int8_t features; + u_int8_t sector_count_ext; + u_int8_t sector_count; + u_int8_t lba_low_ext; + u_int8_t lba_low; + u_int8_t lba_mid_ext; + u_int8_t lba_mid; + u_int8_t lba_high_ext; + u_int8_t lba_high; + u_int8_t device; + u_int8_t command; + u_int8_t control; +}; + #define SC_SCSI_1 0x01 #define SC_SCSI_2 0x03 @@ -494,6 +589,7 @@ #define WRITE_10 0x2a #define POSITION_TO_ELEMENT 0x2b #define SYNCHRONIZE_CACHE 0x35 +#define READ_DEFECT_DATA_10 0x37 #define WRITE_BUFFER 0x3b #define READ_BUFFER 0x3c #define CHANGE_DEFINITION 0x40 @@ -501,10 +597,12 @@ #define LOG_SENSE 0x4d #define MODE_SELECT_10 0x55 #define MODE_SENSE_10 0x5A +#define ATA_PASS_16 0x85 #define READ_16 0x88 #define WRITE_16 0x8a #define SERVICE_ACTION_IN 0x9e #define REPORT_LUNS 0xA0 +#define ATA_PASS_12 0xa1 #define MOVE_MEDIUM 0xa5 #define READ_12 0xa8 #define WRITE_12 0xaa @@ -663,6 +761,17 @@ u_int8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE]; }; +struct scsi_vpd_supported_page_list +{ + u_int8_t device; + u_int8_t page_code; +#define SVPD_SUPPORTED_PAGE_LIST 0x00 + u_int8_t reserved; + u_int8_t length; /* number of VPD entries */ +#define SVPD_SUPPORTED_PAGES_SIZE 251 + u_int8_t list[SVPD_SUPPORTED_PAGES_SIZE]; +}; + struct scsi_vpd_unit_serial_number { u_int8_t device; ==== //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138 2007/04/07 19:40:58 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138.2.1 2007/11/15 10:38:06 kib Exp $"); #include #include @@ -2323,6 +2323,7 @@ case LINUX_SIOCGIFCONF: case LINUX_SIOCGPGRP: case LINUX_SIOCSPGRP: + case LINUX_SIOCGIFCOUNT: /* these ioctls don't take an interface name */ #ifdef DEBUG printf("%s(): ioctl %d\n", __func__, @@ -2344,6 +2345,7 @@ case LINUX_SIOCSIFHWADDR: case LINUX_SIOCDEVPRIVATE: case LINUX_SIOCDEVPRIVATE+1: + case LINUX_SIOCGIFINDEX: /* copy in the interface name and translate it. */ error = copyin((void *)args->arg, lifname, LINUX_IFNAMSIZ); if (error != 0) @@ -2478,6 +2480,15 @@ error = ioctl(td, (struct ioctl_args *)args); break; + case LINUX_SIOCGIFINDEX: + args->cmd = SIOCGIFINDEX; + error = ioctl(td, (struct ioctl_args *)args); + break; + + case LINUX_SIOCGIFCOUNT: + error = 0; + break; + /* * XXX This is slightly bogus, but these ioctls are currently * XXX only used by the aironet (if_an) network driver. ==== //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26 2007/04/10 21:37:37 scottl Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26.2.1 2007/11/15 10:38:06 kib Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -230,9 +230,12 @@ #define LINUX_SIOCGIFHWADDR 0x8927 #define LINUX_SIOCADDMULTI 0x8931 #define LINUX_SIOCDELMULTI 0x8932 +#define LINUX_SIOCGIFINDEX 0x8933 +#define LINUX_SIOGIFINDEX LINUX_SIOCGIFINDEX +#define LINUX_SIOCGIFCOUNT 0x8938 #define LINUX_IOCTL_SOCKET_MIN LINUX_FIOSETOWN -#define LINUX_IOCTL_SOCKET_MAX LINUX_SIOCDELMULTI +#define LINUX_IOCTL_SOCKET_MAX LINUX_SIOCGIFCOUNT /* * Device private ioctl calls ==== //depot/projects/dtrace7/src/sys/conf/newvers.sh#2 (text+ko) ==== @@ -28,11 +28,11 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.72.2.3 2007/11/02 00:59:38 kensmith Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.72.2.4 2007/11/15 17:10:18 kensmith Exp $ TYPE="FreeBSD" REVISION="7.0" -BRANCH="BETA2" +BRANCH="BETA3" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi ==== //depot/projects/dtrace7/src/sys/dev/re/if_re.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95 2007/08/14 02:00:04 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95.2.1 2007/11/15 17:45:46 remko Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -172,6 +172,8 @@ static struct rl_type re_devs[] = { { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169S, "D-Link DGE-528(T) Gigabit Ethernet Adapter" }, + { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169_8110SB, + "D-Link DGE-528(T) Rev.B1 Gigabit Ethernet Adapter" }, { RT_VENDORID, RT_DEVICEID_8139, RL_HWREV_8139CPLUS, "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E, ==== //depot/projects/dtrace7/src/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.53 2007/06/17 06:10:42 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.53.2.1 2007/11/15 16:59:29 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -811,7 +811,7 @@ u_int32_t data; struct tr_info *tr; struct ac97_info *codec = 0; - int i; + int i, dacn; char status[SND_STATUSLEN]; tr = malloc(sizeof(*tr), M_DEVBUF, M_WAITOK | M_ZERO); @@ -819,6 +819,25 @@ tr->rev = pci_get_revid(dev); tr->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_t4dwave softc"); + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "dac", &i) == 0) { + if (i < 1) + dacn = 1; + else if (i > TR_MAXPLAYCH) + dacn = TR_MAXPLAYCH; + else + dacn = i; + } else { + switch (tr->type) { + case ALI_PCI_ID: + dacn = 1; + break; + default: + dacn = TR_MAXPLAYCH; + break; + } + } + data = pci_read_config(dev, PCIR_COMMAND, 2); data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); pci_write_config(dev, PCIR_COMMAND, data, 2); @@ -871,9 +890,10 @@ snprintf(status, 64, "at io 0x%lx irq %ld %s", rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(snd_t4dwave)); - if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad; + if (pcm_register(dev, tr, dacn, 1)) + goto bad; pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr); - for (i = 0; i < TR_MAXPLAYCH; i++) + for (i = 0; i < dacn; i++) pcm_addchan(dev, PCMDIR_PLAY, &trpchan_class, tr); pcm_setstatus(dev, status); ==== //depot/projects/dtrace7/src/sys/kern/tty_pty.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.152 2007/07/03 17:45:52 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.152.2.1 2007/11/15 20:18:26 jhb Exp $"); /* * Pseudo-teletype Driver @@ -40,6 +40,7 @@ #include "opt_tty.h" #include #include +#include #include #include #include @@ -121,15 +122,12 @@ #define TSA_PTC_WRITE(tp) ((void *)&(tp)->t_rawq.c_cl) #define TSA_PTS_READ(tp) ((void *)&(tp)->t_canq) -static char *names = "pqrsPQRS"; +static const char names[] = "pqrsPQRS"; /* * This function creates and initializes a pts/ptc pair * * pts == /dev/tty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv] * ptc == /dev/pty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv] - * - * XXX: define and add mapping of upper minor bits to allow more - * than 256 ptys. */ static struct cdev * ptyinit(struct cdev *devc, struct thread *td) @@ -137,9 +135,10 @@ struct ptsc *pt; int n; - n = minor(devc); - /* For now we only map the lower 8 bits of the minor */ - if (n & ~0xff) + n = minor2unit(minor(devc)); + + /* We only allow for up to 32 ptys per char in "names". */ + if (n >= 32 * (sizeof(names) - 1)) return (NULL); devc->si_flags &= ~SI_CHEAPCLONE; @@ -760,32 +759,26 @@ pty_clone(void *arg, struct ucred *cr, char *name, int namelen, struct cdev **dev) { + char *cp; int u; if (*dev != NULL) return; if (bcmp(name, "pty", 3) != 0) return; - if (name[5] != '\0') + if (name[5] != '\0' || name[3] == '\0') + return; + cp = index(names, name[3]); + if (cp == NULL) return; - switch (name[3]) { - case 'p': u = 0; break; - case 'q': u = 32; break; - case 'r': u = 64; break; - case 's': u = 96; break; - case 'P': u = 128; break; - case 'Q': u = 160; break; - case 'R': u = 192; break; - case 'S': u = 224; break; - default: return; - } + u = (cp - names) * 32; if (name[4] >= '0' && name[4] <= '9') u += name[4] - '0'; else if (name[4] >= 'a' && name[4] <= 'v') u += name[4] - 'a' + 10; else return; - *dev = make_dev_credf(MAKEDEV_REF, &ptc_cdevsw, u, cr, + *dev = make_dev_credf(MAKEDEV_REF, &ptc_cdevsw, unit2minor(u), cr, UID_ROOT, GID_WHEEL, 0666, "pty%c%r", names[u / 32], u % 32); (*dev)->si_flags |= SI_CHEAPCLONE; return; ==== //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.45.2.1 2007/10/25 12:27:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.45.2.2 2007/11/15 15:03:17 rrs Exp $"); #include #include @@ -170,8 +170,8 @@ */ result = 1; } - if (asoc->my_rwnd && - (asoc->my_rwnd < stcb->sctp_ep->sctp_ep.sctp_sws_receiver)) { + if (result && + (result < stcb->sctp_ep->sctp_ep.sctp_sws_receiver)) { /* SWS engaged, tell peer none left */ result = 1; } ==== //depot/projects/dtrace7/src/sys/netinet/sctputil.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65.2.2 2007/11/06 02:48:03 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65.2.3 2007/11/15 15:03:17 rrs Exp $"); #include #include @@ -4934,7 +4934,7 @@ int out_flags = 0, in_flags = 0; int block_allowed = 1; uint32_t freed_so_far = 0; - int copied_so_far = 0; + uint32_t copied_so_far = 0; int in_eeor_mode = 0; int no_rcv_needed = 0; uint32_t rwnd_req = 0; @@ -5585,11 +5585,11 @@ if (TAILQ_NEXT(control, next) == NULL) { /* * If we don't have a next we need a - * lock, if there is a next interupt - * is filling ahead of us and we - * don't need a lock to remove this - * guy (which is the head of the - * queue). + * lock, if there is a next + * interrupt is filling ahead of us + * and we don't need a lock to + * remove this guy (which is the + * head of the queue). */ if (hold_rlock == 0) { SCTP_INP_READ_LOCK(inp); ==== //depot/projects/dtrace7/src/sys/sys/ata.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/ata.h,v 1.36 2007/08/13 18:46:31 jhb Exp $ + * $FreeBSD: src/sys/sys/ata.h,v 1.36.2.1 2007/11/15 16:29:33 scottl Exp $ */ #ifndef _SYS_ATA_H_ @@ -157,6 +157,15 @@ #define ATA_SUPPORT_FLUSHCACHE48 0x2000 /*084/087*/ u_int16_t extension; +#define ATA_SUPPORT_SMARTTEST 0x0001 +#define ATA_SUPPORT_SMARTLOG 0x0002 +#define ATA_SUPPORT_MEDIASN 0x0004 +#define ATA_SUPPORT_MEDIAPASS 0x0008 +#define ATA_SUPPORT_STREAMING 0x0010 +#define ATA_SUPPORT_GENLOG 0x0020 +#define ATA_SUPPORT_WRITEDMAFUAEXT 0x0040 +#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080 +#define ATA_SUPPORT_64BITWWN 0x0100 } __packed support, enabled; /*088*/ u_int16_t udmamodes; /* UltraDMA modes */ ==== //depot/projects/dtrace7/src/usr.bin/locate/locate/updatedb.sh#2 (text+ko) ==== @@ -26,7 +26,7 @@ # # updatedb - update locate database for local mounted filesystems # -# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.20 2005/11/12 12:45:08 grog Exp $ +# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.20.2.1 2007/11/15 15:14:16 se Exp $ if [ "$(id -u)" = "0" ]; then echo ">>> WARNING" 1>&2 @@ -52,7 +52,7 @@ : ${FCODES:=/var/db/locate.database} # the database : ${SEARCHPATHS:="/"} # directories to be put in the database : ${PRUNEPATHS:="/tmp /usr/tmp /var/tmp /var/db/portsnap"} # unwanted directories -: ${FILESYSTEMS:="ufs ext2fs"} # allowed filesystems +: ${FILESYSTEMS:="ufs ext2fs zfs"} # allowed filesystems : ${find:=find} case X"$SEARCHPATHS" in ==== //depot/projects/dtrace7/src/usr.bin/lsvfs/lsvfs.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.18 2007/04/05 21:03:05 pjd Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.18.2.1 2007/11/15 15:18:44 se Exp $"); #include #include @@ -70,7 +70,7 @@ * NB: if you add new flags, don't forget to add them here vvvvvv too. */ static char buf[sizeof - "static, network, read-only, synthetic, loopback, unicode"]; + "static, network, read-only, synthetic, loopback, unicode, jail"]; int comma = 0; buf[0] = '\0'; ==== //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.249.2.2 2007/11/09 16:16:59 ru Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.249.2.3 2007/11/15 15:46:35 kensmith Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -141,7 +141,6 @@ DTE_PACKAGE("Xsrv", &XOrgDists, XORG_SERVER, "xorg-server"), DTE_PACKAGE("Xnest", &XOrgDists, XORG_NESTSERVER, "xorg-nestserver"), - DTE_PACKAGE("Xprt", &XOrgDists, XORG_PRINTSERVER, "xorg-printserver"), DTE_PACKAGE("Xvfb", &XOrgDists, XORG_VFBSERVER, "xorg-vfbserver"), DTE_PACKAGE("Xfmsc", &XOrgDists, XORG_FONTS_MISC, "xorg-fonts-miscbitmaps"), ==== //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.67.2.2 2007/11/09 16:16:59 ru Exp $ */ +/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.67.2.3 2007/11/15 15:46:35 kensmith Exp $ */ #ifndef _DIST_H_INCLUDE #define _DIST_H_INCLUDE @@ -55,7 +55,6 @@ #define DIST_XORG_SERVER 0x000100 #define DIST_XORG_NESTSERVER 0x000200 -#define DIST_XORG_PRINTSERVER 0x000400 #define DIST_XORG_VFBSERVER 0x000800 #define DIST_XORG_FONTS_MISC 0x010000 ==== //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.425.2.2 2007/11/09 16:16:59 ru Exp $"; + "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.425.2.3 2007/11/15 15:46:35 kensmith Exp $"; #endif #include "sysinstall.h" @@ -1247,8 +1247,6 @@ dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_SERVER }, { " nest", "Nested X Server", dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_NESTSERVER }, - { " prt", "X Print Server", - dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_PRINTSERVER }, { " vfb", "Virtual Framebuffer", dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_VFBSERVER }, { NULL } }, From owner-p4-projects@FreeBSD.ORG Thu Nov 15 22:12:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04E1116A41A; Thu, 15 Nov 2007 22:12:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DE5F16A419 for ; Thu, 15 Nov 2007 22:12:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D4E713C43E for ; Thu, 15 Nov 2007 22:12:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFMCj0Q020408 for ; Thu, 15 Nov 2007 22:12:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFMCjOJ020405 for perforce@freebsd.org; Thu, 15 Nov 2007 22:12:45 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 22:12:45 GMT Message-Id: <200711152212.lAFMCjOJ020405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 22:12:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=129104 Change 129104 by jb@jb_freebsd1 on 2007/11/15 22:12:01 Catch up with CVS. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#11 edit .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#17 edit .. //depot/projects/dtrace/src/sys/sys/proc_event.h#2 delete Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#11 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/dtrace/src/sys/kern/kern_thread.c#17 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -188,7 +187,6 @@ td->td_turnstile = turnstile_alloc(); EVENTHANDLER_INVOKE(thread_init, td); td->td_sched = (struct td_sched *)&td[1]; - EVENTHANDLER_INVOKE(thread_ctor, td); sched_newthread(td); umtx_thread_init(td); td->td_kstack = 0; From owner-p4-projects@FreeBSD.ORG Thu Nov 15 22:13:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7926716A468; Thu, 15 Nov 2007 22:13:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EA7F16A41B for ; Thu, 15 Nov 2007 22:13:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E53313C448 for ; Thu, 15 Nov 2007 22:13:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFMDkaY020450 for ; Thu, 15 Nov 2007 22:13:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFMDkvw020447 for perforce@freebsd.org; Thu, 15 Nov 2007 22:13:46 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 22:13:46 GMT Message-Id: <200711152213.lAFMDkvw020447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 22:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=129105 Change 129105 by jb@jb_freebsd1 on 2007/11/15 22:13:14 MFC proc/thread event handler changes. Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#2 edit .. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#2 edit .. //depot/projects/dtrace7/src/sys/sys/eventhandler.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_proc.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #ifdef KTRACE #include #include @@ -130,6 +131,7 @@ struct proc *p; p = (struct proc *)mem; + EVENTHANDLER_INVOKE(process_ctor, p); return (0); } @@ -159,6 +161,7 @@ */ if (((p->p_flag & P_KTHREAD) != 0) && (td->td_altkstack != 0)) vm_thread_dispose_altkstack(td); + EVENTHANDLER_INVOKE(process_dtor, p); if (p->p_ksi != NULL) KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); } @@ -178,6 +181,7 @@ bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN | MTX_RECURSE); + EVENTHANDLER_INVOKE(process_init, p); p->p_stats = pstats_alloc(); proc_linkup(p, td); sched_newproc(p, td); @@ -195,6 +199,7 @@ struct proc *p; p = (struct proc *)mem; + EVENTHANDLER_INVOKE(process_fini, p); pstats_free(p->p_stats); thread_free(FIRST_THREAD_IN_PROC(p)); mtx_destroy(&p->p_mtx); ==== //depot/projects/dtrace7/src/sys/kern/kern_thread.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include /* * thread related storage. @@ -126,6 +127,7 @@ * end of a context switch. */ td->td_critnest = 1; + EVENTHANDLER_INVOKE(thread_ctor, td); #ifdef AUDIT audit_thread_alloc(td); @@ -167,6 +169,7 @@ #ifdef AUDIT audit_thread_free(td); #endif + EVENTHANDLER_INVOKE(thread_dtor, td); free_unr(tid_unrhdr, td->td_tid); sched_newthread(td); } @@ -185,6 +188,7 @@ cpu_thread_setup(td); td->td_sleepqueue = sleepq_alloc(); td->td_turnstile = turnstile_alloc(); + EVENTHANDLER_INVOKE(thread_init, td); td->td_sched = (struct td_sched *)&td[1]; sched_newthread(td); umtx_thread_init(td); @@ -200,6 +204,7 @@ struct thread *td; td = (struct thread *)mem; + EVENTHANDLER_INVOKE(thread_fini, td); turnstile_free(td->td_turnstile); sleepq_free(td->td_sleepqueue); umtx_thread_fini(td); ==== //depot/projects/dtrace7/src/sys/sys/eventhandler.h#2 (text+ko) ==== @@ -182,11 +182,28 @@ typedef void (*exitlist_fn)(void *, struct proc *); typedef void (*forklist_fn)(void *, struct proc *, struct proc *, int); typedef void (*execlist_fn)(void *, struct proc *, struct image_params *); - +typedef void (*proc_ctor_fn)(void *, struct proc *); +typedef void (*proc_dtor_fn)(void *, struct proc *); +typedef void (*proc_init_fn)(void *, struct proc *); +typedef void (*proc_fini_fn)(void *, struct proc *); +EVENTHANDLER_DECLARE(process_ctor, proc_ctor_fn); +EVENTHANDLER_DECLARE(process_dtor, proc_dtor_fn); +EVENTHANDLER_DECLARE(process_init, proc_init_fn); +EVENTHANDLER_DECLARE(process_fini, proc_fini_fn); EVENTHANDLER_DECLARE(process_exit, exitlist_fn); EVENTHANDLER_DECLARE(process_fork, forklist_fn); EVENTHANDLER_DECLARE(process_exec, execlist_fn); +struct thread; +typedef void (*thread_ctor_fn)(void *, struct thread *); +typedef void (*thread_dtor_fn)(void *, struct thread *); +typedef void (*thread_fini_fn)(void *, struct thread *); +typedef void (*thread_init_fn)(void *, struct thread *); +EVENTHANDLER_DECLARE(thread_ctor, thread_ctor_fn); +EVENTHANDLER_DECLARE(thread_dtor, thread_dtor_fn); +EVENTHANDLER_DECLARE(thread_init, thread_init_fn); +EVENTHANDLER_DECLARE(thread_fini, thread_fini_fn); + typedef void (*uma_zone_chfn)(void *); EVENTHANDLER_DECLARE(nmbclusters_change, uma_zone_chfn); EVENTHANDLER_DECLARE(maxsockets_change, uma_zone_chfn); From owner-p4-projects@FreeBSD.ORG Thu Nov 15 22:28:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F0C616A476; Thu, 15 Nov 2007 22:28:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25F1316A473 for ; Thu, 15 Nov 2007 22:28:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 160D513C442 for ; Thu, 15 Nov 2007 22:28:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFMS2Ls021056 for ; Thu, 15 Nov 2007 22:28:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFMS2L8021053 for perforce@freebsd.org; Thu, 15 Nov 2007 22:28:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 22:28:02 GMT Message-Id: <200711152228.lAFMS2L8021053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 22:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=129106 Change 129106 by jb@jb_freebsd1 on 2007/11/15 22:27:10 MFC proc/thread event handler changes. Affected files ... .. //depot/projects/dtrace6/src/sys/kern/kern_proc.c#2 edit .. //depot/projects/dtrace6/src/sys/kern/kern_thread.c#4 edit .. //depot/projects/dtrace6/src/sys/sys/eventhandler.h#2 edit Differences ... ==== //depot/projects/dtrace6/src/sys/kern/kern_proc.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #ifdef KTRACE #include #include @@ -132,6 +133,7 @@ struct proc *p; p = (struct proc *)mem; + EVENTHANDLER_INVOKE(process_ctor, p); return (0); } @@ -167,6 +169,7 @@ */ if (((p->p_flag & P_KTHREAD) != 0) && (td->td_altkstack != 0)) vm_thread_dispose_altkstack(td); + EVENTHANDLER_INVOKE(process_dtor, p); } /* @@ -185,6 +188,7 @@ kg = ksegrp_alloc(); bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); + EVENTHANDLER_INVOKE(process_init, p); p->p_stats = pstats_alloc(); proc_linkup(p, kg, td); sched_newproc(p, kg, td); @@ -198,6 +202,7 @@ static void proc_fini(void *mem, int size) { + EVENTHANDLER_INVOKE(process_fini, p); panic("proc reclaimed"); } ==== //depot/projects/dtrace6/src/sys/kern/kern_thread.c#4 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include /* * KSEGRP related storage. @@ -136,6 +137,7 @@ * next thread. */ td->td_critnest = 1; + EVENTHANDLER_INVOKE(thread_ctor, td); #ifdef AUDIT audit_thread_alloc(td); @@ -176,6 +178,7 @@ #ifdef AUDIT audit_thread_free(td); #endif + EVENTHANDLER_INVOKE(thread_dtor, td); free_unr(tid_unrhdr, td->td_tid); sched_newthread(td); } @@ -194,6 +197,7 @@ cpu_thread_setup(td); td->td_sleepqueue = sleepq_alloc(); td->td_turnstile = turnstile_alloc(); + EVENTHANDLER_INVOKE(thread_init, td); td->td_umtxq = umtxq_alloc(); td->td_sched = (struct td_sched *)&td[1]; sched_newthread(td); @@ -209,6 +213,7 @@ struct thread *td; td = (struct thread *)mem; + EVENTHANDLER_INVOKE(thread_fini, td); turnstile_free(td->td_turnstile); sleepq_free(td->td_sleepqueue); umtxq_free(td->td_umtxq); ==== //depot/projects/dtrace6/src/sys/sys/eventhandler.h#2 (text+ko) ==== @@ -166,11 +166,28 @@ typedef void (*exitlist_fn)(void *, struct proc *); typedef void (*forklist_fn)(void *, struct proc *, struct proc *, int); typedef void (*execlist_fn)(void *, struct proc *); - +typedef void (*proc_ctor_fn)(void *, struct proc *); +typedef void (*proc_dtor_fn)(void *, struct proc *); +typedef void (*proc_init_fn)(void *, struct proc *); +typedef void (*proc_fini_fn)(void *, struct proc *); +EVENTHANDLER_DECLARE(process_ctor, proc_ctor_fn); +EVENTHANDLER_DECLARE(process_dtor, proc_dtor_fn); +EVENTHANDLER_DECLARE(process_init, proc_init_fn); +EVENTHANDLER_DECLARE(process_fini, proc_fini_fn); EVENTHANDLER_DECLARE(process_exit, exitlist_fn); EVENTHANDLER_DECLARE(process_fork, forklist_fn); EVENTHANDLER_DECLARE(process_exec, execlist_fn); +struct thread; +typedef void (*thread_ctor_fn)(void *, struct thread *); +typedef void (*thread_dtor_fn)(void *, struct thread *); +typedef void (*thread_fini_fn)(void *, struct thread *); +typedef void (*thread_init_fn)(void *, struct thread *); +EVENTHANDLER_DECLARE(thread_ctor, thread_ctor_fn); +EVENTHANDLER_DECLARE(thread_dtor, thread_dtor_fn); +EVENTHANDLER_DECLARE(thread_init, thread_init_fn); +EVENTHANDLER_DECLARE(thread_fini, thread_fini_fn); + typedef void (*uma_zone_chfn)(void *); EVENTHANDLER_DECLARE(nmbclusters_change, uma_zone_chfn); EVENTHANDLER_DECLARE(maxsockets_change, uma_zone_chfn); From owner-p4-projects@FreeBSD.ORG Thu Nov 15 22:29:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CCB516A420; Thu, 15 Nov 2007 22:29:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5236916A419 for ; Thu, 15 Nov 2007 22:29:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4211713C461 for ; Thu, 15 Nov 2007 22:29:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAFMT4m5021089 for ; Thu, 15 Nov 2007 22:29:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAFMT4j3021086 for perforce@freebsd.org; Thu, 15 Nov 2007 22:29:04 GMT (envelope-from jb@freebsd.org) Date: Thu, 15 Nov 2007 22:29:04 GMT Message-Id: <200711152229.lAFMT4j3021086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Nov 2007 22:29:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=129107 Change 129107 by jb@jb_freebsd1 on 2007/11/15 22:28:37 Remove code that was implemented differntly in current. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#23 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_fork.c#23 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -266,7 +265,6 @@ goto fail1; } proc_linkup(newproc, td2); - EVENTHANDLER_INVOKE(process_ctor, newproc); sched_newproc(newproc, td2); } else td2 = FIRST_THREAD_IN_PROC(newproc); From owner-p4-projects@FreeBSD.ORG Fri Nov 16 08:17:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06AD216A41B; Fri, 16 Nov 2007 08:17:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CB7316A418 for ; Fri, 16 Nov 2007 08:17:39 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F8AC13C4C4 for ; Fri, 16 Nov 2007 08:17:39 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAG8Hd7k092712 for ; Fri, 16 Nov 2007 08:17:39 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAG8HdLw092709 for perforce@freebsd.org; Fri, 16 Nov 2007 08:17:39 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 16 Nov 2007 08:17:39 GMT Message-Id: <200711160817.lAG8HdLw092709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 129115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 08:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=129115 Change 129115 by zhouzhouyi@zhouzhouyi_mactest on 2007/11/16 08:17:20 sys/security/mac_test/ and regression/mactest/tests/link are now mature and up to date Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#7 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/01.t#7 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#13 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#4 (text+ko) ==== @@ -232,16 +232,16 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 7 -#define YYLAST 18 +#define YYLAST 29 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 9 +#define YYNTOKENS 10 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 8 +#define YYNNTS 10 /* YYNRULES -- Number of rules. */ -#define YYNRULES 15 +#define YYNRULES 20 /* YYNRULES -- Number of states. */ -#define YYNSTATES 22 +#define YYNSTATES 31 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -256,7 +256,7 @@ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 7, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 6, 2, 2, 2, 2, 2, 2, 2, 2, @@ -288,16 +288,19 @@ static const unsigned char yyprhs[] = { 0, 0, 3, 4, 6, 8, 11, 14, 20, 21, - 30, 32, 34, 37, 40, 42 + 30, 31, 42, 44, 46, 49, 52, 54, 57, 60, + 62 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 10, 0, -1, -1, 11, -1, 12, -1, 11, 12, - -1, 11, 1, -1, 3, 6, 16, 15, 7, -1, - -1, 3, 6, 16, 15, 13, 8, 14, 7, -1, - 7, -1, 15, -1, 14, 15, -1, 14, 1, -1, + 11, 0, -1, -1, 12, -1, 13, -1, 12, 13, + -1, 12, 1, -1, 3, 6, 19, 18, 7, -1, + -1, 3, 6, 19, 18, 14, 8, 16, 7, -1, + -1, 3, 6, 19, 18, 15, 9, 17, 8, 16, + 7, -1, 7, -1, 18, -1, 16, 18, -1, 16, + 1, -1, 18, -1, 17, 18, -1, 17, 1, -1, 4, -1, 5, -1 }; @@ -305,7 +308,8 @@ static const unsigned char yyrline[] = { 0, 48, 48, 50, 54, 56, 57, 60, 62, 62, - 64, 67, 69, 70, 75, 78 + 64, 64, 66, 69, 71, 72, 76, 78, 79, 83, + 86 }; #endif @@ -315,8 +319,9 @@ static const char *const yytname[] = { "$end", "error", "$undefined", "PID", "IDENTIFIER", "NUM", "'='", "'\\n'", - "':'", "$accept", "program", "mactestlog_records", "mactestlog_record", - "@1", "label_elements", "identifier", "pid", 0 + "':'", "'#'", "$accept", "program", "mactestlog_records", + "mactestlog_record", "@1", "@2", "label_elements", "modflag_elements", + "identifier", "pid", 0 }; #endif @@ -325,22 +330,24 @@ token YYLEX-NUM. */ static const unsigned short yytoknum[] = { - 0, 256, 257, 258, 259, 260, 61, 10, 58 + 0, 256, 257, 258, 259, 260, 61, 10, 58, 35 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 9, 10, 10, 11, 11, 11, 12, 13, 12, - 12, 14, 14, 14, 15, 16 + 0, 10, 11, 11, 12, 12, 12, 13, 14, 13, + 15, 13, 13, 16, 16, 16, 17, 17, 17, 18, + 19 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { 0, 2, 0, 1, 1, 2, 2, 5, 0, 8, - 1, 1, 2, 2, 1, 1 + 0, 10, 1, 1, 2, 2, 1, 2, 2, 1, + 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -348,57 +355,62 @@ means the default is an error. */ static const unsigned char yydefact[] = { - 2, 0, 10, 0, 0, 4, 0, 1, 6, 5, - 15, 0, 14, 8, 7, 0, 0, 0, 11, 13, - 9, 12 + 2, 0, 12, 0, 0, 4, 0, 1, 6, 5, + 20, 0, 19, 8, 7, 0, 0, 0, 0, 0, + 13, 0, 16, 15, 9, 14, 18, 0, 17, 0, + 11 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yysigned_char yydefgoto[] = { - -1, 3, 4, 5, 15, 17, 13, 11 + -1, 3, 4, 5, 15, 16, 19, 21, 20, 11 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -6 +#define YYPACT_NINF -12 static const yysigned_char yypact[] = { - 3, -2, -6, 9, 0, -6, 8, -6, -6, -6, - -6, 10, -6, 11, -6, 7, 10, 1, -6, -6, - -6, -6 + 18, -5, -12, 13, 2, -12, 17, -12, -12, -12, + -12, 12, -12, -3, -12, 16, 20, 12, 12, 10, + -12, 11, -12, -12, -12, -12, -12, 12, -12, 19, + -12 }; /* YYPGOTO[NTERM-NUM]. */ static const yysigned_char yypgoto[] = { - -6, -6, -6, 12, -6, -6, -5, -6 + -12, -12, -12, 23, -12, -12, 1, -12, -11, -12 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, parse error. */ -#define YYTABLE_NINF -4 +#define YYTABLE_NINF -11 static const yysigned_char yytable[] = { - -3, 8, 19, 1, 6, 12, 1, 2, 20, 7, - 2, 18, 21, 10, 12, 16, 9, 0, 14 + 13, 6, -3, 8, 14, 1, -10, 22, 25, 2, + 28, 23, 26, 7, 12, 12, 12, 24, 25, 27, + 23, 1, 10, 12, 17, 2, 30, 9, 29, 18 }; -static const yysigned_char yycheck[] = +static const unsigned char yycheck[] = { - 0, 1, 1, 3, 6, 4, 3, 7, 7, 0, - 7, 16, 17, 5, 4, 8, 4, -1, 7 + 11, 6, 0, 1, 7, 3, 9, 18, 19, 7, + 21, 1, 1, 0, 4, 4, 4, 7, 29, 8, + 1, 3, 5, 4, 8, 7, 7, 4, 27, 9 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 3, 7, 10, 11, 12, 6, 0, 1, 12, - 5, 16, 4, 15, 7, 13, 8, 14, 15, 1, - 7, 15 + 0, 3, 7, 11, 12, 13, 6, 0, 1, 13, + 5, 19, 4, 18, 7, 14, 15, 8, 9, 16, + 18, 17, 18, 1, 7, 18, 1, 8, 18, 16, + 7 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -976,26 +988,47 @@ case 10: #line 64 "mactestparser.y" - {yyval.mtpipetype = 0;} + {stringsave = strdup(yyvsp[0].namestring);} break; case 11: -#line 68 "mactestparser.y" - { new_labelstrings(strdup(yyvsp[0].namestring));} +#line 64 "mactestparser.y" + { + yyval.mtpipetype = new_mactestlog_record(stringsave, yyvsp[-7].itype);stringsave = 0;} break; case 12: -#line 69 "mactestparser.y" +#line 66 "mactestparser.y" + {yyval.mtpipetype = 0;} + break; + + case 13: +#line 70 "mactestparser.y" { new_labelstrings(strdup(yyvsp[0].namestring));} break; case 14: -#line 76 "mactestparser.y" +#line 71 "mactestparser.y" + { new_labelstrings(strdup(yyvsp[0].namestring));} + break; + + case 16: +#line 77 "mactestparser.y" + { new_modes_or_flags(strdup(yyvsp[0].namestring));} + break; + + case 17: +#line 78 "mactestparser.y" + { new_modes_or_flags(strdup(yyvsp[0].namestring));} + break; + + case 19: +#line 84 "mactestparser.y" {} break; - case 15: -#line 79 "mactestparser.y" + case 20: +#line 87 "mactestparser.y" {} break; @@ -1003,7 +1036,7 @@ } /* Line 1016 of /usr/local/share/bison/yacc.c. */ -#line 1007 "mactestparser.tab.c" +#line 1040 "mactestparser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -1222,7 +1255,7 @@ } -#line 84 "mactestparser.y" +#line 92 "mactestparser.y" int ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#5 (text+ko) ==== @@ -61,6 +61,8 @@ PID '=' pid identifier '\n' {$$ = new_mactestlog_record(strdup($4), $3);} |PID '=' pid identifier {stringsave = strdup($4);} ':' label_elements '\n' { $$ = new_mactestlog_record(stringsave, $3);stringsave = 0;} + |PID '=' pid identifier {stringsave = strdup($4);} '#' modflag_elements ':' label_elements '\n' { + $$ = new_mactestlog_record(stringsave, $3);stringsave = 0;} |'\n' {$$ = 0;} ; @@ -71,6 +73,12 @@ ; +modflag_elements: + identifier { new_modes_or_flags(strdup($1));} + |modflag_elements identifier { new_modes_or_flags(strdup($2));} + |modflag_elements error + ; + identifier: IDENTIFIER {} ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#7 (text+ko) ==== @@ -49,7 +49,7 @@ mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac \ "mls/5" ${n3}/${n2} #case 5: link - echo -n "pid = -1 mac_test_check_vnode_link:" > ${mactest_conf} + echo -n "pid = -1 vnode_check_link:" > ${mactest_conf} echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} link ${n3}/${n2} ${n3}/${n1} sysctl security.mac.mls.enabled=0 >/dev/null @@ -62,7 +62,7 @@ truncate -s 0 ${mactest_conf} mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} unlink ${n3}/${n1} #case 8: setfmac fail, old vnode not in range - echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} + echo -n "pid = -2 vnode_check_relabel:" > ${mactest_conf} echo "biba/high(low-high),mls/6(6-6) biba/high,mls/5 biba/,mls/6" >> \ ${mactest_conf} mactestexpect \ @@ -70,7 +70,7 @@ -m "mls/6(6-6)" -f ${mactest_conf} \ system setfmac "biba/,mls/6" ${n3}/${n1} #case 9: setfmac success - echo -n "pid = -2 mac_test_check_vnode_relabel:" > ${mactest_conf} + echo -n "pid = -2 vnode_check_relabel:" > ${mactest_conf} echo "biba/high(low-high),mls/6(4-6) biba/high,mls/5 biba/,mls/6" >> ${mactest_conf} mactestexpect "" "" -m "mls/6(4-6)" -f ${mactest_conf} \ system setfmac "biba/,mls/6" ${n3}/${n1} ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/01.t#7 (text+ko) ==== @@ -40,23 +40,23 @@ #case 1: mkdir mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n0} 0755 #case 2: mdconfig, couldn't open /dev/mdctl, BLP prevents write down - echo -n "pid = -2 mac_test_check_vnode_open#VREAD VWRITE:" > ${mactest_conf} + echo -n "pid = -2 vnode_check_open#VREAD VWRITE:" > ${mactest_conf} echo "biba/high(low-high),mls/7(low-high) biba/high,mls/low" >> ${mactest_conf} mactestexpect "*Permission.denied" "" -m "mls/7(low-high)" -f ${mactest_conf}\ system mdconfig -a -n -t malloc -s 1m #case 3: mdconfig, successfully open /dev/mdctl - echo -n "pid = -2 mac_test_check_vnode_open#VREAD VWRITE:" > ${mactest_conf} + echo -n "pid = -2 vnode_check_open#VREAD VWRITE:" > ${mactest_conf} echo "biba/high(low-high),mls/low(low-high) biba/high,mls/low" >> ${mactest_conf} mactestexpect "" "*" -m "mls/low(low-high)" -f ${mactest_conf} \ system mdconfig -a -n -t malloc -s 1m mdnum=${ret} #case 4: newfs, fail for writing, BLP prevents write down - echo -n "pid = -2 mac_test_check_vnode_open#VREAD VWRITE:" > ${mactest_conf} + echo -n "pid = -2 vnode_check_open#VREAD VWRITE:" > ${mactest_conf} echo "biba/high(low-high),mls/7(low-high) biba/high,mls/low" >> ${mactest_conf} mactestexpect "*failed.to.open.disk.for.writing" "*" -m "mls/7(low-high)" \ -f ${mactest_conf} system newfs -i 1 /dev/md${mdnum} #case 5: newfs, success - echo -n "pid = -2 mac_test_check_vnode_open#VREAD VWRITE:" > ${mactest_conf} + echo -n "pid = -2 vnode_check_open#VREAD VWRITE:" > ${mactest_conf} echo "biba/high(low-high),mls/low(low-high) biba/high,mls/low" >> ${mactest_conf} mactestexpect "" "*" -m "mls/low(low-high)" -f ${mactest_conf}\ system newfs -i 1 /dev/md${mdnum} ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#13 (text+ko) ==== @@ -119,22 +119,27 @@ #define LOG_DECL \ char *buffer; \ char *currentchar; \ + char *currentchar1; \ char *element1; \ - char *buffer1; \ - char *submitbuffer; \ + char *buffer1; /*buffer used to store labels*/ \ + char *submitbuffer; /*the buffer sent to log*/ \ + char *flagbuffer; /*buffer used to store various of flags*/ \ int havelabel = 0; \ + int haveflag = 0; \ int error; \ struct thread *td1 = curthread; \ volatile int badmem = 0; \ error = 0; \ - buffer = malloc(2048, M_MAC_TEST_LOG, M_NOWAIT); \ + buffer = malloc(2560, M_MAC_TEST_LOG, M_NOWAIT); \ if (!buffer) \ badmem = 1; \ bzero(buffer, 2048); \ element1 = buffer + 512; buffer1 = element1 + 256; \ - submitbuffer = buffer + 1024; \ + flagbuffer = buffer + 1024; \ + submitbuffer = buffer + 1536; \ /*element1 and buffer1 will not be used if badmem == 1*/ \ - currentchar = buffer; + currentchar = buffer; \ + currentchar1 = flagbuffer; #define COUNTER_DECL(variable) \ static int counter_##variable; \ @@ -144,12 +149,19 @@ #define COUNTER_INC(variable) do { \ atomic_add_int(&counter_##variable, 1); \ if (!badmem) { \ - if (havelabel) \ + if ((!havelabel)&&(!haveflag)) \ + sprintf(submitbuffer,"pid = %d %s\n", \ + td1->td_proc->p_pid, #variable); \ + else if (!haveflag) \ sprintf(submitbuffer,"pid = %d %s:%s\n", \ td1->td_proc->p_pid, #variable, buffer);\ - else \ - sprintf(submitbuffer,"pid = %d %s\n", \ - td1->td_proc->p_pid, #variable); \ + else if (havelabel) { \ + /*get rid of last blank: "VREAD VWRITE "*/ \ + *(flagbuffer + strlen(flagbuffer) -1) = 0; \ + sprintf(submitbuffer,"pid = %d %s#%s:%s\n", \ + td1->td_proc->p_pid, #variable, \ + flagbuffer, buffer); \ + } \ mac_test_log_submit(submitbuffer, strlen(submitbuffer));\ free(buffer, M_MAC_TEST_LOG); \ } \ @@ -163,6 +175,14 @@ #define DEBUGGER(func, string) printf("mac_test: %s: %s\n", (func), (string)) #endif +#define APPEND_FLAG(flag) do { \ + if (!badmem) { \ + sprintf(currentchar1, "%s ", flag); \ + currentchar1 += strlen(currentchar1); \ + haveflag = 1; \ + } \ +} while (0) + #define LABEL_CHECK(label, magic) do { \ if (label != NULL) { \ KASSERT(SLOT(label) == magic || SLOT(label) == 0 || \ @@ -2580,6 +2600,18 @@ LOG_DECL LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); + if (acc_mode & VREAD) + APPEND_FLAG("VREAD"); + if (acc_mode & VEXEC) + APPEND_FLAG("VEXEC"); + if (acc_mode & VSTAT) + APPEND_FLAG("VSTAT"); + if (acc_mode & VWRITE) + APPEND_FLAG("VWRITE"); + if (acc_mode & VAPPEND) + APPEND_FLAG("VAPPEND"); + if (acc_mode & VADMIN) + APPEND_FLAG("VADMIN"); COUNTER_INC(vnode_check_open); return (0); From owner-p4-projects@FreeBSD.ORG Fri Nov 16 22:38:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB65616A41B; Fri, 16 Nov 2007 22:38:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5943316A417 for ; Fri, 16 Nov 2007 22:38:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4414713C45A for ; Fri, 16 Nov 2007 22:38:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGMctOm078354 for ; Fri, 16 Nov 2007 22:38:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGMcrPi078351 for perforce@freebsd.org; Fri, 16 Nov 2007 22:38:53 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 16 Nov 2007 22:38:53 GMT Message-Id: <200711162238.lAGMcrPi078351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 22:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=129134 Change 129134 by kmacy@kmacy_home:ethng on 2007/11/16 22:38:30 IFC 129133 Affected files ... .. //depot/projects/ethng/src/ObsoleteFiles.inc#8 integrate .. //depot/projects/ethng/src/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/ethng/src/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/ethng/src/etc/etc.amd64/ttys#2 integrate .. //depot/projects/ethng/src/etc/etc.arm/ttys#3 integrate .. //depot/projects/ethng/src/etc/etc.i386/ttys#2 integrate .. //depot/projects/ethng/src/etc/etc.ia64/ttys#2 integrate .. //depot/projects/ethng/src/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/ethng/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/ethng/src/etc/freebsd-update.conf#2 integrate .. //depot/projects/ethng/src/etc/rc.d/hostapd#2 integrate .. //depot/projects/ethng/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libsdp/search.c#2 integrate .. //depot/projects/ethng/src/release/Makefile#5 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/ethng/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/ethng/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/ethng/src/release/picobsd/build/Makefile.conf#2 integrate .. //depot/projects/ethng/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/ethng/src/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/ethng/src/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/ethng/src/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/ethng/src/share/man/man4/Makefile#7 integrate .. //depot/projects/ethng/src/share/man/man4/asmc.4#1 branch .. //depot/projects/ethng/src/share/man/man4/ipw.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/wlan.4#4 integrate .. //depot/projects/ethng/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/ethng/src/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#8 integrate .. //depot/projects/ethng/src/share/man/man9/rmlock.9#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/ethng/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/ethng/src/sys/conf/files#10 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#9 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#7 integrate .. //depot/projects/ethng/src/sys/conf/files.pc98#3 integrate .. //depot/projects/ethng/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/ethng/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/ethng/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/ethng/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/ethng/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/ethng/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/ethng/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/ethng/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/ethng/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/ethng/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/ethng/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/ethng/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/ethng/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/ethng/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/ethng/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/ethng/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/ethng/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/ethng/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/ethng/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/ethng/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/ethng/src/sys/kern/kern_kse.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_switch.c#6 integrate .. //depot/projects/ethng/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/ethng/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/ethng/src/sys/kern/sched_ule.c#8 integrate .. //depot/projects/ethng/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/ethng/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/ethng/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/ethng/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/ethng/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/ethng/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/ethng/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/ethng/src/sys/netipsec/keysock.c#2 integrate .. //depot/projects/ethng/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/ethng/src/sys/pci/agp.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_ali.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_amd.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_amd64.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_ati.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_i810.c#4 delete .. //depot/projects/ethng/src/sys/pci/agp_if.m#2 delete .. //depot/projects/ethng/src/sys/pci/agp_intel.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_nvidia.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_sis.c#3 delete .. //depot/projects/ethng/src/sys/pci/agp_via.c#4 delete .. //depot/projects/ethng/src/sys/pci/agppriv.h#3 delete .. //depot/projects/ethng/src/sys/pci/agpreg.h#2 delete .. //depot/projects/ethng/src/sys/pci/agpvar.h#2 delete .. //depot/projects/ethng/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#8 integrate .. //depot/projects/ethng/src/sys/sys/proc.h#6 integrate .. //depot/projects/ethng/src/tools/regression/priv/Makefile#3 integrate .. //depot/projects/ethng/src/tools/regression/priv/main.c#3 integrate .. //depot/projects/ethng/src/tools/regression/priv/main.h#3 integrate .. //depot/projects/ethng/src/tools/regression/priv/priv_netinet_ipsec.c#1 branch .. //depot/projects/ethng/src/tools/sched/schedgraph.py#2 integrate .. //depot/projects/ethng/src/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/ethng/src/usr.bin/tee/tee.1#2 integrate .. //depot/projects/ethng/src/usr.bin/write/write.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/cap.c#4 integrate Differences ... ==== //depot/projects/ethng/src/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,12 @@ # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf +# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=rescue/bsdlabel +OLD_FILES+=rescue/fdisk +OLD_FILES+=rescue/gpt +.endif # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/ethng/src/contrib/gdb/gdb/i386fbsd-nat.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ #ifdef KERN_PS_STRINGS { int mib[2]; - int ps_strings; + u_long ps_strings; size_t len; mib[0] = CTL_KERN; ==== //depot/projects/ethng/src/etc/etc.amd64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.12 2007/11/15 16:22:58 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/ethng/src/etc/etc.arm/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.4 2007/08/12 17:13:06 cognet Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.5 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/ethng/src/etc/etc.i386/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.12 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 16 22:39:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C713F16A468; Fri, 16 Nov 2007 22:39:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CCBD16A418 for ; Fri, 16 Nov 2007 22:39:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A0BC13C455 for ; Fri, 16 Nov 2007 22:39:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGMdumc078383 for ; Fri, 16 Nov 2007 22:39:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGMduZ5078380 for perforce@freebsd.org; Fri, 16 Nov 2007 22:39:56 GMT (envelope-from jb@freebsd.org) Date: Fri, 16 Nov 2007 22:39:56 GMT Message-Id: <200711162239.lAGMduZ5078380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 22:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=129135 Change 129135 by jb@jb_freebsd1 on 2007/11/16 22:39:47 Move the kernel DTrace hooks initialisation before proc0 so that the extra DTrace memory can be allocated and initialised for proc0/thread0 the same way that it is for all other procs/threads. Affected files ... .. //depot/projects/dtrace/src/sys/sys/kernel.h#14 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/kernel.h#14 (text+ko) ==== @@ -113,6 +113,7 @@ SI_SUB_EVENTHANDLER = 0x1C00000, /* eventhandler init */ SI_SUB_KLD = 0x2000000, /* KLD and module setup */ SI_SUB_CPU = 0x2100000, /* CPU resource(s)*/ + SI_SUB_KDTRACE = 0x2140000, /* Kernel dtrace hooks */ SI_SUB_MAC = 0x2180000, /* TrustedBSD MAC subsystem */ SI_SUB_MAC_POLICY = 0x21C0000, /* TrustedBSD MAC policies */ SI_SUB_MAC_LATE = 0x21D0000, /* TrustedBSD MAC subsystem */ @@ -121,7 +122,6 @@ SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ SI_SUB_KTRACE = 0x2480000, /* ktrace */ SI_SUB_CYCLIC = 0x2490000, /* Cyclic timers */ - SI_SUB_KDTRACE = 0x24A0000, /* Kernel dtrace hooks */ SI_SUB_DTRACE = 0x24B0000, /* DTrace subsystem */ SI_SUB_DTRACE_PROVIDER = 0x24B8000, /* DTrace providers */ SI_SUB_DTRACE_ANON = 0x24BC000, /* DTrace anon enabling */ From owner-p4-projects@FreeBSD.ORG Fri Nov 16 22:42:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D95A016A41A; Fri, 16 Nov 2007 22:41:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B83516A418 for ; Fri, 16 Nov 2007 22:41:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DDEB13C458 for ; Fri, 16 Nov 2007 22:41:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGMfxTp078530 for ; Fri, 16 Nov 2007 22:41:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGMfxuC078527 for perforce@freebsd.org; Fri, 16 Nov 2007 22:41:59 GMT (envelope-from jb@freebsd.org) Date: Fri, 16 Nov 2007 22:41:59 GMT Message-Id: <200711162241.lAGMfxuC078527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 22:42:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=129136 Change 129136 by jb@jb_freebsd1 on 2007/11/16 22:41:01 Process ctor/init handlers for proc0 and thread0 too. Affected files ... .. //depot/projects/dtrace/src/sys/kern/init_main.c#20 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/init_main.c#20 (text+ko) ==== @@ -488,6 +488,11 @@ p->p_sysent->sv_maxuser); vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0); + EVENTHANDLER_INVOKE(process_ctor, p); + EVENTHANDLER_INVOKE(process_init, p); + EVENTHANDLER_INVOKE(thread_ctor, td); + EVENTHANDLER_INVOKE(thread_init, td); + /* * Charge root for one process. */ From owner-p4-projects@FreeBSD.ORG Fri Nov 16 22:43:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B01E16A46B; Fri, 16 Nov 2007 22:43:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00C1816A468 for ; Fri, 16 Nov 2007 22:43:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9578513C43E for ; Fri, 16 Nov 2007 22:43:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGMh0C9078581 for ; Fri, 16 Nov 2007 22:43:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGMh0Lb078578 for perforce@freebsd.org; Fri, 16 Nov 2007 22:43:00 GMT (envelope-from jb@freebsd.org) Date: Fri, 16 Nov 2007 22:43:00 GMT Message-Id: <200711162243.lAGMh0Lb078578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 22:43:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=129137 Change 129137 by jb@jb_freebsd1 on 2007/11/16 22:42:22 Remove the proc0/thread0 hacks now that they call event handlers when initialised. Rename the static functions to match their event types. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ } static void -kdtrace_proc_alloc(void *arg __unused, struct proc *p) +kdtrace_proc_ctor(void *arg __unused, struct proc *p) { p->p_dtrace = malloc(KDTRACE_PROC_SIZE, M_KDTRACE, M_WAITOK); @@ -58,7 +58,7 @@ } static void -kdtrace_proc_free(void *arg __unused, struct proc *p) +kdtrace_proc_dtor(void *arg __unused, struct proc *p) { if (p->p_dtrace != NULL) { free(p->p_dtrace, M_KDTRACE); @@ -74,7 +74,7 @@ } static void -kdtrace_thread_alloc(void *arg __unused, struct thread *td) +kdtrace_thread_ctor(void *arg __unused, struct thread *td) { td->td_dtrace = malloc(KDTRACE_THREAD_SIZE, M_KDTRACE, M_WAITOK); @@ -82,7 +82,7 @@ } static void -kdtrace_thread_free(void *arg __unused, struct thread *td) +kdtrace_thread_dtor(void *arg __unused, struct thread *td) { if (td->td_dtrace != NULL) { free(td->td_dtrace, M_KDTRACE); @@ -96,13 +96,10 @@ static void init_dtrace(void *dummy __unused) { - kdtrace_proc_alloc(NULL, &proc0); - kdtrace_thread_alloc(NULL, &thread0); - - EVENTHANDLER_REGISTER(process_ctor, kdtrace_proc_alloc, NULL, EVENTHANDLER_PRI_ANY); - EVENTHANDLER_REGISTER(process_dtor, kdtrace_proc_free, NULL, EVENTHANDLER_PRI_ANY); - EVENTHANDLER_REGISTER(thread_ctor, kdtrace_thread_alloc, NULL, EVENTHANDLER_PRI_ANY); - EVENTHANDLER_REGISTER(thread_dtor, kdtrace_thread_free, NULL, EVENTHANDLER_PRI_ANY); + EVENTHANDLER_REGISTER(process_ctor, kdtrace_proc_ctor, NULL, EVENTHANDLER_PRI_ANY); + EVENTHANDLER_REGISTER(process_dtor, kdtrace_proc_dtor, NULL, EVENTHANDLER_PRI_ANY); + EVENTHANDLER_REGISTER(thread_ctor, kdtrace_thread_ctor, NULL, EVENTHANDLER_PRI_ANY); + EVENTHANDLER_REGISTER(thread_dtor, kdtrace_thread_dtor, NULL, EVENTHANDLER_PRI_ANY); } SYSINIT(kdtrace, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_dtrace, NULL) From owner-p4-projects@FreeBSD.ORG Fri Nov 16 22:45:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B09C316A41A; Fri, 16 Nov 2007 22:45:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 710C216A418 for ; Fri, 16 Nov 2007 22:45:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5BE3113C45D for ; Fri, 16 Nov 2007 22:45:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGMj5DB078798 for ; Fri, 16 Nov 2007 22:45:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGMj3Gh078791 for perforce@freebsd.org; Fri, 16 Nov 2007 22:45:03 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 16 Nov 2007 22:45:03 GMT Message-Id: <200711162245.lAGMj3Gh078791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 22:45:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=129139 Change 129139 by kmacy@kmacy:storage:toestack on 2007/11/16 22:44:38 IFethng 129134 Affected files ... .. //depot/projects/toestack/ObsoleteFiles.inc#6 integrate .. //depot/projects/toestack/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/toestack/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/toestack/etc/etc.amd64/ttys#2 integrate .. //depot/projects/toestack/etc/etc.arm/ttys#2 integrate .. //depot/projects/toestack/etc/etc.i386/ttys#2 integrate .. //depot/projects/toestack/etc/etc.ia64/ttys#2 integrate .. //depot/projects/toestack/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/toestack/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/toestack/etc/freebsd-update.conf#2 integrate .. //depot/projects/toestack/etc/rc.d/hostapd#2 integrate .. //depot/projects/toestack/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/toestack/lib/libsdp/search.c#2 integrate .. //depot/projects/toestack/release/Makefile#4 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/toestack/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/toestack/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/toestack/release/picobsd/build/Makefile.conf#2 integrate .. //depot/projects/toestack/release/picobsd/build/picobsd#2 integrate .. //depot/projects/toestack/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/toestack/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/toestack/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/toestack/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/toestack/share/man/man4/Makefile#5 integrate .. //depot/projects/toestack/share/man/man4/asmc.4#1 branch .. //depot/projects/toestack/share/man/man4/ipw.4#2 integrate .. //depot/projects/toestack/share/man/man4/iwi.4#2 integrate .. //depot/projects/toestack/share/man/man4/wlan.4#4 integrate .. //depot/projects/toestack/share/man/man4/wpi.4#2 integrate .. //depot/projects/toestack/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/toestack/share/man/man9/Makefile#8 integrate .. //depot/projects/toestack/share/man/man9/rmlock.9#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/toestack/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/toestack/sys/arm/arm/trap.c#2 integrate .. //depot/projects/toestack/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/toestack/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/toestack/sys/conf/files.amd64#7 integrate .. //depot/projects/toestack/sys/conf/files.i386#6 integrate .. //depot/projects/toestack/sys/conf/files.pc98#3 integrate .. //depot/projects/toestack/sys/conf/kmod.mk#2 integrate .. //depot/projects/toestack/sys/dev/agp/agp.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/toestack/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/toestack/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/toestack/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/toestack/sys/dev/an/if_an.c#3 integrate .. //depot/projects/toestack/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/toestack/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/toestack/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/toestack/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/toestack/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/toestack/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/toestack/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/toestack/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/toestack/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/toestack/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/toestack/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/toestack/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/toestack/sys/dev/pci/pci.c#3 integrate .. //depot/projects/toestack/sys/dev/re/if_re.c#2 integrate .. //depot/projects/toestack/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/toestack/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/toestack/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/toestack/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/toestack/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/toestack/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/toestack/sys/i386/bios/apm.c#3 integrate .. //depot/projects/toestack/sys/i386/i386/locore.s#2 integrate .. //depot/projects/toestack/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/toestack/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/toestack/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/toestack/sys/i386/i386/trap.c#2 integrate .. //depot/projects/toestack/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/toestack/sys/i386/include/pmap.h#2 integrate .. //depot/projects/toestack/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/toestack/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/toestack/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/toestack/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_clock.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_exec.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_fork.c#6 integrate .. //depot/projects/toestack/sys/kern/kern_kse.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_lock.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_proc.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_switch.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_sx.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_synch.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_thr.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_thread.c#5 integrate .. //depot/projects/toestack/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/toestack/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/toestack/sys/kern/sched_ule.c#7 integrate .. //depot/projects/toestack/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/toestack/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/toestack/sys/kern/subr_trap.c#3 integrate .. //depot/projects/toestack/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/toestack/sys/kern/subr_witness.c#4 integrate .. //depot/projects/toestack/sys/kern/sys_generic.c#2 integrate .. //depot/projects/toestack/sys/modules/agp/Makefile#2 integrate .. //depot/projects/toestack/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/toestack/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/toestack/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/toestack/sys/netipsec/keysock.c#2 integrate .. //depot/projects/toestack/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/toestack/sys/pci/agp.c#3 delete .. //depot/projects/toestack/sys/pci/agp_ali.c#3 delete .. //depot/projects/toestack/sys/pci/agp_amd.c#3 delete .. //depot/projects/toestack/sys/pci/agp_amd64.c#3 delete .. //depot/projects/toestack/sys/pci/agp_ati.c#3 delete .. //depot/projects/toestack/sys/pci/agp_i810.c#4 delete .. //depot/projects/toestack/sys/pci/agp_if.m#2 delete .. //depot/projects/toestack/sys/pci/agp_intel.c#3 delete .. //depot/projects/toestack/sys/pci/agp_nvidia.c#3 delete .. //depot/projects/toestack/sys/pci/agp_sis.c#3 delete .. //depot/projects/toestack/sys/pci/agp_via.c#4 delete .. //depot/projects/toestack/sys/pci/agppriv.h#3 delete .. //depot/projects/toestack/sys/pci/agpreg.h#2 delete .. //depot/projects/toestack/sys/pci/agpvar.h#2 delete .. //depot/projects/toestack/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/toestack/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/toestack/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/toestack/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/toestack/sys/sys/eventhandler.h#2 integrate .. //depot/projects/toestack/sys/sys/param.h#9 integrate .. //depot/projects/toestack/sys/sys/proc.h#6 integrate .. //depot/projects/toestack/tools/regression/priv/Makefile#3 integrate .. //depot/projects/toestack/tools/regression/priv/main.c#3 integrate .. //depot/projects/toestack/tools/regression/priv/main.h#3 integrate .. //depot/projects/toestack/tools/regression/priv/priv_netinet_ipsec.c#1 branch .. //depot/projects/toestack/tools/sched/schedgraph.py#2 integrate .. //depot/projects/toestack/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/toestack/usr.bin/tee/tee.1#2 integrate .. //depot/projects/toestack/usr.bin/write/write.c#2 integrate .. //depot/projects/toestack/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/toestack/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate .. //depot/projects/toestack/usr.sbin/pciconf/cap.c#4 integrate Differences ... ==== //depot/projects/toestack/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,12 @@ # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf +# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=rescue/bsdlabel +OLD_FILES+=rescue/fdisk +OLD_FILES+=rescue/gpt +.endif # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/toestack/contrib/gdb/gdb/i386fbsd-nat.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ #ifdef KERN_PS_STRINGS { int mib[2]; - int ps_strings; + u_long ps_strings; size_t len; mib[0] = CTL_KERN; ==== //depot/projects/toestack/etc/etc.amd64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.12 2007/11/15 16:22:58 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/toestack/etc/etc.arm/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.4 2007/08/12 17:13:06 cognet Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.5 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network +pts/237 none network +pts/238 none network +pts/239 none network +pts/240 none network +pts/241 none network +pts/242 none network +pts/243 none network +pts/244 none network +pts/245 none network +pts/246 none network +pts/247 none network +pts/248 none network +pts/249 none network +pts/250 none network +pts/251 none network +pts/252 none network +pts/253 none network +pts/254 none network +pts/255 none network ==== //depot/projects/toestack/etc/etc.i386/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.12 2007/11/15 16:22:59 rwatson Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +pts/0 none network +pts/1 none network +pts/2 none network +pts/3 none network +pts/4 none network +pts/5 none network +pts/6 none network +pts/7 none network +pts/8 none network +pts/9 none network +pts/10 none network +pts/11 none network +pts/12 none network +pts/13 none network +pts/14 none network +pts/15 none network +pts/16 none network +pts/17 none network +pts/18 none network +pts/19 none network +pts/20 none network +pts/21 none network +pts/22 none network +pts/23 none network +pts/24 none network +pts/25 none network +pts/26 none network +pts/27 none network +pts/28 none network +pts/29 none network +pts/30 none network +pts/31 none network +pts/32 none network +pts/33 none network +pts/34 none network +pts/35 none network +pts/36 none network +pts/37 none network +pts/38 none network +pts/39 none network +pts/40 none network +pts/41 none network +pts/42 none network +pts/43 none network +pts/44 none network +pts/45 none network +pts/46 none network +pts/47 none network +pts/48 none network +pts/49 none network +pts/50 none network +pts/51 none network +pts/52 none network +pts/53 none network +pts/54 none network +pts/55 none network +pts/56 none network +pts/57 none network +pts/58 none network +pts/59 none network +pts/60 none network +pts/61 none network +pts/62 none network +pts/63 none network +pts/64 none network +pts/65 none network +pts/66 none network +pts/67 none network +pts/68 none network +pts/69 none network +pts/70 none network +pts/71 none network +pts/72 none network +pts/73 none network +pts/74 none network +pts/75 none network +pts/76 none network +pts/77 none network +pts/78 none network +pts/79 none network +pts/80 none network +pts/81 none network +pts/82 none network +pts/83 none network +pts/84 none network +pts/85 none network +pts/86 none network +pts/87 none network +pts/88 none network +pts/89 none network +pts/90 none network +pts/91 none network +pts/92 none network +pts/93 none network +pts/94 none network +pts/95 none network +pts/96 none network +pts/97 none network +pts/98 none network +pts/99 none network +pts/100 none network +pts/101 none network +pts/102 none network +pts/103 none network +pts/104 none network +pts/105 none network +pts/106 none network +pts/107 none network +pts/108 none network +pts/109 none network +pts/110 none network +pts/111 none network +pts/112 none network +pts/113 none network +pts/114 none network +pts/115 none network +pts/116 none network +pts/117 none network +pts/118 none network +pts/119 none network +pts/120 none network +pts/121 none network +pts/122 none network +pts/123 none network +pts/124 none network +pts/125 none network +pts/126 none network +pts/127 none network +pts/128 none network +pts/129 none network +pts/130 none network +pts/131 none network +pts/132 none network +pts/133 none network +pts/134 none network +pts/135 none network +pts/136 none network +pts/137 none network +pts/138 none network +pts/139 none network +pts/140 none network +pts/141 none network +pts/142 none network +pts/143 none network +pts/144 none network +pts/145 none network +pts/146 none network +pts/147 none network +pts/148 none network +pts/149 none network +pts/150 none network +pts/151 none network +pts/152 none network +pts/153 none network +pts/154 none network +pts/155 none network +pts/156 none network +pts/157 none network +pts/158 none network +pts/159 none network +pts/160 none network +pts/161 none network +pts/162 none network +pts/163 none network +pts/164 none network +pts/165 none network +pts/166 none network +pts/167 none network +pts/168 none network +pts/169 none network +pts/170 none network +pts/171 none network +pts/172 none network +pts/173 none network +pts/174 none network +pts/175 none network +pts/176 none network +pts/177 none network +pts/178 none network +pts/179 none network +pts/180 none network +pts/181 none network +pts/182 none network +pts/183 none network +pts/184 none network +pts/185 none network +pts/186 none network +pts/187 none network +pts/188 none network +pts/189 none network +pts/190 none network +pts/191 none network +pts/192 none network +pts/193 none network +pts/194 none network +pts/195 none network +pts/196 none network +pts/197 none network +pts/198 none network +pts/199 none network +pts/200 none network +pts/201 none network +pts/202 none network +pts/203 none network +pts/204 none network +pts/205 none network +pts/206 none network +pts/207 none network +pts/208 none network +pts/209 none network +pts/210 none network +pts/211 none network +pts/212 none network +pts/213 none network +pts/214 none network +pts/215 none network +pts/216 none network +pts/217 none network +pts/218 none network +pts/219 none network +pts/220 none network +pts/221 none network +pts/222 none network +pts/223 none network +pts/224 none network +pts/225 none network +pts/226 none network +pts/227 none network +pts/228 none network +pts/229 none network +pts/230 none network +pts/231 none network +pts/232 none network +pts/233 none network +pts/234 none network +pts/235 none network +pts/236 none network >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 16 23:16:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCC2816A46B; Fri, 16 Nov 2007 23:16:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45CDA16A420 for ; Fri, 16 Nov 2007 23:16:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31A1C13C458 for ; Fri, 16 Nov 2007 23:16:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGNGcgH081349 for ; Fri, 16 Nov 2007 23:16:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGNGcYx081346 for perforce@freebsd.org; Fri, 16 Nov 2007 23:16:38 GMT (envelope-from jb@freebsd.org) Date: Fri, 16 Nov 2007 23:16:38 GMT Message-Id: <200711162316.lAGNGcYx081346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Nov 2007 23:16:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=129140 Change 129140 by jb@jb_freebsd1 on 2007/11/16 23:15:37 Reset to match current Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#25 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#25 (text+ko) ==== @@ -67,10 +67,10 @@ options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -#options INVARIANTS # Enable calls of extra sanity checking -#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS # Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel @@ -267,39 +267,39 @@ device bpf # Berkeley packet filter # USB support -#device uhci # UHCI PCI->USB interface -#device ohci # OHCI PCI->USB interface -#device ehci # EHCI PCI->USB interface (USB 2.0) -#device usb # USB Bus (required) +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -#device ugen # Generic -#device uhid # "Human Interface Devices" -#device ukbd # Keyboard -#device ulpt # Printer -#device umass # Disks/Mass storage - Requires scbus and da -#device ums # Mouse -#device ural # Ralink Technology RT2500USB wireless NICs -#device rum # Ralink Technology RT2501USB wireless NICs -#device urio # Diamond Rio 500 MP3 player -#device uscanner # Scanners +device ugen # Generic +device uhid # "Human Interface Devices" +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +device ural # Ralink Technology RT2500USB wireless NICs +device rum # Ralink Technology RT2501USB wireless NICs +device urio # Diamond Rio 500 MP3 player +device uscanner # Scanners # USB Serial devices -#device ucom # Generic com ttys -#device uark # Technologies ARK3116 based serial adapters -#device ubsa # Belkin F5U103 and compatible serial adapters -#device ubser # BWCT console serial adapters -#device uftdi # For FTDI usb serial adapters -#device uipaq # Some WinCE based devices -#device uplcom # Prolific PL-2303 serial adapters -#device uvisor # Visor and Palm devices -#device uvscom # USB serial support for DDI pocket's PHS +device ucom # Generic com ttys +device uark # Technologies ARK3116 based serial adapters +device ubsa # Belkin F5U103 and compatible serial adapters +device ubser # BWCT console serial adapters +device uftdi # For FTDI usb serial adapters +device uipaq # Some WinCE based devices +device uplcom # Prolific PL-2303 serial adapters +device uvisor # Visor and Palm devices +device uvscom # USB serial support for DDI pocket's PHS # USB Ethernet, requires miibus -#device aue # ADMtek USB Ethernet -#device axe # ASIX Electronics USB Ethernet -#device cdce # Generic USB over Ethernet -#device cue # CATC USB Ethernet -#device kue # Kawasaki LSI USB Ethernet -#device rue # RealTek RTL8150 USB Ethernet -#device udav # Davicom DM9601E USB +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cdce # Generic USB over Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet +device rue # RealTek RTL8150 USB Ethernet +device udav # Davicom DM9601E USB # FireWire support device firewire # FireWire bus code From owner-p4-projects@FreeBSD.ORG Sat Nov 17 00:05:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 305A916A468; Sat, 17 Nov 2007 00:05:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA8A316A418 for ; Sat, 17 Nov 2007 00:05:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B64A613C447 for ; Sat, 17 Nov 2007 00:05:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH05UwN084989 for ; Sat, 17 Nov 2007 00:05:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH05Ubl084986 for perforce@freebsd.org; Sat, 17 Nov 2007 00:05:30 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 00:05:30 GMT Message-Id: <200711170005.lAH05Ubl084986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 00:05:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=129141 Change 129141 by jb@jb_freebsd1 on 2007/11/17 00:05:01 Make the DTrace kernel hooks optional. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#52 edit .. //depot/projects/dtrace/src/sys/conf/options#30 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#52 (text+ko) ==== @@ -1418,7 +1418,7 @@ kern/kern_cpu.c standard kern/kern_context.c standard kern/kern_descrip.c standard -kern/kern_dtrace.c standard +kern/kern_dtrace.c optional kdtrace_hooks kern/kern_environment.c standard kern/kern_event.c standard kern/kern_exec.c standard ==== //depot/projects/dtrace/src/sys/conf/options#30 (text+ko) ==== @@ -99,6 +99,7 @@ GEOM_VIRSTOR opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h +KDTRACE_HOOKS opt_kdtrace.h KSE opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES From owner-p4-projects@FreeBSD.ORG Sat Nov 17 00:07:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FA7916A419; Sat, 17 Nov 2007 00:07:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C170416A417 for ; Sat, 17 Nov 2007 00:07:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9567713C469 for ; Sat, 17 Nov 2007 00:07:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH07X2n085188 for ; Sat, 17 Nov 2007 00:07:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH07X0Z085185 for perforce@freebsd.org; Sat, 17 Nov 2007 00:07:33 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 00:07:33 GMT Message-Id: <200711170007.lAH07X0Z085185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 00:07:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=129142 Change 129142 by jb@jb_freebsd1 on 2007/11/17 00:06:32 The great Fred Flintstone once said: Yabba Dabba Doo. What he really meant was: ohci sucks on a Dell 531S. :-) Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/YABBA#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Nov 17 00:10:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF36116A41A; Sat, 17 Nov 2007 00:10:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 625FF16A421 for ; Sat, 17 Nov 2007 00:10:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D66913C46A for ; Sat, 17 Nov 2007 00:10:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH0AaXs085321 for ; Sat, 17 Nov 2007 00:10:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH0AaNb085318 for perforce@freebsd.org; Sat, 17 Nov 2007 00:10:36 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 00:10:36 GMT Message-Id: <200711170010.lAH0AaNb085318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 00:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=129143 Change 129143 by jb@jb_freebsd1 on 2007/11/17 00:10:35 Add the kernel DTrace hooks option. Affected files ... .. //depot/projects/dtrace/src/sys/conf/NOTES#31 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/NOTES#31 (text+ko) ==== @@ -353,6 +353,12 @@ options GDB # +# Enable the kernel DTrace hooks which are required to load the DTrace +# kernel modules. +# +options KDTRACE_HOOKS + +# # SYSCTL_DEBUG enables a 'sysctl' debug tree that can be used to dump the # contents of the registered sysctl nodes on the console. It is disabled by # default because it generates excessively verbose console output that can From owner-p4-projects@FreeBSD.ORG Sat Nov 17 01:19:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4798F16A4E9; Sat, 17 Nov 2007 01:19:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4677116A47C for ; Sat, 17 Nov 2007 01:19:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 184E713C502 for ; Sat, 17 Nov 2007 01:19:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH1JqVI097795 for ; Sat, 17 Nov 2007 01:19:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH1JqLU097792 for perforce@freebsd.org; Sat, 17 Nov 2007 01:19:52 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 01:19:52 GMT Message-Id: <200711170119.lAH1JqLU097792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 01:19:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=129144 Change 129144 by jb@jb_freebsd1 on 2007/11/17 01:19:23 MFC proc0/thread0 event handler calls. Affected files ... .. //depot/projects/dtrace7/src/sys/kern/init_main.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/init_main.c#2 (text+ko) ==== @@ -487,6 +487,11 @@ p->p_sysent->sv_maxuser); vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0); + EVENTHANDLER_INVOKE(process_ctor, p); + EVENTHANDLER_INVOKE(process_init, p); + EVENTHANDLER_INVOKE(thread_ctor, td); + EVENTHANDLER_INVOKE(thread_init, td); + /* * Charge root for one process. */ From owner-p4-projects@FreeBSD.ORG Sat Nov 17 01:20:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD48616A469; Sat, 17 Nov 2007 01:20:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82E8516A41B for ; Sat, 17 Nov 2007 01:20:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6ED0313C45A for ; Sat, 17 Nov 2007 01:20:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH1Ksdg097916 for ; Sat, 17 Nov 2007 01:20:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH1Ksbs097913 for perforce@freebsd.org; Sat, 17 Nov 2007 01:20:54 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 01:20:54 GMT Message-Id: <200711170120.lAH1Ksbs097913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 01:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=129145 Change 129145 by jb@jb_freebsd1 on 2007/11/17 01:20:01 Add the kernel DTrace hooks option. Affected files ... .. //depot/projects/dtrace7/src/sys/conf/NOTES#2 edit .. //depot/projects/dtrace7/src/sys/conf/files#2 edit .. //depot/projects/dtrace7/src/sys/conf/options#2 edit .. //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#1 add .. //depot/projects/dtrace7/src/sys/sys/kernel.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/conf/NOTES#2 (text+ko) ==== @@ -353,6 +353,12 @@ options GDB # +# Enable the kernel DTrace hooks which are required to load the DTrace +# kernel modules. +# +options KDTRACE_HOOKS + +# # SYSCTL_DEBUG enables a 'sysctl' debug tree that can be used to dump the # contents of the registered sysctl nodes on the console. It is disabled by # default because it generates excessively verbose console output that can ==== //depot/projects/dtrace7/src/sys/conf/files#2 (text+ko) ==== @@ -1415,6 +1415,7 @@ kern/kern_cpu.c standard kern/kern_context.c standard kern/kern_descrip.c standard +kern/kern_dtrace.c optional kdtrace_hooks kern/kern_environment.c standard kern/kern_event.c standard kern/kern_exec.c standard ==== //depot/projects/dtrace7/src/sys/conf/options#2 (text+ko) ==== @@ -99,6 +99,7 @@ GEOM_VIRSTOR opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h +KDTRACE_HOOKS opt_kdtrace.h KSE opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES ==== //depot/projects/dtrace7/src/sys/sys/kernel.h#2 (text+ko) ==== @@ -115,6 +115,7 @@ SI_SUB_EVENTHANDLER = 0x1C00000, /* eventhandler init */ SI_SUB_KLD = 0x2000000, /* KLD and module setup */ SI_SUB_CPU = 0x2100000, /* CPU resource(s)*/ + SI_SUB_KDTRACE = 0x2140000, /* Kernel dtrace hooks */ SI_SUB_MAC = 0x2180000, /* TrustedBSD MAC subsystem */ SI_SUB_MAC_POLICY = 0x21C0000, /* TrustedBSD MAC policies */ SI_SUB_MAC_LATE = 0x21D0000, /* TrustedBSD MAC subsystem */ From owner-p4-projects@FreeBSD.ORG Sat Nov 17 01:22:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECAEA16A468; Sat, 17 Nov 2007 01:22:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B040416A4DE for ; Sat, 17 Nov 2007 01:22:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B38813C44B for ; Sat, 17 Nov 2007 01:22:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH1M0pl097995 for ; Sat, 17 Nov 2007 01:22:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH1LtR6097988 for perforce@freebsd.org; Sat, 17 Nov 2007 01:21:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 01:21:55 GMT Message-Id: <200711170121.lAH1LtR6097988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 01:22:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=129146 Change 129146 by jb@jb_freebsd1 on 2007/11/17 01:21:53 IF7 Affected files ... .. //depot/projects/dtrace7/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/dtrace7/src/release/Makefile#2 integrate Differences ... ==== //depot/projects/dtrace7/src/lib/libc/net/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.69 2007/06/12 22:32:52 ache Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.69.2.1 2007/11/16 07:18:12 ru Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -12,7 +12,7 @@ getproto.c getprotoent.c getprotoname.c getservent.c \ if_indextoname.c if_nameindex.c if_nametoindex.c \ ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ - nsdispatch.c nslexer.c nsparser.c nss_compat.c \ + nsdispatch.c nslexer.c nsparser.y nss_compat.c \ rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \ sockatmark.c sourcefilter.c vars.c @@ -34,12 +34,9 @@ YFLAGS+=-p_nsyy LFLAGS+=-P_nsyy -CLEANFILES+=nsparser.c nslexer.c nsparser.h +CLEANFILES+=nslexer.c -nsparser.h: nsparser.c - mv y.tab.h ${.TARGET} - -nslexer.c: nslexer.l nsparser.h +nslexer.c: nslexer.l ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} ==== //depot/projects/dtrace7/src/release/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.924.2.1 2007/10/11 06:22:30 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.924.2.2 2007/11/16 13:33:38 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -192,6 +192,7 @@ .undef MAKE_FLOPPIES .if ${TARGET_ARCH} == "i386" MAKE_FLOPPIES= true +SEPARATE_LIVEFS= SPLIT_MFSROOT= .if ${TARGET} == "pc98" SMALLFLOPPYSIZE= 1200 From owner-p4-projects@FreeBSD.ORG Sat Nov 17 01:25:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BFE416A41A; Sat, 17 Nov 2007 01:25:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26C5D16A418 for ; Sat, 17 Nov 2007 01:25:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF78E13C448 for ; Sat, 17 Nov 2007 01:25:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH1P3Zi098115 for ; Sat, 17 Nov 2007 01:25:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH1P389098112 for perforce@freebsd.org; Sat, 17 Nov 2007 01:25:03 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 01:25:03 GMT Message-Id: <200711170125.lAH1P389098112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 01:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=129147 Change 129147 by jb@jb_freebsd1 on 2007/11/17 01:24:12 Add the kernel DTrace hooks option by default. It's BSD only. Affected files ... .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -62,6 +62,7 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing +options KDTRACE_HOOKS # Kernel DTrace hooks # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel From owner-p4-projects@FreeBSD.ORG Sat Nov 17 02:00:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D30016A46C; Sat, 17 Nov 2007 02:00:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 094B116A469 for ; Sat, 17 Nov 2007 02:00:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0A1613C468 for ; Sat, 17 Nov 2007 02:00:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH20gQ4099438 for ; Sat, 17 Nov 2007 02:00:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH20gVf099435 for perforce@freebsd.org; Sat, 17 Nov 2007 02:00:42 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 02:00:42 GMT Message-Id: <200711170200.lAH20gVf099435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 02:00:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=129148 Change 129148 by kmacy@kmacy_home:ethng on 2007/11/17 02:00:24 remove unused ifnet entry points Affected files ... .. //depot/projects/ethng/src/sys/net/if.c#5 edit .. //depot/projects/ethng/src/sys/net/if_var.h#7 edit Differences ... ==== //depot/projects/ethng/src/sys/net/if.c#5 (text+ko) ==== @@ -2680,9 +2680,6 @@ return (retval); } -#ifdef IFNET_MULTIQUEUE -int ifnet_multiqueue = 1; - int if_mq_start(struct ifnet *ifp, struct mbuf *m) { @@ -2692,30 +2689,6 @@ return (*(ifp)->if_mq_start)(ifp, m); } - -int -if_mq_enqueue_packet(struct ifnet *ifp, struct mbuf *m) -{ - - KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - - return (*(ifp)->if_mq_enqueue_packet)(ifp, m); -} - -int32_t -if_mq_get_cookie(struct ifnet *ifp, struct in6_addr *lip, uint16_t lport, struct in6_addr *rip, uint16_t rport, int ipv6) -{ - - KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - - return (*(ifp)->if_mq_get_cookie)(ifp, lip, lport, rip, rport, ipv6); -} -#else -int ifnet_multiqueue = 0; -#endif - - - /* * When an interface is marked IFF_NEEDSGIANT, its if_start() routine cannot * be called without Giant. However, we often can't acquire the Giant lock ==== //depot/projects/ethng/src/sys/net/if_var.h#7 (text+ko) ==== @@ -156,6 +156,8 @@ (struct ifnet *, struct mbuf *); void (*if_start) /* initiate output routine */ (struct ifnet *); + int (*if_mq_start) /* initiate output routine with immediate */ + (struct ifnet *, struct mbuf *); int (*if_ioctl) /* ioctl routine */ (struct ifnet *, u_long, caddr_t); void (*if_watchdog) /* timer routine */ @@ -192,12 +194,6 @@ void *if_pf_kif; void *if_lagg; /* lagg glue */ #ifdef IFNET_MULTIQUEUE - int (*if_mq_start) /* initiate output routine with immediate */ - (struct ifnet *, struct mbuf *); - int (*if_mq_enqueue_packet) /* enqueue packet to the appropriate queue */ - (struct ifnet *, struct mbuf *); - int32_t (*if_mq_get_cookie) /* calculate the txq cookie for this connection */ - (struct ifnet *, struct in6_addr *, uint16_t, struct in6_addr *, uint16_t, int); #endif }; From owner-p4-projects@FreeBSD.ORG Sat Nov 17 03:30:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B166016A41A; Sat, 17 Nov 2007 03:30:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 544EB16A418 for ; Sat, 17 Nov 2007 03:30:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 407BA13C448 for ; Sat, 17 Nov 2007 03:30:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH3UJVU005125 for ; Sat, 17 Nov 2007 03:30:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH3UJNv005122 for perforce@freebsd.org; Sat, 17 Nov 2007 03:30:19 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 03:30:19 GMT Message-Id: <200711170330.lAH3UJNv005122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 03:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=129149 Change 129149 by kmacy@kmacy:storage:toestack on 2007/11/17 03:29:49 IFethng 129148 Affected files ... .. //depot/projects/toestack/sys/net/if.c#3 integrate .. //depot/projects/toestack/sys/net/if_var.h#4 integrate Differences ... ==== //depot/projects/toestack/sys/net/if.c#3 (text+ko) ==== @@ -2680,9 +2680,6 @@ return (retval); } -#ifdef IFNET_MULTIQUEUE -int ifnet_multiqueue = 1; - int if_mq_start(struct ifnet *ifp, struct mbuf *m) { @@ -2692,30 +2689,6 @@ return (*(ifp)->if_mq_start)(ifp, m); } - -int -if_mq_enqueue_packet(struct ifnet *ifp, struct mbuf *m) -{ - - KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - - return (*(ifp)->if_mq_enqueue_packet)(ifp, m); -} - -int32_t -if_mq_get_cookie(struct ifnet *ifp, struct in6_addr *lip, uint16_t lport, struct in6_addr *rip, uint16_t rport, int ipv6) -{ - - KASSERT((ifp->if_flags & IFF_NEEDSGIANT) == 0, ("IFF_NEEDSGIANT set on multi queue interface")); - - return (*(ifp)->if_mq_get_cookie)(ifp, lip, lport, rip, rport, ipv6); -} -#else -int ifnet_multiqueue = 0; -#endif - - - /* * When an interface is marked IFF_NEEDSGIANT, its if_start() routine cannot * be called without Giant. However, we often can't acquire the Giant lock ==== //depot/projects/toestack/sys/net/if_var.h#4 (text+ko) ==== @@ -156,6 +156,8 @@ (struct ifnet *, struct mbuf *); void (*if_start) /* initiate output routine */ (struct ifnet *); + int (*if_mq_start) /* initiate output routine with immediate */ + (struct ifnet *, struct mbuf *); int (*if_ioctl) /* ioctl routine */ (struct ifnet *, u_long, caddr_t); void (*if_watchdog) /* timer routine */ @@ -192,12 +194,6 @@ void *if_pf_kif; void *if_lagg; /* lagg glue */ #ifdef IFNET_MULTIQUEUE - int (*if_mq_start) /* initiate output routine with immediate */ - (struct ifnet *, struct mbuf *); - int (*if_mq_enqueue_packet) /* enqueue packet to the appropriate queue */ - (struct ifnet *, struct mbuf *); - int32_t (*if_mq_get_cookie) /* calculate the txq cookie for this connection */ - (struct ifnet *, struct in6_addr *, uint16_t, struct in6_addr *, uint16_t, int); #endif }; From owner-p4-projects@FreeBSD.ORG Sat Nov 17 03:48:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C97D216A421; Sat, 17 Nov 2007 03:48:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 702DF16A419 for ; Sat, 17 Nov 2007 03:48:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43F6013C474 for ; Sat, 17 Nov 2007 03:48:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH3meUi005884 for ; Sat, 17 Nov 2007 03:48:40 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH3me4g005881 for perforce@freebsd.org; Sat, 17 Nov 2007 03:48:40 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 03:48:40 GMT Message-Id: <200711170348.lAH3me4g005881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 03:48:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=129150 Change 129150 by jb@jb_freebsd1 on 2007/11/17 03:47:48 "GENERIC" for my Dell 531S Affected files ... .. //depot/projects/dtrace7/src/sys/amd64/conf/YABBA#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Nov 17 03:54:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51D7016A41B; Sat, 17 Nov 2007 03:54:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B61F016A418 for ; Sat, 17 Nov 2007 03:54:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89FC513C467 for ; Sat, 17 Nov 2007 03:54:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH3slbG006145 for ; Sat, 17 Nov 2007 03:54:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH3sldB006142 for perforce@freebsd.org; Sat, 17 Nov 2007 03:54:47 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 03:54:47 GMT Message-Id: <200711170354.lAH3sldB006142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 03:54:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=129151 Change 129151 by jb@jb_freebsd1 on 2007/11/17 03:54:33 Remove header which isn't required here. Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #define KDTRACE_PROC_SIZE 64 #define KDTRACE_PROC_ZERO 8 From owner-p4-projects@FreeBSD.ORG Sat Nov 17 03:55:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3947F16A419; Sat, 17 Nov 2007 03:55:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F337E16A417 for ; Sat, 17 Nov 2007 03:55:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C732C13C461 for ; Sat, 17 Nov 2007 03:55:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH3tmtt006221 for ; Sat, 17 Nov 2007 03:55:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH3tmhD006218 for perforce@freebsd.org; Sat, 17 Nov 2007 03:55:48 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 03:55:48 GMT Message-Id: <200711170355.lAH3tmhD006218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 03:55:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=129152 Change 129152 by jb@jb_freebsd1 on 2007/11/17 03:55:15 Remove header which isn't required here. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#3 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #define KDTRACE_PROC_SIZE 64 #define KDTRACE_PROC_ZERO 8 From owner-p4-projects@FreeBSD.ORG Sat Nov 17 04:07:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47FA016A46C; Sat, 17 Nov 2007 04:07:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 952DF16A417 for ; Sat, 17 Nov 2007 04:07:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 800BC13C447 for ; Sat, 17 Nov 2007 04:07:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH47177007797 for ; Sat, 17 Nov 2007 04:07:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH471jq007794 for perforce@freebsd.org; Sat, 17 Nov 2007 04:07:01 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 04:07:01 GMT Message-Id: <200711170407.lAH471jq007794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 04:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=129153 Change 129153 by jb@jb_freebsd1 on 2007/11/17 04:06:07 Add the private pointers to structs proc and thread. Affected files ... .. //depot/projects/dtrace7/src/sys/sys/proc.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/sys/proc.h#2 (text+ko) ==== @@ -163,6 +163,8 @@ struct trapframe; struct turnstile; struct mqueue_notifier; +struct kdtrace_proc; +struct kdtrace_thread; /* * Here we define the two structures used for process information. @@ -298,6 +300,7 @@ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ int td_syscalls; /* per-thread syscall count (used by NFS :)) */ + struct kdtrace_thread *td_dtrace; /* (*) DTrace-specific data. */ }; struct mtx *thread_lock_block(struct thread *); @@ -581,6 +584,7 @@ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ + struct kdtrace_proc *p_dtrace; /* (*) DTrace-specific data. */ }; #define p_session p_pgrp->pg_session From owner-p4-projects@FreeBSD.ORG Sat Nov 17 04:16:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1CD116A420; Sat, 17 Nov 2007 04:16:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64B1C16A41B for ; Sat, 17 Nov 2007 04:16:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CFA513C458 for ; Sat, 17 Nov 2007 04:16:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH4GBcZ008148 for ; Sat, 17 Nov 2007 04:16:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH4GBWW008145 for perforce@freebsd.org; Sat, 17 Nov 2007 04:16:11 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 04:16:11 GMT Message-Id: <200711170416.lAH4GBWW008145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 04:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=129154 Change 129154 by jb@jb_freebsd1 on 2007/11/17 04:16:08 Now I see why I needed this header. Oops. Heh. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#4 edit .. //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#3 edit .. //depot/projects/dtrace7/src/sys/sys/dtrace_bsd.h#1 add Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#4 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #define KDTRACE_PROC_SIZE 64 #define KDTRACE_PROC_ZERO 8 ==== //depot/projects/dtrace7/src/sys/kern/kern_dtrace.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #define KDTRACE_PROC_SIZE 64 #define KDTRACE_PROC_ZERO 8 From owner-p4-projects@FreeBSD.ORG Sat Nov 17 05:32:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAE7016A46C; Sat, 17 Nov 2007 05:32:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B12B16A469 for ; Sat, 17 Nov 2007 05:32:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C42513C448 for ; Sat, 17 Nov 2007 05:32:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH5WZAd020939 for ; Sat, 17 Nov 2007 05:32:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH5WZJx020936 for perforce@freebsd.org; Sat, 17 Nov 2007 05:32:35 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 05:32:35 GMT Message-Id: <200711170532.lAH5WZJx020936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 05:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=129155 Change 129155 by jb@jb_freebsd1 on 2007/11/17 05:32:11 IF6 Affected files ... .. //depot/projects/dtrace6/src/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/dtrace6/src/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_socket.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/contrib/binutils/gas/as.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* as.h - global header file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -397,6 +397,22 @@ /* Enough bits for address, but still an integer type. Could be a problem, cross-assembling for 64-bit machines. */ typedef addressT relax_addressT; + +struct relax_type +{ + /* Forward reach. Signed number. > 0. */ + offsetT rlx_forward; + /* Backward reach. Signed number. < 0. */ + offsetT rlx_backward; + + /* Bytes length of this address. */ + unsigned char rlx_length; + + /* Next longer relax-state. 0 means there is no 'next' relax-state. */ + relax_substateT rlx_more; +}; + +typedef struct relax_type relax_typeS; /* main program "as.c" (command arguments etc) */ ==== //depot/projects/dtrace6/src/contrib/binutils/gas/tc.h#2 (text+ko) ==== @@ -24,25 +24,6 @@ extern const pseudo_typeS md_pseudo_table[]; -/* JF moved this here from as.h under the theory that nobody except MACHINE.c - and write.c care about it anyway. */ - -struct relax_type -{ - /* Forward reach. Signed number. > 0. */ - long rlx_forward; - /* Backward reach. Signed number. < 0. */ - long rlx_backward; - - /* Bytes length of this address. */ - unsigned char rlx_length; - - /* Next longer relax-state. 0 means there is no 'next' relax-state. */ - relax_substateT rlx_more; -}; - -typedef struct relax_type relax_typeS; - extern const int md_reloc_size; /* Size of a relocation record */ char *md_atof (int what_statement_type, char *literalP, int *sizeP); ==== //depot/projects/dtrace6/src/sys/nfsclient/nfs_socket.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.125.2.16 2007/06/28 03:28:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.125.2.17 2007/11/16 21:24:54 ups Exp $"); /* * Socket operations for use by nfs @@ -84,6 +84,7 @@ static int nfs_bufpackets = 4; static int nfs_reconnects; static int nfs3_jukebox_delay = 10; +static int nfs_skip_wcc_data_onerr = 1; SYSCTL_DECL(_vfs_nfs); @@ -94,7 +95,7 @@ "number of times the nfs client has had to reconnect"); SYSCTL_INT(_vfs_nfs, OID_AUTO, nfs3_jukebox_delay, CTLFLAG_RW, &nfs3_jukebox_delay, 0, "number of seconds to delay a retry after receiving EJUKEBOX"); - +SYSCTL_INT(_vfs_nfs, OID_AUTO, skip_wcc_data_onerr, CTLFLAG_RW, &nfs_skip_wcc_data_onerr, 0, ""); /* * There is a congestion window for outstanding rpcs maintained per mount @@ -1228,7 +1229,12 @@ */ if (error == ESTALE) cache_purge(vp); - if (nmp->nm_flag & NFSMNT_NFSV3) { + /* + * Skip wcc data on NFS errors for now. NetApp filers return corrupt + * postop attrs in the wcc data for NFS err EROFS. Not sure if they + * could return corrupt postop attrs for others errors. + */ + if ((nmp->nm_flag & NFSMNT_NFSV3) && !nfs_skip_wcc_data_onerr) { *mrp = mrep; *mdp = md; *dposp = dpos; From owner-p4-projects@FreeBSD.ORG Sat Nov 17 05:39:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B41916A418; Sat, 17 Nov 2007 05:39:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 442BC16A41A for ; Sat, 17 Nov 2007 05:39:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2ED9813C468 for ; Sat, 17 Nov 2007 05:39:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH5dhBp021183 for ; Sat, 17 Nov 2007 05:39:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH5dgmD021180 for perforce@freebsd.org; Sat, 17 Nov 2007 05:39:42 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 05:39:42 GMT Message-Id: <200711170539.lAH5dgmD021180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 05:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=129156 Change 129156 by jb@jb_freebsd1 on 2007/11/17 05:39:39 IFC Affected files ... .. //depot/projects/dtrace/src/ObsoleteFiles.inc#28 integrate .. //depot/projects/dtrace/src/contrib/less/LICENSE#5 integrate .. //depot/projects/dtrace/src/contrib/less/Makefile.dsm#4 delete .. //depot/projects/dtrace/src/contrib/less/NEWS#8 integrate .. //depot/projects/dtrace/src/contrib/less/README#8 integrate .. //depot/projects/dtrace/src/contrib/less/ch.c#7 integrate .. //depot/projects/dtrace/src/contrib/less/command.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/configure#7 integrate .. //depot/projects/dtrace/src/contrib/less/configure.ac#7 integrate .. //depot/projects/dtrace/src/contrib/less/decode.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/defines.ds#6 integrate .. //depot/projects/dtrace/src/contrib/less/defines.h.in#6 integrate .. //depot/projects/dtrace/src/contrib/less/defines.o2#6 integrate .. //depot/projects/dtrace/src/contrib/less/defines.o9#6 integrate .. //depot/projects/dtrace/src/contrib/less/defines.wn#6 integrate .. //depot/projects/dtrace/src/contrib/less/edit.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/filename.c#7 integrate .. //depot/projects/dtrace/src/contrib/less/funcs.h#7 integrate .. //depot/projects/dtrace/src/contrib/less/less.h#7 integrate .. //depot/projects/dtrace/src/contrib/less/less.man#8 integrate .. //depot/projects/dtrace/src/contrib/less/less.nro#8 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.man#6 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.nro#6 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.man#8 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.nro#8 integrate .. //depot/projects/dtrace/src/contrib/less/line.c#7 integrate .. //depot/projects/dtrace/src/contrib/less/optfunc.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/opttbl.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/screen.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/search.c#7 integrate .. //depot/projects/dtrace/src/contrib/less/tags.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/version.c#8 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#7 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#9 integrate .. //depot/projects/dtrace/src/lib/libsdp/search.c#4 integrate .. //depot/projects/dtrace/src/release/Makefile#14 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/dtrace/src/sbin/mdconfig/mdconfig.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/an/if_an.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/an/if_anreg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/dtrace/src/sys/dev/dc/dcphy.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/amphy.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/nsphy.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/tdkphy.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/mii/ukphy_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/txp/if_txp.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/label/g_label_reiserfs.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_kthread.c#7 integrate .. //depot/projects/dtrace/src/sys/netipsec/keysock.c#8 integrate .. //depot/projects/dtrace/src/tools/regression/priv/Makefile#5 integrate .. //depot/projects/dtrace/src/tools/regression/priv/main.c#5 integrate .. //depot/projects/dtrace/src/tools/regression/priv/main.h#5 integrate .. //depot/projects/dtrace/src/tools/regression/priv/priv_netinet_ipsec.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/less/defines.h#6 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.sh#8 integrate Differences ... ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -16,6 +16,12 @@ # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf +# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=rescue/bsdlabel +OLD_FILES+=rescue/fdisk +OLD_FILES+=rescue/gpt +.endif # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/dtrace/src/contrib/less/LICENSE#5 (text+ko) ==== @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2005 Mark Nudelman +Copyright (C) 1984-2007 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/dtrace/src/contrib/less/NEWS#8 (text+ko) ==== @@ -13,6 +13,17 @@ ====================================================================== + Major changes between "less" versions 409 and 415 + +* New --follow-name option makes F command follow the name of a file + rather than the file descriptor if an open file is renamed. + +* Make searching with -i/-I work correctly with non-ASCII text. + +* Fix DJGPP build. + +====================================================================== + Major changes between "less" versions 406 and 409 * Support CSI escape sequences, like SGR escape sequences. @@ -698,3 +709,4 @@ + ==== //depot/projects/dtrace/src/contrib/less/README#8 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 409 + Less, version 415 - This is the distribution of less, version 409, released 12 Oct 2007. + This is the distribution of less, version 415, released 15 Nov 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/dtrace/src/contrib/less/ch.c#7 (text+ko) ==== @@ -21,6 +21,12 @@ #include #endif +#if HAVE_STAT_INO +#include +extern dev_t curr_dev; +extern ino_t curr_ino; +#endif + typedef POSITION BLOCKNUM; public int ignore_eoi; @@ -98,6 +104,8 @@ extern int autobuf; extern int sigs; extern int secure; +extern int screen_trashed; +extern int follow_mode; extern constant char helpdata[]; extern constant int size_helpdata; extern IFILE curr_ifile; @@ -195,7 +203,7 @@ */ if (!(ch_flags & CH_CANSEEK)) return ('?'); - if (lseek(ch_file, (off_t)pos, 0) == BAD_LSEEK) + if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK) { error("seek error", NULL_PARG); clear_eol(); @@ -276,6 +284,25 @@ #endif #endif slept = TRUE; + +#if HAVE_STAT_INO + if (follow_mode == FOLLOW_NAME) + { + /* See whether the file's i-number has changed. + * If so, force the file to be closed and + * reopened. */ + struct stat st; + int r = stat(get_filename(curr_ifile), &st); + if (r == 0 && (st.st_ino != curr_ino || + st.st_dev != curr_dev)) + { + /* screen_trashed=2 causes + * make_display to reopen the file. */ + screen_trashed = 2; + return (EOI); + } + } +#endif } if (sigs) return (EOI); @@ -648,7 +675,7 @@ } #endif - if (lseek(ch_file, (off_t)0, 0) == BAD_LSEEK) + if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) { /* * Warning only; even if the seek fails for some reason, @@ -711,7 +738,7 @@ while (ch_bufhead != END_OF_CHAIN) { bp = ch_bufhead; - bp->next->prev = bp->prev;; + bp->next->prev = bp->prev; bp->prev->next = bp->next; free(bp); } @@ -737,7 +764,7 @@ return (0); } #endif - return (lseek(f, (off_t)1, 0) != BAD_LSEEK); + return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK); } /* ==== //depot/projects/dtrace/src/contrib/less/command.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.9 2007/11/16 22:24:31 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -558,6 +558,21 @@ } /* + * Discard any buffered file data. + */ + static void +clear_buffers() +{ + if (!(ch_getflags() & CH_CANSEEK)) + return; + ch_flush(); + clr_linenum(); +#if HILITE_SEARCH + clr_hilite(); +#endif +} + +/* * Make sure the screen is displayed. */ static void @@ -580,11 +595,20 @@ jump_loc(initial_scrpos.pos, initial_scrpos.ln); } else if (screen_trashed) { - int save_top_scroll; - save_top_scroll = top_scroll; + int save_top_scroll = top_scroll; + int save_ignore_eoi = ignore_eoi; top_scroll = 1; + ignore_eoi = 0; + if (screen_trashed == 2) + { + /* Special case used by ignore_eoi: re-open the input file + * and jump to the end of the file. */ + reopen_curr_ifile(); + jump_forw(); + } repaint(); top_scroll = save_top_scroll; + ignore_eoi = save_ignore_eoi; } } @@ -1115,7 +1139,10 @@ ignore_eoi = 1; hit_eof = 0; while (!sigs) + { + make_display(); forward(1, 0, 0); + } ignore_eoi = 0; /* * This gets us back in "F mode" after processing @@ -1154,14 +1181,7 @@ * Flush buffers, then repaint screen. * Don't flush the buffers on a pipe! */ - if (ch_getflags() & CH_CANSEEK) - { - ch_flush(); - clr_linenum(); -#if HILITE_SEARCH - clr_hilite(); -#endif - } + clear_buffers(); /* FALLTHRU */ case A_REPAINT: /* @@ -1263,7 +1283,8 @@ /* * Define abbreviation for a commonly used sequence below. */ -#define DO_SEARCH() if (number <= 0) number = 1; \ +#define DO_SEARCH() \ + if (number <= 0) number = 1; \ mca_search(); \ cmd_exec(); \ multi_search((char *)NULL, (int) number); ==== //depot/projects/dtrace/src/contrib/less/configure#7 (text+ko) ==== @@ -3611,6 +3611,73 @@ # Checks for general libraries. +{ echo "$as_me:$LINENO: checking for tgoto in -ltinfo" >&5 +echo $ECHO_N "checking for tgoto in -ltinfo... $ECHO_C" >&6; } +if test "${ac_cv_lib_tinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinfo $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgoto (); +int +main () +{ +return tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_tinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tinfo_tgoto=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_tinfo_tgoto" >&6; } +if test $ac_cv_lib_tinfo_tgoto = yes; then + have_tinfo=yes +else + have_tinfo=no +fi + { echo "$as_me:$LINENO: checking for initscr in -lxcurses" >&5 echo $ECHO_N "checking for initscr in -lxcurses... $ECHO_C" >&6; } if test "${ac_cv_lib_xcurses_initscr+set}" = set; then @@ -4246,6 +4313,61 @@ fi if test $curses_broken = 0; then + +# -- Try tinfo. +if test "x$TERMLIBS" = x; then + if test $have_tinfo = yes; then + TERMLIBS="-ltinfo" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + termok=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + termok=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + # -- Try xcurses. if test "x$TERMLIBS" = x; then if test $have_xcurses = yes; then @@ -4895,7 +5017,8 @@ -for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h + +for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -5448,6 +5571,10 @@ + + + + # Checks for identifiers. { echo "$as_me:$LINENO: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } @@ -5656,7 +5783,56 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: checking for st_ino in struct stat" >&5 +echo $ECHO_N "checking for st_ino in struct stat... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF +#define HAVE_STAT_INO 1 +_ACEOF +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # Checks for library functions. { echo "$as_me:$LINENO: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } @@ -6515,6 +6691,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext + { echo "$as_me:$LINENO: checking for ctype functions" >&5 echo $ECHO_N "checking for ctype functions... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -6569,6 +6746,57 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +{ echo "$as_me:$LINENO: checking for wctype functions" >&5 +echo $ECHO_N "checking for wctype functions... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +iswlower(0); iswupper(0); towlower(0); towupper(0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF +#define HAVE_WCTYPE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + # Checks for external variable ospeed in the termcap library. have_ospeed=no { echo "$as_me:$LINENO: checking termcap for ospeed" >&5 ==== //depot/projects/dtrace/src/contrib/less/configure.ac#7 (text+ko) ==== @@ -23,6 +23,7 @@ AC_SYS_LARGEFILE # Checks for general libraries. +AC_CHECK_LIB(tinfo, tgoto, [have_tinfo=yes], [have_tinfo=no]) AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no]) AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no]) AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) @@ -51,6 +52,20 @@ fi if test $curses_broken = 0; then + +# -- Try tinfo. +if test "x$TERMLIBS" = x; then + if test $have_tinfo = yes; then + TERMLIBS="-ltinfo" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + [termok=yes], [termok=no]) + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + # -- Try xcurses. if test "x$TERMLIBS" = x; then if test $have_xcurses = yes; then @@ -154,7 +169,7 @@ # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h]) +AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STAT @@ -182,6 +197,8 @@ [Define HAVE_VOID if your compiler supports the "void" type.]) AH_TEMPLATE([HAVE_CONST], [Define HAVE_CONST if your compiler supports the "const" modifier.]) +AH_TEMPLATE([HAVE_STAT_INO], + [Define HAVE_STAT_INO if your struct stat has st_ino and st_dev.]) AH_TEMPLATE([HAVE_TIME_T], [Define HAVE_TIME_T if your system supports the "time_t" type.]) AH_TEMPLATE([HAVE_STRERROR], @@ -204,6 +221,8 @@ [Define HAVE_TERMIOS_FUNCS if you have tcgetattr/tcsetattr.]) AH_TEMPLATE([HAVE_UPPER_LOWER], [Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower.]) +AH_TEMPLATE([HAVE_WCTYPE], + [Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower.]) AH_TEMPLATE([HAVE_SIGSET_T], [Define HAVE_SIGSET_T you have the sigset_t type.]) AH_TEMPLATE([HAVE_SIGEMPTYSET], @@ -224,6 +243,11 @@ AC_MSG_CHECKING(for time_t) AC_TRY_COMPILE([#include ], [time_t t = 0;], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)]) +AC_MSG_CHECKING(for st_ino in struct stat) +AC_TRY_COMPILE([#include +#include ], + [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;], + [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)]) # Checks for library functions. AC_TYPE_SIGNAL @@ -307,6 +331,7 @@ #include #include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) + AC_MSG_CHECKING(for ctype functions) AC_TRY_LINK([ #if HAVE_CTYPE_H @@ -314,6 +339,10 @@ #endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)]) +AC_MSG_CHECKING(for wctype functions) +AC_TRY_LINK([#include ], [iswlower(0); iswupper(0); towlower(0); towupper(0);], + [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_WCTYPE)], [AC_MSG_RESULT(no)]) + # Checks for external variable ospeed in the termcap library. have_ospeed=no AC_MSG_CHECKING(termcap for ospeed) ==== //depot/projects/dtrace/src/contrib/less/decode.c#6 (text+ko) ==== @@ -682,7 +682,7 @@ close(f); return (-1); } - if (lseek(f, (off_t)0, 0) == BAD_LSEEK) + if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK) { free(buf); close(f); ==== //depot/projects/dtrace/src/contrib/less/defines.ds#6 (text+ko) ==== @@ -313,6 +313,9 @@ /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define if you have the header file. */ +#define HAVE_WCTYPE_H 0 + /* Define if you have the header file. */ #define HAVE_ERRNO_H 1 ==== //depot/projects/dtrace/src/contrib/less/defines.h.in#6 (text+ko) ==== @@ -282,6 +282,9 @@ /* Define to 1 if you have the `stat' function. */ #undef HAVE_STAT +/* Define HAVE_STAT_INO if your struct stat has st_ino and st_dev. */ +#undef HAVE_STAT_INO + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -351,6 +354,12 @@ /* Define HAVE_VOID if your compiler supports the "void" type. */ #undef HAVE_VOID +/* Define HAVE_WCTYPE if you have iswupper, iswlower, towupper, towlower. */ +#undef HAVE_WCTYPE + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCTYPE_H + /* Define to 1 if you have the `_setjmp' function. */ #undef HAVE__SETJMP ==== //depot/projects/dtrace/src/contrib/less/defines.o2#6 (text+ko) ==== @@ -279,6 +279,9 @@ /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define if you have the header file. */ +#define HAVE_WCTYPE_H 0 + /* Define if you have the header file. */ #define HAVE_ERRNO_H 1 ==== //depot/projects/dtrace/src/contrib/less/defines.o9#6 (text+ko) ==== @@ -287,6 +287,9 @@ /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define if you have the header file. */ +#define HAVE_WCTYPE_H 0 + /* Define if you have the header file. */ #define HAVE_ERRNO_H 1 ==== //depot/projects/dtrace/src/contrib/less/defines.wn#6 (text+ko) ==== @@ -277,6 +277,9 @@ /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 +/* Define if you have the header file. */ +#define HAVE_WCTYPE_H 1 + /* Define if you have the header file. */ #define HAVE_ERRNO_H 1 ==== //depot/projects/dtrace/src/contrib/less/edit.c#6 (text+ko) ==== @@ -10,6 +10,9 @@ #include "less.h" +#if HAVE_STAT +#include +#endif public int fd0 = 0; @@ -36,6 +39,11 @@ extern char *namelogfile; #endif +#if HAVE_STAT_INO +public dev_t curr_dev; +public ino_t curr_ino; +#endif + char *curr_altfilename = NULL; static void *curr_altpipe; @@ -178,6 +186,9 @@ curr_altfilename = NULL; } curr_ifile = NULL_IFILE; +#if HAVE_STAT_INO + curr_ino = curr_dev = 0; +#endif } /* @@ -360,7 +371,6 @@ } } } - free(qopen_filename); /* * Get the new ifile. @@ -385,10 +395,23 @@ if (namelogfile != NULL && is_tty) use_logfile(namelogfile); #endif +#if HAVE_STAT_INO + /* Remember the i-number and device of the opened file. */ + { + struct stat statbuf; + int r = stat(qopen_filename, &statbuf); + if (r == 0) + { + curr_ino = statbuf.st_ino; + curr_dev = statbuf.st_dev; + } + } +#endif if (every_first_cmd != NULL) ungetsc(every_first_cmd); } + free(qopen_filename); no_display = !any_display; flush(); any_display = TRUE; @@ -657,6 +680,14 @@ quit(QUIT_ERROR); } + public void +reopen_curr_ifile() +{ + IFILE save_ifile = save_curr_ifile(); + close_file(); + reedit_ifile(save_ifile); +} + /* * Edit standard input. */ @@ -747,7 +778,7 @@ * Append: open the file and seek to the end. */ logfile = open(filename, OPEN_APPEND); - if (lseek(logfile, (off_t)0, 2) == BAD_LSEEK) + if (lseek(logfile, (off_t)0, SEEK_END) == BAD_LSEEK) { close(logfile); logfile = -1; ==== //depot/projects/dtrace/src/contrib/less/filename.c#7 (text+ko) ==== @@ -476,7 +476,7 @@ if (!seekable(f)) return (0); - if (lseek(f, (off_t)0, 0) == BAD_LSEEK) + if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK) return (0); n = read(f, data, sizeof(data)); for (i = 0; i < n; i++) @@ -505,7 +505,7 @@ { off_t spos; - spos = lseek(f, (off_t)0, 2); + spos = lseek(f, (off_t)0, SEEK_END); if (spos == BAD_LSEEK) return (NULL_POSITION); return ((POSITION) spos); ==== //depot/projects/dtrace/src/contrib/less/funcs.h#7 (text+ko) ==== @@ -104,6 +104,7 @@ public IFILE save_curr_ifile (); public void unsave_ifile (); public void reedit_ifile (); + public void reopen_curr_ifile (); public int edit_stdin (); public void cat_file (); public void use_logfile (); ==== //depot/projects/dtrace/src/contrib/less/less.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/less.h,v 1.8 2007/10/08 16:17:42 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/less.h,v 1.9 2007/11/16 22:24:31 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -72,6 +72,9 @@ #if HAVE_CTYPE_H #include #endif +#if HAVE_WCTYPE_H +#include +#endif #if HAVE_LIMITS_H #include #endif @@ -126,16 +129,23 @@ #undef IS_SPACE #undef IS_DIGIT -#if !HAVE_UPPER_LOWER -#define IS_UPPER(c) ASCII_IS_UPPER(c) -#define IS_LOWER(c) ASCII_IS_LOWER(c) -#define TO_UPPER(c) ASCII_TO_UPPER(c) -#define TO_LOWER(c) ASCII_TO_LOWER(c) +#if HAVE_WCTYPE +#define IS_UPPER(c) iswupper(c) +#define IS_LOWER(c) iswlower(c) +#define TO_UPPER(c) towupper(c) +#define TO_LOWER(c) towlower(c) #else +#if HAVE_UPPER_LOWER #define IS_UPPER(c) isupper((unsigned char) (c)) #define IS_LOWER(c) islower((unsigned char) (c)) #define TO_UPPER(c) toupper((unsigned char) (c)) #define TO_LOWER(c) tolower((unsigned char) (c)) +#else +#define IS_UPPER(c) ASCII_IS_UPPER(c) +#define IS_LOWER(c) ASCII_IS_LOWER(c) +#define TO_UPPER(c) ASCII_TO_UPPER(c) +#define TO_LOWER(c) ASCII_TO_LOWER(c) +#endif #endif #ifdef isspace @@ -188,6 +198,13 @@ #define BAD_LSEEK ((off_t)-1) +#ifndef SEEK_SET +#define SEEK_SET 0 +#endif +#ifndef SEEK_END +#define SEEK_END 2 +#endif + #ifndef CHAR_BIT #define CHAR_BIT 8 #endif @@ -458,6 +475,9 @@ #define QUIT_ERROR 1 #define QUIT_SAVED_STATUS (-1) +#define FOLLOW_DESC 0 +#define FOLLOW_NAME 1 + /* filestate flags */ #define CH_CANSEEK 001 #define CH_KEEPOPEN 002 ==== //depot/projects/dtrace/src/contrib/less/less.man#8 (text+ko) ==== @@ -750,40 +750,35 @@ deinitialization string does something unnecessary, like clear- ing the screen. - --no-keypad - Disables sending the keypad initialization and deinitialization - strings to the terminal. This is sometimes useful if the keypad - strings make the numeric keypad behave in an undesirable manner. - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 17 18:42:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8769516A468; Sat, 17 Nov 2007 18:42:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25A5C16A41B for ; Sat, 17 Nov 2007 18:42:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1670613C47E for ; Sat, 17 Nov 2007 18:42:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHIgnO8020088 for ; Sat, 17 Nov 2007 18:42:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHIgnrB020085 for perforce@freebsd.org; Sat, 17 Nov 2007 18:42:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 17 Nov 2007 18:42:49 GMT Message-Id: <200711171842.lAHIgnrB020085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 129168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 18:42:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=129168 Change 129168 by hselasky@hselasky_laptop001 on 2007/11/17 18:42:01 The first step into fully supporting loading of virtual buffers directly into DMA memory. Hence the BUS-DMA framework does not support any form of memory load cancel we need to keep track of the BUS-DMA state in the USB transfer. This commit adds the necessary states. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#52 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#52 (text+ko) ==== @@ -72,12 +72,28 @@ #define USBD_GET_STATE(xfer) ((xfer)->usb_state) +/* USB transfer states */ + enum { USBD_ST_SETUP, USBD_ST_TRANSFERRED, USBD_ST_ERROR, }; +/* + * USB BUS-DMA transfer states + * + * Hence the BUS-DMA framework does not support DMA load abort we need + * to keep track of the BUS-DMA state in the USB transfer. + */ + +enum { + USBD_BDMA_ST_IDLE, + USBD_BDMA_ST_LOADING, + USBD_BDMA_ST_CANCELLING, + USBD_BDMA_ST_CANCEL_AND_LOAD, +}; + struct usbd_xfer; struct usbd_pipe; struct usbd_bus; @@ -343,6 +359,11 @@ uint8_t ext_buffer:1; /* uses external DMA buffer */ uint8_t manual_status:1; /* non automatic status stage on * control transfers */ + uint8_t bdma_enable:1; /* setting this flag allows you to + * load buffers directly into DMA for + * the USB transfer the flag belongs + * to. The flag can not be changed + * during operation. */ }; struct usbd_xfer_flags_int { @@ -360,6 +381,7 @@ uint8_t short_frames_ok:1; /* filtered version */ uint8_t short_xfer_ok:1; /* filtered version */ + uint8_t bdma_state:2; /* BUS-DMA state */ }; struct usbd_config { From owner-p4-projects@FreeBSD.ORG Sat Nov 17 22:01:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17F9816A41B; Sat, 17 Nov 2007 22:01:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 781C616A418 for ; Sat, 17 Nov 2007 22:01:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52AC013C447 for ; Sat, 17 Nov 2007 22:01:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHM1NeC040825 for ; Sat, 17 Nov 2007 22:01:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHM1NUD040822 for perforce@freebsd.org; Sat, 17 Nov 2007 22:01:23 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 22:01:23 GMT Message-Id: <200711172201.lAHM1NUD040822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 22:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=129176 Change 129176 by kmacy@kmacy:storage:toestack on 2007/11/17 22:00:44 move toedev interface to netinet Affected files ... .. //depot/projects/toestack/sys/netinet/toedev.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Nov 17 22:33:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F29C16A468; Sat, 17 Nov 2007 22:33:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF30916A419 for ; Sat, 17 Nov 2007 22:33:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1F2C13C459 for ; Sat, 17 Nov 2007 22:33:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHMXw8X043293 for ; Sat, 17 Nov 2007 22:33:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHMXw7U043290 for perforce@freebsd.org; Sat, 17 Nov 2007 22:33:58 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 22:33:58 GMT Message-Id: <200711172233.lAHMXw7U043290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 22:33:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=129177 Change 129177 by kmacy@kmacy:storage:toestack on 2007/11/17 22:33:17 update most files to point to reflect toedev.h -> sys/netinet and cxgb specific code is now in cxgb_toedev.h Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#10 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#4 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#9 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#13 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#18 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 add .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#8 delete .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#6 edit .. //depot/projects/toestack/sys/netinet/toedev.h#2 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#10 (text+ko) ==== @@ -57,13 +57,13 @@ #ifdef CONFIG_DEFINED #include #include -#include +#include #include #else #include #include #include -#include +#include #endif #define USE_SX ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #endif ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ #ifndef _CHELSIO_L2T_H #define _CHELSIO_L2T_H -#include +#include #include #if __FreeBSD_version > 700000 ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#13 (text+ko) ==== @@ -924,8 +924,6 @@ } ifp->if_flags |= IFF_MULTIQ; ifp->if_mq_start = cxgb_pcpu_start; - ifp->if_mq_enqueue_packet = cxgb_pcpu_enqueue_packet; - ifp->if_mq_get_cookie = cxgb_pcpu_get_cookie; #endif ifp->if_timer = 0; /* Disable ifnet watchdog */ ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#18 (text+ko) ==== @@ -581,6 +581,8 @@ struct t3c_data *td = T3C_DATA (tdev); struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid]; + printf("queuing tid release\n"); + mtx_lock(&td->tid_release_lock); p->ctx = td->tid_release_list; td->tid_release_list = p; ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 (text+ko) ==== @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#6 (text+ko) ==== @@ -21,9 +21,7 @@ #include #include #include - -/* :-/ */ -#include +#include int ofld_connect(struct socket *so, struct sockaddr *nam) ==== //depot/projects/toestack/sys/netinet/toedev.h#2 (text+ko) ==== @@ -56,16 +56,6 @@ /* Get the toedev associated with a ifnet */ #define TOEDEV(ifp) ((ifp)->if_spare2) - -/* offload type ids */ -enum { - TOE_ID_CHELSIO_T1 = 1, - TOE_ID_CHELSIO_T1C, - TOE_ID_CHELSIO_T2, - TOE_ID_CHELSIO_T3, - TOE_ID_CHELSIO_T3B, -}; - struct offload_id { unsigned int id; unsigned long data; From owner-p4-projects@FreeBSD.ORG Sat Nov 17 23:11:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0288716A418; Sat, 17 Nov 2007 23:11:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 807BC16A468 for ; Sat, 17 Nov 2007 23:11:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7320A13C513 for ; Sat, 17 Nov 2007 23:11:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHNBfCk046176 for ; Sat, 17 Nov 2007 23:11:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHNBe7o046173 for perforce@freebsd.org; Sat, 17 Nov 2007 23:11:40 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Nov 2007 23:11:40 GMT Message-Id: <200711172311.lAHNBe7o046173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 129181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 23:11:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=129181 Change 129181 by kmacy@kmacy:storage:toestack on 2007/11/17 23:11:15 add socket interfaces for sosend/soreceive for DMA direct to / from userspace also fix remaining toedev.h references Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#22 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#11 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#11 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#22 (text+ko) ==== @@ -76,7 +76,7 @@ #include #include #include -#include +#include #include #include #include @@ -264,7 +264,7 @@ cdev = d->cdev; last = tail = so->so_snd.sb_sndptr ? so->so_snd.sb_sndptr : so->so_snd.sb_mb; total_bytes = 0; - printf("tail=%p snd.cc=%d tp_last=%4\n", tail, so->so_snd.sb_cc, + printf("tail=%p snd.cc=%d tp_last=%p\n", tail, so->so_snd.sb_cc, toep->tp_m_last); if (last && toep->tp_m_last == last) { @@ -868,6 +868,7 @@ { struct tcpcb *tp = sototcpcb(so); + t3_install_socket_ops(so); tp->t_flags |= TF_TOE; tp->t_tu = &cxgb_toe_usrreqs; } ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #include #include #include +#include #include #include @@ -70,14 +72,61 @@ #include #include #include -#include +#include #include #include #include +static int (*pru_sosend)(struct socket *so, struct sockaddr *addr, + struct uio *uio, struct mbuf *top, struct mbuf *control, + int flags, struct thread *td); + +static int (*pru_soreceive)(struct socket *so, struct sockaddr **paddr, + struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, + int *flagsp); + void -t3_init_offload_ops(void) +t3_init_socket_ops(void) +{ + struct protosw *prp; + + prp = pffindtype(AF_INET, SOCK_STREAM); + pru_sosend = prp->pr_usrreqs->pru_sosend; + pru_soreceive = prp->pr_usrreqs->pru_soreceive; +} + +static int +cxgb_sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, + struct mbuf *top, struct mbuf *control, int flags, struct thread *td) { + /* + * punt it back to the stack if the overhead of copying is thought to + * be less than the VM and DMA overhead of setting up page pods + */ +#ifdef notyet + if (uio->uio_resid < (40 << 10) /* XXX use tunable */) +#endif + return pru_sosend(so, addr, uio, top, control, flags, td); + } + +static int +cxgb_soreceive(struct socket *so, struct sockaddr **psa, struct uio *uio, + struct mbuf **mp0, struct mbuf **controlp, int *flagsp) +{ +#ifdef notyet + if (uio->uio_resid < (40 << 10) /* XXX use tunable */) +#endif + return pru_soreceive(so, psa, uio, mp0, controlp, flagsp); +} + + +void +t3_install_socket_ops(struct socket *so) +{ + so->so_proto->pr_usrreqs->pru_sosend = cxgb_sosend; + so->so_proto->pr_usrreqs->pru_soreceive = cxgb_soreceive; +} + ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#11 (text+ko) ==== @@ -49,11 +49,14 @@ int t3_connect(struct toedev *tdev, struct socket *so, struct ifnet *egress_ifp); void t3_init_listen_cpl_handlers(void); int t3_init_cpl_io(void); -void t3_init_offload_ops(void); void t3_init_wr_tab(unsigned int wr_len); uint32_t t3_send_rx_credits(struct tcpcb *tp, uint32_t credits, uint32_t dack, int nofail); void t3_cleanup_rbuf(struct tcpcb *tp); +void t3_init_socket_ops(void); +void t3_install_socket_ops(struct socket *so); + + void t3_disconnect_acceptq(struct socket *listen_so); void t3_reset_synq(struct socket *listen_so); void t3_defer_reply(struct mbuf *m, struct toedev *dev, defer_handler_t handler); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#11 (text+ko) ==== @@ -73,7 +73,7 @@ #include #include #include -#include +#include #include #include #include @@ -445,7 +445,7 @@ init_cpl_handlers(); if (t3_init_cpl_io() < 0) return -1; - t3_init_offload_ops(); + t3_init_socket_ops(); /* Register with the TOE device layer. */ From owner-p4-projects@FreeBSD.ORG Sat Nov 17 23:33:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7A4A16A41B; Sat, 17 Nov 2007 23:33:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8306416A46B for ; Sat, 17 Nov 2007 23:33:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7313A13C47E for ; Sat, 17 Nov 2007 23:33:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHNX4xq047031 for ; Sat, 17 Nov 2007 23:33:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHNX4wd047028 for perforce@freebsd.org; Sat, 17 Nov 2007 23:33:04 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 23:33:04 GMT Message-Id: <200711172333.lAHNX4wd047028@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 23:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=129182 Change 129182 by jb@jb_freebsd1 on 2007/11/17 23:32:29 IFC Affected files ... .. //depot/projects/dtrace/src/bin/ln/ln.1#4 integrate .. //depot/projects/dtrace/src/bin/ln/ln.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/init.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#3 integrate .. //depot/projects/dtrace/src/lib/Makefile#16 integrate .. //depot/projects/dtrace/src/lib/libthread_db/arch/arm/libpthread_md.c#1 branch .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#15 integrate .. //depot/projects/dtrace/src/sbin/mount_ntfs/mount_ntfs.8#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/dtrace/src/sys/arm/conf/HL200#1 branch .. //depot/projects/dtrace/src/sys/boot/i386/cdboot/cdboot.s#6 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#11 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#13 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#25 integrate .. //depot/projects/dtrace/src/sys/vm/pmap.h#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#16 integrate .. //depot/projects/dtrace/www/en/internal/machines.sgml#10 integrate Differences ... ==== //depot/projects/dtrace/src/bin/ln/ln.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.32 2007/11/17 21:01:22 ru Exp $ .\" .Dd February 14, 2006 .Dt LN 1 @@ -41,11 +41,15 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl Ffhinsv +.Op Fl s Op Fl F +.Op Fl f | i +.Op Fl hnv .Ar source_file .Op Ar target_file .Nm -.Op Fl Ffhinsv +.Op Fl s Op Fl F +.Op Fl f | i +.Op Fl hnv .Ar source_file ... .Ar target_dir .Nm link ==== //depot/projects/dtrace/src/bin/ln/ln.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.36 2007/11/17 21:01:22 ru Exp $"); #include #include @@ -69,7 +69,7 @@ main(int argc, char *argv[]) { struct stat sb; - char *p, *sourcedir; + char *p, *targetdir; int ch, exitval; /* @@ -134,34 +134,34 @@ case 0: usage(); /* NOTREACHED */ - case 1: /* ln target */ + case 1: /* ln source */ exit(linkit(argv[0], ".", 1)); - case 2: /* ln target source */ + case 2: /* ln source target */ exit(linkit(argv[0], argv[1], 0)); default: ; } - /* ln target1 target2 directory */ - sourcedir = argv[argc - 1]; - if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) { + /* ln source1 source2 directory */ + targetdir = argv[argc - 1]; + if (hflag && lstat(targetdir, &sb) == 0 && S_ISLNK(sb.st_mode)) { /* * We were asked not to follow symlinks, but found one at * the target--simulate "not a directory" error */ errno = ENOTDIR; - err(1, "%s", sourcedir); + err(1, "%s", targetdir); } - if (stat(sourcedir, &sb)) - err(1, "%s", sourcedir); + if (stat(targetdir, &sb)) + err(1, "%s", targetdir); if (!S_ISDIR(sb.st_mode)) usage(); - for (exitval = 0; *argv != sourcedir; ++argv) - exitval |= linkit(*argv, sourcedir, 1); + for (exitval = 0; *argv != targetdir; ++argv) + exitval |= linkit(*argv, targetdir, 1); exit(exitval); } int -linkit(const char *target, const char *source, int isdir) +linkit(const char *source, const char *target, int isdir) { struct stat sb; const char *p; @@ -169,57 +169,57 @@ char path[PATH_MAX]; if (!sflag) { - /* If target doesn't exist, quit now. */ - if (stat(target, &sb)) { - warn("%s", target); + /* If source doesn't exist, quit now. */ + if (stat(source, &sb)) { + warn("%s", source); return (1); } /* Only symbolic links to directories. */ if (S_ISDIR(sb.st_mode)) { errno = EISDIR; - warn("%s", target); + warn("%s", source); return (1); } } /* - * If the source is a directory (and not a symlink if hflag), - * append the target's name. + * If the target is a directory (and not a symlink if hflag), + * append the source's name. */ if (isdir || - (lstat(source, &sb) == 0 && S_ISDIR(sb.st_mode)) || - (!hflag && stat(source, &sb) == 0 && S_ISDIR(sb.st_mode))) { - if ((p = strrchr(target, '/')) == NULL) - p = target; + (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) || + (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) { + if ((p = strrchr(source, '/')) == NULL) + p = source; else ++p; - if (snprintf(path, sizeof(path), "%s/%s", source, p) >= + if (snprintf(path, sizeof(path), "%s/%s", target, p) >= (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; - warn("%s", target); + warn("%s", source); return (1); } - source = path; + target = path; } - exists = !lstat(source, &sb); + exists = !lstat(target, &sb); /* * If the file exists, then unlink it forcibly if -f was specified * and interactively if -i was specified. */ if (fflag && exists) { if (Fflag && S_ISDIR(sb.st_mode)) { - if (rmdir(source)) { - warn("%s", source); + if (rmdir(target)) { + warn("%s", target); return (1); } - } else if (unlink(source)) { - warn("%s", source); + } else if (unlink(target)) { + warn("%s", target); return (1); } } else if (iflag && exists) { fflush(stdout); - fprintf(stderr, "replace %s? ", source); + fprintf(stderr, "replace %s? ", target); first = ch = getchar(); while(ch != '\n' && ch != EOF) @@ -230,23 +230,23 @@ } if (Fflag && S_ISDIR(sb.st_mode)) { - if (rmdir(source)) { - warn("%s", source); + if (rmdir(target)) { + warn("%s", target); return (1); } - } else if (unlink(source)) { - warn("%s", source); + } else if (unlink(target)) { + warn("%s", target); return (1); } } /* Attempt the link. */ - if ((*linkf)(target, source)) { - warn("%s", source); + if ((*linkf)(source, target)) { + warn("%s", target); return (1); } if (vflag) - (void)printf("%s %c> %s\n", source, linkch, target); + (void)printf("%s %c> %s\n", target, linkch, source); return (0); } @@ -254,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-Ffhinsv] source_file [target_file]", - " ln [-Ffhinsv] source_file ... target_dir", + "usage: ln [-s [-F]] [-f | -i] [-hnv] source_file [target_file]", + " ln [-s [-F]] [-f | -i] [-hnv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/Makefile,v 1.1 2006/09/14 06:49:34 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/Makefile,v 1.2 2007/11/17 21:30:03 cognet Exp $ GENSRCS+= xm.h LIBSRCS+= armfbsd-nat.c -LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c +LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c fbsd-threads.c nm.h: #XXX this should be arm/nm-fbsd.h but won't until it's merged into the gdb repo ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c,v 1.1 2006/09/14 06:49:34 imp Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c,v 1.2 2007/11/17 21:30:03 cognet Exp $ */ /* Native-dependent code for BSD Unix running on ARM's, for GDB. Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002 @@ -78,9 +78,7 @@ supply_register (ARM_SP_REGNUM, (char *) &gregset->r_sp); supply_register (ARM_LR_REGNUM, (char *) &gregset->r_lr); - /* This is ok: we're running native... */ - r_pc = ADDR_BITS_REMOVE (gregset->r_pc); - supply_register (ARM_PC_REGNUM, (char *) &r_pc); + supply_register (ARM_PC_REGNUM, (char *) &gregset->r_pc); if (arm_apcs_32) supply_register (ARM_PS_REGNUM, (char *) &gregset->r_cpsr); @@ -88,6 +86,28 @@ supply_register (ARM_PS_REGNUM, (char *) &gregset->r_pc); } +/* Fill register REGNO (if it is a general-purpose register) in + *GREGSETPS with the value in GDB's register array. If REGNO is -1, + do this for all registers. */ + +void +fill_gregset (struct reg *gregset, int regno) +{ + int i; + + for (i = ARM_A1_REGNUM; i < ARM_SP_REGNUM; i++) + if ((regno == -1 || regno == i)) + regcache_collect (i, &gregset->r[i]); + if (regno == -1 || regno == ARM_SP_REGNUM) + regcache_collect (ARM_SP_REGNUM, &gregset->r_sp); + if (regno == -1 || regno == ARM_LR_REGNUM) + regcache_collect (ARM_LR_REGNUM, &gregset->r_lr); + if (regno == -1 || regno == ARM_PC_REGNUM) + regcache_collect (ARM_PC_REGNUM, &gregset->r_pc); + if (regno == -1 || regno == ARM_PS_REGNUM) + regcache_collect (ARM_PS_REGNUM, &gregset->r_cpsr); +} + void supply_fpregset (struct fpreg *fparegset) { @@ -100,6 +120,20 @@ supply_register (ARM_FPS_REGNUM, (char *) &fparegset->fpr_fpsr); } +void +fill_fpregset (struct fpreg *fparegset, int regno) +{ + int i; + + for (i = ARM_F0_REGNUM; i <= ARM_F7_REGNUM; i++) + if (regno == -1 || regno == i) + regcache_raw_supply(current_regcache, i, + &fparegset->fpr[i - ARM_F0_REGNUM]); + if (regno == -1 || regno == ARM_FPS_REGNUM) + regcache_raw_supply(current_regcache, ARM_FPS_REGNUM, + &fparegset->fpr_fpsr); +} + static void fetch_register (int regno) { ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c,v 1.1 2006/09/14 06:49:34 imp Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c,v 1.2 2007/11/17 21:30:03 cognet Exp $ */ /* Target-specific functions for ARM running under NetBSD. Copyright 2002, 2003 Free Software Foundation, Inc. @@ -60,7 +60,6 @@ tdep->fp_model = ARM_FLOAT_SOFT_VFP; } - void _initialize_armfbsd_tdep (void) { ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/init.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/init.c,v 1.1 2006/09/14 06:49:34 imp Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/init.c,v 1.2 2007/11/17 21:30:03 cognet Exp $ */ /* Do not modify this file. */ /* It is created automatically by the Makefile. */ @@ -105,6 +105,7 @@ extern initialize_file_ftype _initialize_mi_cmd_env; extern initialize_file_ftype _initialize_mi_interp; extern initialize_file_ftype _initialize_mi_main; +extern initialize_file_ftype _initialize_thread_db; extern initialize_file_ftype _initialize_tui_hooks; extern initialize_file_ftype _initialize_tui_interp; extern initialize_file_ftype _initialize_tui_layout; @@ -128,6 +129,7 @@ _initialize_kernel_u_addr (); _initialize_infptrace (); _initialize_inftarg (); + _initialize_thread_db (); #endif _initialize_arm_fbsdnat (); _initialize_remote (); ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h,v 1.1 2006/09/14 06:49:34 imp Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h,v 1.2 2007/11/17 18:41:04 cognet Exp $ */ /* Native-dependent definitions for ARM running NetBSD, for GDB. Copyright 1986, 1987, 1989, 1992, 1994, 1999 Free Software Foundation, Inc. @@ -29,4 +29,7 @@ /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ #define FETCH_INFERIOR_REGISTERS +/* We can attach and detach. */ +#define ATTACH_DETACH + #endif /* NM_NBSD_H */ ==== //depot/projects/dtrace/src/lib/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.225 2007/10/26 11:07:25 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.226 2007/11/17 21:29:02 cognet Exp $ .include @@ -36,7 +36,7 @@ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ - ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ + ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -108,10 +108,6 @@ _libthr= libthr .endif -.if ${MACHINE_ARCH} != "arm" -_libthread_db= libthread_db -.endif - .if ${MK_USB} != "no" _libusbhid= libusbhid .endif ==== //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#15 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.205 2007/10/19 18:24:19 rpaulo Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.206 2007/11/17 21:54:57 oleg Exp $ .\" -.Dd October 19, 2007 +.Dd November 17, 2007 .Dt IPFW 8 .Os .Sh NAME @@ -1756,6 +1756,16 @@ TCP connection, or from/to a given host, or entire subnet, or a protocol type, etc. .Pp +There are two modes of dummynet operation: normal and fast. +Normal mode tries to emulate real link: dummynet scheduler ensures packet will +not leave pipe faster than it would be on real link with given bandwidth. +Fast mode allows certain packets to bypass dummynet scheduler (if packet flow +does not exceed pipe's bandwidth). Thus fast mode requires less cpu cycles +per packet (in average) but packet latency can be significantly lower comparing +to real link with same bandwidth. Default is normal mode, fast mode can be +enabled by setting net.inet.ip.dummynet.io_fast sysctl(8) variable to non-zero +value. +.Pp Packets belonging to the same flow are then passed to either of two different objects, which implement the traffic regulation: .Bl -hang -offset XXXX @@ -2120,6 +2130,14 @@ This value is used when no .Cm buckets option is specified when configuring a pipe/queue. +.It Em net.inet.ip.dummynet.io_fast : No 0 +If set to non-zero value enables "fast" mode of dummynet operation (see above). +.It Em net.inet.ip.dummynet.io_pkt +Number of packets passed to by dummynet. +.It Em net.inet.ip.dummynet.io_pkt_drop +Number of packets dropped by dummynet. +.It Em net.inet.ip.dummynet.io_pkt_fast +Number of packets bypassed dummynet scheduler. .It Em net.inet.ip.dummynet.max_chain_len : No 16 Target value for the maximum number of pipes/queues in a hash bucket. The product ==== //depot/projects/dtrace/src/sbin/mount_ntfs/mount_ntfs.8#4 (text+ko) ==== @@ -28,9 +28,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.21 2005/02/10 09:19:31 ru Exp $ +.\" $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.22 2007/11/17 17:05:00 maxim Exp $ .\" -.Dd January 3, 1999 +.Dd 17 November, 2007 .Dt MOUNT_NTFS 8 .Os .Sh NAME @@ -82,6 +82,9 @@ .It Fl m Ar mask Specify the maximum file permissions for files in the file system. +Only the nine low-order bits of +.Ar mask +are used. .It Fl C Ar charset Specify local .Ar charset ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#23 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.593 2007/11/05 18:13:33 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.594 2007/11/17 22:52:28 alc Exp $"); /* * Manages physical address maps. @@ -2925,6 +2925,35 @@ } /* + * pmap_page_wired_mappings: + * + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + pv_entry_t pv; + pt_entry_t *pte; + pmap_t pmap; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); + if ((*pte & PG_W) != 0) + count++; + PMAP_UNLOCK(pmap); + } + return (count); +} + +/* * Remove all pages from specified address space * this aids process exit speeds. Also, this code * is special cased for current process only, but ==== //depot/projects/dtrace/src/sys/arm/arm/pmap.c#21 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.88 2007/11/05 11:36:10 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.89 2007/11/17 22:52:28 alc Exp $"); #include #include #include @@ -4490,6 +4490,27 @@ return (FALSE); } +/* + * pmap_page_wired_mappings: + * + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + pv_entry_t pv; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) + if ((pv->pv_flags & PVF_WIRED) != 0) + count++; + return (count); +} /* * pmap_ts_referenced: ==== //depot/projects/dtrace/src/sys/boot/i386/cdboot/cdboot.s#6 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.17 2007/02/23 21:07:44 remko Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.18 2007/11/17 17:32:40 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -585,7 +585,7 @@ msg_relocate: .asciz "Relocating the loader and the BTX\r\n" msg_jump: .asciz "Starting the BTX loader\r\n" msg_badread: .ascii "Read Error: 0x" -hex_error: .ascii "00\r\n" +hex_error: .asciz "00\r\n" msg_novd: .asciz "Could not find Primary Volume Descriptor\r\n" msg_lookup: .asciz "Looking up " msg_lookup2: .asciz "... " ==== //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.181 2007/10/23 10:39:03 bde Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.182 2007/11/17 16:19:48 maxim Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -464,7 +464,7 @@ /* * Initialize ownerships and permissions, since nothing else will - * initialize them iff we are mounting root. + * initialize them if we are mounting root. */ pmp->pm_uid = UID_ROOT; pmp->pm_gid = GID_WHEEL; ==== //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.89 2007/10/16 10:54:53 alfred Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.90 2007/11/17 17:05:01 maxim Exp $ */ @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -331,7 +332,7 @@ if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v)) ntmp->ntm_gid = v; if (1 == vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v)) - ntmp->ntm_mode = v; + ntmp->ntm_mode = v & ACCESSPERMS; vfs_flagopt(mp->mnt_optnew, "caseins", &ntmp->ntm_flag, NTFS_MFLAG_CASEINS); vfs_flagopt(mp->mnt_optnew, ==== //depot/projects/dtrace/src/sys/i386/i386/pmap.c#20 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.598 2007/11/13 23:00:24 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.599 2007/11/17 22:52:28 alc Exp $"); /* * Manages physical address maps. @@ -3030,6 +3030,37 @@ } /* + * pmap_page_wired_mappings: + * + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + pv_entry_t pv; + pt_entry_t *pte; + pmap_t pmap; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + sched_pin(); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte_quick(pmap, pv->pv_va); + if ((*pte & PG_W) != 0) + count++; + PMAP_UNLOCK(pmap); + } + sched_unpin(); + return (count); +} + +/* * Remove all pages from specified address space * this aids process exit speeds. Also, this code * is special cased for current process only, but ==== //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#11 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.192 2007/11/05 11:36:13 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.193 2007/11/17 22:52:29 alc Exp $"); #include #include @@ -1915,6 +1915,38 @@ } /* + * pmap_page_wired_mappings: + * + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + struct ia64_lpte *pte; + pmap_t oldpmap, pmap; + pv_entry_t pv; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = pv->pv_pmap; + PMAP_LOCK(pmap); + oldpmap = pmap_switch(pmap); + pte = pmap_find_vhpt(pv->pv_va); + KASSERT(pte != NULL, ("pte")); + if (pmap_wired(pte)) + count++; + pmap_switch(oldpmap); + PMAP_UNLOCK(pmap); + } + return (count); +} + +/* * Remove all pages from specified address space * this aids process exit speeds. Also, this code * is special cased for current process only, but ==== //depot/projects/dtrace/src/sys/netinet/ip_dummynet.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.112 2007/11/06 23:01:42 oleg Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.113 2007/11/17 21:54:56 oleg Exp $"); #define DUMMYNET_DEBUG @@ -110,6 +110,7 @@ /* Adjusted vs non-adjusted curr_time difference (ticks). */ static long tick_diff; +static int io_fast; static unsigned long io_pkt; static unsigned long io_pkt_fast; static unsigned long io_pkt_drop; @@ -185,6 +186,8 @@ SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_lost, CTLFLAG_RD, &tick_lost, 0, "Number of ticks coalesced by dummynet taskqueue."); +SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, io_fast, + CTLFLAG_RW, &io_fast, 0, "Enable fast dummynet io."); SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt, CTLFLAG_RD, &io_pkt, 0, "Number of packets passed to dummynet."); @@ -967,7 +970,7 @@ q->hash_slot = i; q->next = fs->rq[i]; q->S = q->F + 1; /* hack - mark timestamp as invalid. */ - q->numbytes = fs->pipe->bandwidth; + q->numbytes = io_fast ? fs->pipe->bandwidth : 0; fs->rq[i] = q; fs->rq_elements++; return (q); @@ -1325,7 +1328,7 @@ goto done; if (q->q_time < curr_time) - q->numbytes = fs->pipe->bandwidth; + q->numbytes = io_fast ? fs->pipe->bandwidth : 0; q->q_time = curr_time; /* @@ -1736,7 +1739,7 @@ /* Flush accumulated credit for all queues. */ for (i = 0; i <= pipe->fs.rq_size; i++) for (q = pipe->fs.rq[i]; q; q = q->next) - q->numbytes = p->bandwidth; + q->numbytes = io_fast ? p->bandwidth : 0; pipe->bandwidth = p->bandwidth; pipe->numbytes = 0; /* just in case... */ ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#7 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.7 2006/12/05 04:01:52 grehan Exp $ +# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.8 2007/11/17 22:52:29 alc Exp $ # #include @@ -431,6 +431,21 @@ /** + * @brief Count the number of managed mappings to the given physical + * page that are wired. + * + * @param _pg physical page + * + * @retval int the number of wired, managed mappings to the + * given physical page + */ +METHOD int page_wired_mappings { + mmu_t _mmu; + vm_page_t _pg; +}; + + +/** * @brief Initialise a physical map data structure * * @param _pmap physical map ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#11 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.115 2006/12/20 01:10:21 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.116 2007/11/17 22:52:29 alc Exp $"); /* * Manages physical address maps. @@ -322,6 +322,7 @@ boolean_t moea_ts_referenced(mmu_t, vm_page_t); vm_offset_t moea_map(mmu_t, vm_offset_t *, vm_offset_t, vm_offset_t, int); boolean_t moea_page_exists_quick(mmu_t, pmap_t, vm_page_t); +int moea_page_wired_mappings(mmu_t, vm_page_t); void moea_pinit(mmu_t, pmap_t); void moea_pinit0(mmu_t, pmap_t); void moea_protect(mmu_t, pmap_t, vm_offset_t, vm_offset_t, vm_prot_t); @@ -359,6 +360,7 @@ MMUMETHOD(mmu_ts_referenced, moea_ts_referenced), MMUMETHOD(mmu_map, moea_map), MMUMETHOD(mmu_page_exists_quick,moea_page_exists_quick), + MMUMETHOD(mmu_page_wired_mappings,moea_page_wired_mappings), MMUMETHOD(mmu_pinit, moea_pinit), MMUMETHOD(mmu_pinit0, moea_pinit0), MMUMETHOD(mmu_protect, moea_protect), @@ -1492,6 +1494,26 @@ return (FALSE); } +/* + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +moea_page_wired_mappings(mmu_t mmu, vm_page_t m) +{ + struct pvo_entry *pvo; + int count; + + count = 0; + if (!moea_initialized || (m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) + if ((pvo->pvo_vaddr & PVO_WIRED) != 0) + count++; + return (count); +} + static u_int moea_vsidcontext; void ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.10 2007/11/05 11:36:15 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.11 2007/11/17 22:52:29 alc Exp $"); /* * Dispatch MI pmap calls to the appropriate MMU implementation @@ -194,6 +194,13 @@ } int +pmap_page_wired_mappings(vm_page_t m) +{ + + return (MMU_PAGE_WIRED_MAPPINGS(mmu_obj, m)); +} + +int pmap_pinit(pmap_t pmap) { MMU_PINIT(mmu_obj, pmap); ==== //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.167 2007/11/05 11:36:15 kib Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.168 2007/11/17 22:52:29 alc Exp $ */ /* @@ -1753,6 +1753,26 @@ } /* + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + struct tte *tp; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(tp, &m->md.tte_list, tte_link) + if ((tp->tte_data & (TD_PV | TD_WIRED)) == (TD_PV | TD_WIRED)) + count++; + return (count); +} + +/* * Remove all pages from specified address space, this aids process exit * speeds. This is much faster than pmap_remove n the case of running down * an entire address space. Only works for the current pmap. ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#25 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.40 2007/11/05 11:36:16 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.41 2007/11/17 22:52:29 alc Exp $"); #include "opt_kstack_pages.h" #include "opt_msgbuf.h" @@ -1669,6 +1669,34 @@ TAILQ_INIT(&m->md.pv_list); m->md.pv_list_count = 0; } + +/* + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + pmap_t pmap; + pv_entry_t pv; + uint64_t tte_data; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = pv->pv_pmap; + PMAP_LOCK(pmap); + tte_data = tte_hash_lookup(pmap->pm_hash, pv->pv_va); + if ((tte_data & VTD_WIRED) != 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 17 23:34:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B49E16A420; Sat, 17 Nov 2007 23:34:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F41FC16A418 for ; Sat, 17 Nov 2007 23:34:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E600D13C467 for ; Sat, 17 Nov 2007 23:34:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHNY5iA047101 for ; Sat, 17 Nov 2007 23:34:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHNY5wS047098 for perforce@freebsd.org; Sat, 17 Nov 2007 23:34:05 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 23:34:05 GMT Message-Id: <200711172334.lAHNY5wS047098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 23:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=129183 Change 129183 by jb@jb_freebsd1 on 2007/11/17 23:33:27 IF6 Affected files ... .. //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/dtrace6/src/sys/contrib/dev/npe/LICENSE#1 branch Differences ... ==== //depot/projects/dtrace6/src/contrib/openbsm/etc/audit_control#3 (text) ==== @@ -1,5 +1,6 @@ # # $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#5 $ +# $FreeBSD: src/contrib/openbsm/etc/audit_control,v 1.2.2.4 2007/11/17 22:14:29 rwatson Exp $ # dir:/var/audit flags:lo ==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ==== @@ -22,8 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.7.2.1 2005/09/15 05:32:10 marcel Exp $ -.Dd March 2, 2005 +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.7.2.3 2007/11/17 16:51:58 jhb Exp $ +.\" +.Dd October 11, 2006 .Os .Dt KGDB 1 .Sh NAME @@ -34,6 +35,7 @@ .Op Fl a | Fl f | Fl fullname .Op Fl q | Fl quiet .Op Fl v +.Op Fl w .Op Fl d Ar crashdir .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device .Op Ar kernel Op Ar core @@ -67,6 +69,13 @@ form is supported for compatibility as well. .It Fl v Increase verbosity. +.It Fl w +Opens kmem-based targets in read-write mode. +(This is identical to what +.Fl -wcore +used to do in previous +gdb versions for +.Fx . ) .It Fl d Ar crashdir Use .Ar crashdir ==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.2.2.1 2005/09/15 05:32:10 marcel Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.2.2.2 2007/11/17 16:45:38 jhb Exp $ */ #ifndef _KGDB_H_ @@ -62,4 +62,6 @@ struct kthr *kgdb_thr_select(struct kthr *); char *kgdb_thr_extra_thread_info(int); +uintptr_t kgdb_lookup(const char *sym); + #endif /* _KGDB_H_ */ ==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.2.2.3 2007/02/02 13:48:19 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.2.2.5 2007/11/17 16:50:20 jhb Exp $"); #include #include @@ -52,8 +52,8 @@ static struct kthr *first; struct kthr *curkthr; -static uintptr_t -lookup(const char *sym) +uintptr_t +kgdb_lookup(const char *sym) { struct nlist nl[2]; @@ -80,29 +80,29 @@ struct kthr *kt; uintptr_t addr, paddr; - addr = lookup("_allproc"); + addr = kgdb_lookup("_allproc"); if (addr == 0) return (NULL); kvm_read(kvm, addr, &paddr, sizeof(paddr)); - dumppcb = lookup("_dumppcb"); + dumppcb = kgdb_lookup("_dumppcb"); if (dumppcb == 0) return (NULL); - addr = lookup("_dumptid"); + addr = kgdb_lookup("_dumptid"); if (addr != 0) kvm_read(kvm, addr, &dumptid, sizeof(dumptid)); else dumptid = -1; - addr = lookup("_stopped_cpus"); + addr = kgdb_lookup("_stopped_cpus"); if (addr != 0) kvm_read(kvm, addr, &stopped_cpus, sizeof(stopped_cpus)); else stopped_cpus = 0; - stoppcbs = lookup("_stoppcbs"); - + stoppcbs = kgdb_lookup("_stoppcbs"); + while (paddr != 0) { if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) { warnx("kvm_read: %s", kvm_geterr(kvm)); @@ -123,7 +123,7 @@ else if (td.td_state == TDS_RUNNING && ((1 << td.td_oncpu) & stopped_cpus) && stoppcbs != 0) kt->pcb = (uintptr_t) stoppcbs + sizeof(struct pcb) * td.td_oncpu; - else + else kt->pcb = (uintptr_t)td.td_pcb; kt->kstack = td.td_kstack; kt->tid = td.td_tid; ==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.2 2005/09/15 05:32:10 marcel Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.3 2007/11/17 16:50:20 jhb Exp $"); #include #include @@ -53,9 +53,8 @@ { static CORE_ADDR kernbase; struct minimal_symbol *sym; - - if (kernbase == 0) - { + + if (kernbase == 0) { sym = lookup_minimal_symbol ("kernbase", NULL, NULL); if (sym == NULL) { kernbase = KERNBASE; @@ -205,9 +204,8 @@ ti = add_thread(ptid_build(kt->pid, 0, kt->tid)); kt = kgdb_thr_next(kt); } - if (curkthr != NULL) + if (curkthr != 0) inferior_ptid = ptid_build(curkthr->pid, 0, curkthr->tid); - add_com ("proc", class_obscure, kgdb_set_proc_cmd, "Set current process context"); } ==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.2.2.1 2006/10/13 14:27:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.2.2.2 2007/11/17 16:50:20 jhb Exp $"); #include #ifndef CROSS_DEBUGGER @@ -54,7 +54,7 @@ struct kthr *kt; struct pcb pcb; int i, reg; - + kt = kgdb_thr_lookup_tid(ptid_get_tid(inferior_ptid)); if (kt == NULL) return; @@ -63,7 +63,7 @@ memset(&pcb, 0, sizeof(pcb)); } for (i = ARM_A1_REGNUM + 8; i <= ARM_SP_REGNUM; i++) { - supply_register(i, (char *)&pcb.un_32.pcb32_r8 + + supply_register(i, (char *)&pcb.un_32.pcb32_r8 + (i - (ARM_A1_REGNUM + 8 )) * 4); } if (pcb.un_32.pcb32_sp != 0) { @@ -174,7 +174,7 @@ return; cache = kgdb_trgt_frame_cache(next_frame, this_cache); - + if (is_undef && (regnum == ARM_SP_REGNUM || regnum == ARM_PC_REGNUM)) { *addrp = cache->sp + offsetof(struct trapframe, tf_spsr); target_read_memory(*addrp, valuep, regsz); ==== //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2.2.1 2007/02/26 23:13:09 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2.2.2 2007/11/17 18:24:46 cognet Exp $ arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/ixp425/ixp425.c standard @@ -16,12 +16,7 @@ arm/xscale/ixp425/ixp425_a4x_io.S optional uart dev/uart/uart_dev_ns8250.c optional uart # -# NPE-based Ethernet support (requires qmgr also). Note the -# firmware images must be downloaded from the Intel web site. -# The URL seems to change frequently; try this as a starting -# place: -# -# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm +# NPE-based Ethernet support (requires qmgr also). # arm/xscale/ixp425/if_npe.c optional npe arm/xscale/ixp425/ixp425_npe.c optional npe @@ -41,7 +36,7 @@ clean "IxNpeMicrocode.fwo" IxNpeMicrocode.dat optional npe_fw \ dependency ".PHONY" \ - compile-with "if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \ + compile-with "uudecode < $S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \ no-obj no-implicit-rule \ clean "IxNpeMicrocode.dat" # ==== //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/if_npe.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.5.2.1 2007/02/26 23:13:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.5.2.2 2007/11/17 18:22:57 cognet Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -546,11 +546,27 @@ struct npe_softc * sc = device_get_softc(dev); int unit = device_get_unit(dev); int error, i; + uint32_t imageid; - /* load NPE firmware and start it running */ - error = ixpnpe_init(sc->sc_npe, "npe_fw", npeconfig[unit].imageid); - if (error != 0) - return error; + /* + * Load NPE firmware and start it running. We assume + * that minor version bumps remain compatible so probe + * the firmware image starting with the expected version + * and then bump the minor version up to the max. + */ + imageid = npeconfig[unit].imageid; + for (;;) { + error = ixpnpe_init(sc->sc_npe, "npe_fw", imageid); + if (error == 0) + break; + /* ESRCH is returned when the requested image is not present */ + if (error != ESRCH) + return error; + /* bump the minor version up to the max possible */ + if (NPEIMAGE_MINOR(imageid) == 0xff) + return error; + imageid++; + } if (bus_space_map(sc->sc_iot, npeconfig[unit].regbase, npeconfig[unit].regsize, 0, &sc->sc_ioh)) { ==== //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.3.2.1 2007/02/26 23:13:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.3.2.2 2007/11/17 18:22:57 cognet Exp $"); /* * Intel XScale Network Processing Engine (NPE) support. @@ -407,14 +407,14 @@ } /* 2 consecutive NPE_IMAGE_MARKER's indicates end of library */ if (image->id == NPE_IMAGE_MARKER) { - device_printf(sc->sc_dev, + DPRINTF(sc->sc_dev, "imageId 0x%08x not found in image library header\n", imageId); /* reached end of library, image not found */ - return EIO; + return ESRCH; } offset += image->size; } - return EIO; + return ESRCH; } int ==== //depot/projects/dtrace6/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 (text+ko) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.1.2.1 2007/02/26 23:13:09 cognet Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.1.2.2 2007/11/17 18:22:57 cognet Exp $ */ #ifndef _IXP425_NPEVAR_H_ @@ -32,7 +32,17 @@ * * Firmware Id's for current firmware image. These are typed by * NPE ID and the feature set. Not all features are available - * on all NPE's. + * on all NPE's. The Image ID has the following structure: + * + * Field [Bit Location] + * ----------------------------------- + * Device ID [28..31] + * NPE ID [24..27] + * NPE Functionality ID [16..23] + * Major Release Number [8..15] + * Minor Release Number [0..7] + * + * The following "feature sets" are known to exist: * * HSS-0: supports 32 channelized and 4 packetized. * HSS-0 + ATM + SPHY: @@ -56,6 +66,15 @@ * ETH+VLAN+HDR: Ethernet Rx/Tx which includes: * SPANNING_TREE, FIREWALL, VLAN_QOS, HEADER_CONVERSION */ +#define NPEIMAGE_DEVID(id) (((id) >> 28) & 0xf) +#define NPEIMAGE_NPEID(id) (((id) >> 24) & 0xf) +#define NPEIMAGE_FUNCID(id) (((id) >> 16) & 0xff) +#define NPEIMAGE_MAJOR(id) (((id) >> 8) & 0xff) +#define NPEIMAGE_MINOR(id) (((id) >> 0) & 0xff) +#define NPEIMAGE_MAKEID(dev, npe, func, maj, min) \ + ((((dev) & 0xf) << 28) | (((npe) & 0xf) << 24) | \ + (((func) & 0xff) << 16) (((maj) & 0xff) << 8) | (((min) & 0xff) << 0)) + /* XXX not right, revise */ /* NPE A Firmware Image Id's */ #define NPEFW_A_HSS0 0x00010000 /* HSS-0: 32 chan+4 packet */ From owner-p4-projects@FreeBSD.ORG Sat Nov 17 23:47:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03CC116A419; Sat, 17 Nov 2007 23:47:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CD2E16A417 for ; Sat, 17 Nov 2007 23:47:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7739613C4C6 for ; Sat, 17 Nov 2007 23:47:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHNlLuE047622 for ; Sat, 17 Nov 2007 23:47:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHNlLtA047619 for perforce@freebsd.org; Sat, 17 Nov 2007 23:47:21 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 23:47:21 GMT Message-Id: <200711172347.lAHNlLtA047619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 23:47:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=129185 Change 129185 by jb@jb_freebsd1 on 2007/11/17 23:47:15 IFC Loopback of my WARNS cleanups. Affected files ... .. //depot/projects/dtrace/src/usr.bin/fstat/zfs/zfs.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/IPXrouted/trace.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/ppp/chap.h#5 integrate .. //depot/projects/dtrace/src/usr.sbin/ppp/physical.h#5 integrate .. //depot/projects/dtrace/src/usr.sbin/sa/db.c#3 integrate Differences ... ==== //depot/projects/dtrace/src/usr.bin/fstat/zfs/zfs.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.bin/fstat/zfs/zfs.c,v 1.1 2007/11/05 23:15:03 lulf Exp $ + * $FreeBSD: src/usr.bin/fstat/zfs/zfs.c,v 1.2 2007/11/17 23:21:38 jb Exp $ */ #include ==== //depot/projects/dtrace/src/usr.sbin/IPXrouted/trace.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)trace.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.sbin/IPXrouted/trace.c,v 1.11 2005/08/05 07:17:23 stefanf Exp $"; + "$FreeBSD: src/usr.sbin/IPXrouted/trace.c,v 1.12 2007/11/17 23:09:39 jb Exp $"; #endif /* not lint */ /* ==== //depot/projects/dtrace/src/usr.sbin/ppp/chap.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ppp/chap.h,v 1.22 2002/06/17 01:12:38 brian Exp $ + * $FreeBSD: src/usr.sbin/ppp/chap.h,v 1.23 2007/11/17 23:14:06 jb Exp $ */ struct mbuf; ==== //depot/projects/dtrace/src/usr.sbin/ppp/physical.h#5 (text+ko) ==== @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/usr.sbin/ppp/physical.h,v 1.28 2004/09/05 01:46:52 brian Exp $ + * $FreeBSD: src/usr.sbin/ppp/physical.h,v 1.29 2007/11/17 23:12:45 jb Exp $ * */ ==== //depot/projects/dtrace/src/usr.sbin/sa/db.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/sa/db.c,v 1.1 2007/05/22 06:51:38 dds Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/sa/db.c,v 1.2 2007/11/17 23:17:05 jb Exp $"); #include #include