From owner-p4-projects@FreeBSD.ORG Sun Aug 24 04:12:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6609B106568C; Sun, 24 Aug 2008 04:12: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 020C3106567D for ; Sun, 24 Aug 2008 04:12:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E95C38FC08 for ; Sun, 24 Aug 2008 04:12:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7O4CQDx017905 for ; Sun, 24 Aug 2008 04:12:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7O4BvZ9017867 for perforce@freebsd.org; Sun, 24 Aug 2008 04:11:57 GMT (envelope-from imp@freebsd.org) Date: Sun, 24 Aug 2008 04:11:57 GMT Message-Id: <200808240411.m7O4BvZ9017867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 148231 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, 24 Aug 2008 04:12:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=148231 Change 148231 by imp@imp_paco-paco on 2008/08/24 04:11:51 IFC @148228 Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/archtype.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#18 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/bswap.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#10 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#12 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/clockvar.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#17 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/db_machdep.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/defs.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/defs_mips.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#14 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/exec.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/float.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/gdb_machdep.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ieeefp.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#12 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mips_opcode.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pltfm.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#14 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/profile.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/psl.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#10 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/queue.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reg.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reloc.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/resource.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/rm7000.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/setjmp.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sigframe.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/signal.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/smp.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/stdarg.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/trap.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ucontext.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/varargs.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_disasm.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_interface.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_trace.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#26 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/fp.S#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/gdb_machdep.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/genassym.c#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#24 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#28 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mem.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#32 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#12 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#13 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#19 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#12 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#20 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#26 integrate .. //depot/user/imp/freebsd-imp/LOCKS#4 integrate .. //depot/user/imp/freebsd-imp/MAINTAINERS#67 integrate .. //depot/user/imp/freebsd-imp/Makefile#73 integrate .. //depot/user/imp/freebsd-imp/Makefile.inc1#178 integrate .. //depot/user/imp/freebsd-imp/ObsoleteFiles.inc#65 integrate .. //depot/user/imp/freebsd-imp/UPDATING#172 integrate .. //depot/user/imp/freebsd-imp/bin/cp/utils.c#13 integrate .. //depot/user/imp/freebsd-imp/bin/echo/echo.c#7 integrate .. //depot/user/imp/freebsd-imp/bin/ln/ln.1#8 integrate .. //depot/user/imp/freebsd-imp/bin/ln/ln.c#8 integrate .. //depot/user/imp/freebsd-imp/bin/mv/mv.c#10 integrate .. //depot/user/imp/freebsd-imp/bin/ps/ps.c#25 integrate .. //depot/user/imp/freebsd-imp/bin/setfacl/setfacl.1#11 integrate .. //depot/user/imp/freebsd-imp/bin/sh/alias.c#6 integrate .. //depot/user/imp/freebsd-imp/bin/sh/eval.c#15 integrate .. //depot/user/imp/freebsd-imp/bin/sh/expand.c#15 integrate .. //depot/user/imp/freebsd-imp/bin/sh/miscbltin.c#10 integrate .. //depot/user/imp/freebsd-imp/bin/sh/mknodes.c#4 integrate .. //depot/user/imp/freebsd-imp/bin/sh/parser.c#12 integrate .. //depot/user/imp/freebsd-imp/bin/sh/parser.h#4 integrate .. //depot/user/imp/freebsd-imp/bin/stty/gfmt.c#4 integrate .. //depot/user/imp/freebsd-imp/bin/stty/modes.c#3 integrate .. //depot/user/imp/freebsd-imp/bin/stty/print.c#4 integrate .. //depot/user/imp/freebsd-imp/bin/stty/stty.1#7 integrate .. //depot/user/imp/freebsd-imp/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/user/imp/freebsd-imp/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/user/imp/freebsd-imp/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/user/imp/freebsd-imp/cddl/lib/Makefile#7 integrate .. //depot/user/imp/freebsd-imp/cddl/lib/drti/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libctf/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/errno.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/net.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/psinfo.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/sched.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/signal.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/user/imp/freebsd-imp/cddl/usr.bin/Makefile#7 integrate .. //depot/user/imp/freebsd-imp/cddl/usr.bin/ctfconvert/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/usr.bin/ctfdump/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/usr.bin/ctfmerge/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/usr.bin/sgsmsg/Makefile#1 branch .. //depot/user/imp/freebsd-imp/cddl/usr.sbin/Makefile#7 integrate .. //depot/user/imp/freebsd-imp/cddl/usr.sbin/dtrace/Makefile#1 branch .. //depot/user/imp/freebsd-imp/contrib/bind9/CHANGES#12 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/FREEBSD-Upgrade#10 delete .. //depot/user/imp/freebsd-imp/contrib/bind9/FREEBSD-Xlist#4 delete .. //depot/user/imp/freebsd-imp/contrib/bind9/bin/named/client.c#8 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/bin/named/server.c#8 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/doc/arm/Bv9ARM-book.xml#8 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/doc/arm/Bv9ARM.ch06.html#8 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/doc/arm/Bv9ARM.pdf#6 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/bind/aclocal.m4#3 delete .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/bind/config.h.in#6 delete .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/bind/configure#7 delete .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/bind9/check.c#7 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/dns/api#8 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/dns/dispatch.c#6 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/lib/dns/resolver.c#11 integrate .. //depot/user/imp/freebsd-imp/contrib/bind9/version#12 integrate .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/gprof/mips.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/include/coff/mips.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/com_err/ChangeLog#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/Makefile.am#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/Makefile.in#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/com_err.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/com_err.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/com_right.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/compile_et.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/compile_et.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/error.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/lex.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/com_err/lex.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/lex.l#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/parse.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/com_err/parse.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/com_err/parse.y#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/roken_rename.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/com_err/version-script.map#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/ABOUT-NLS#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/COPYING#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/ChangeLog#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/INSTALL#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/NEWS#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/THANKS#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/TODO#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/doc/cpio.texi#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/doc/version.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/alloca_.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-ba.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-eexst.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-fmtstream.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-fmtstream.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-fs-xinl.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-help.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-namefrob.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-parse.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-pin.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-pv.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-pvh.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp-xinl.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/argp.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/basename.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/dirname.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/dirname.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/error.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/error.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/exit.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/exitfail.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/exitfail.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/fatal.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/full-write.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/full-write.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/getopt.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/getopt1.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/getopt_.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/getopt_int.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/gettext.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/hash.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/hash.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/intprops.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/inttostr.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/inttostr.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/localedir.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/mempcpy.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/mempcpy.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/paxerror.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/paxexit.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/paxlib.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/paxnames.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/quote.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/quote.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/quotearg.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/quotearg.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/rmt-command.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/rmt.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/rtapelib.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/safe-read.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/safe-read.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/safe-write.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/safe-write.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/savedir.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/savedir.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/strcase.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/strchrnul.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/strchrnul.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/stripslash.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/strndup.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/strndup.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/strnlen.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/system-ioctl.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/system.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/umaxtostr.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/unlocked-io.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/utimens.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/utimens.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/xalloc-die.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/xalloc.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/xmalloc.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/xstrndup.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/lib/xstrndup.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/cpio/src/copyin.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/copyout.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/copypass.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/cpio.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/cpiohdr.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/defer.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/defer.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/dstring.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/dstring.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/extern.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/filemode.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/filetypes.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/global.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/idcache.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/main.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/makepath.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/tar.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/tar.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/tarhdr.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/userspec.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cpio/src/util.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/cvs/doc/HACKING.DOCS#4 integrate .. //depot/user/imp/freebsd-imp/contrib/cvs/src/classify.c#6 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/COPYING#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/Changes#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/FREEBSD-upgrade#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/MANIFEST#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/Makefile.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/README#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/configure#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/configure.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/doc/expat.png#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/doc/reference.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/doc/style.css#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/doc/valid-xhtml10.png#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/doc/xmlwf.1#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/doc/xmlwf.sgml#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/examples/elements.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/examples/outline.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/expat_config.h.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/ascii.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/expat.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/expat_external.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/lib/internal.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/winconfig.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmlrole.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmlrole.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmltok.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmltok.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/lib/xmltok_ns.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/tests/README.txt#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/tests/benchmark/README.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/benchmark/benchmark.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/benchmark/benchmark.dsp#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/benchmark/benchmark.dsw#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/chardata.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/tests/chardata.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/tests/minicheck.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/minicheck.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/runtests.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/tests/runtestspp.cpp#1 branch .. //depot/user/imp/freebsd-imp/contrib/expat/tests/xmltest.sh#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/xmlwf/codepage.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/xmlwf/readfilemap.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/xmlwf/unixfilemap.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/xmlwf/xmlfile.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/xmlwf/xmlfile.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/expat/xmlwf/xmlwf.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/gcc/common.opt#4 integrate .. //depot/user/imp/freebsd-imp/contrib/gcc/config/i386/freebsd.h#14 integrate .. //depot/user/imp/freebsd-imp/contrib/gcc/doc/invoke.texi#12 integrate .. //depot/user/imp/freebsd-imp/contrib/gdtoa/gethex.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/ip_fil.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/ipsend/iptests.c#8 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/ipsend/sock.c#9 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/lib/printnat.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/test/regress/ni1.nat#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ipfilter/tools/ipnat_y.y#6 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/INSTALL#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/NEWS#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/aclocal.m4#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/config.guess#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/config.sub#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/configure#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/configure.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/dist.mk#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/man/curs_threads.3x#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/man/form.3x#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_bkgd.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_restart.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/fifo_defs.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/init_keytry.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/lib_napms.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tty/lib_tstp.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/netcat/nc.1#10 integrate .. //depot/user/imp/freebsd-imp/contrib/netcat/netcat.c#8 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/COPYRIGHT#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ChangeLog#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ChangeLog-4.1.0#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/CommitLog#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/FREEBSD-upgrade#4 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/INSTALL#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/Makefile.am#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/Makefile.in#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/NEWS#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/README#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/README.bk#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/README.patches#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/README.refclocks#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/README.versions#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/TODO#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/acinclude.m4#4 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/aclocal.m4#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/adjtimed/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/configure#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/depcomp#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/install-sh#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/missing#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/bincheck.mf#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/bootstrap#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/build#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/clockstuff/Makefile.am#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/clockstuff/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/compile#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/config.guess#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/config.h.in#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/config.sub#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/configure#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/configure.ac#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/configure.in#5 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/depcomp#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/flock-build#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/accopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/assoc.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/audio.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/authopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/build.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/config.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/aix#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/changes#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/linux#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/parse#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/todo#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/patches.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/porting.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/quick.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/clockopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/config.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/confopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/copyright.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/debug.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/extern.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/gadget.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/groups.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/a-ux#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/aix#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/bsdi#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/changes#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/decosf1#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/decosf2#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/freebsd#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/hpux#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/linux#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/mpeix#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/netbsd#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/parse#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/refclocks#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/rs6000#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/sco.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/sgi#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/solaris-dosynctodr.html#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/solaris.html#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/sun4#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/todo#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/vxworks.html#4 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/howto.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/index.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/kern.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/keygen.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ldisc.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/manyopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/measure.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/miscopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/monopt.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/msyslog.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/notes.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntpd.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntpq.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntptime.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/parsedata.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/parsenew.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/patches.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/porting.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/pps.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/prefer.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/quick.html#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/html/rdebug.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/refclock.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/release.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/sntp.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/html/tickadj.html#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/Makefile.am#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/adjtime.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ascii.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/autogen-version.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/binio.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/copyright.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/debug-opt.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/homerc.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/net.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/region.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/result.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/l_stdlib.h#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp.h#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_config.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_control.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_crypto.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_fp.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_machine.h#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_random.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_refclock.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_request.h#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_stdlib.h#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/ntpd.h#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/parse.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/recvbuff.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/include/trimble.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/include/version.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/install-sh#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/kernel/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/kernel/sys/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/kernel/sys/parsestreams.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/net.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/netscope.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/Makefile.am#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/a_md5encrypt.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/adjtime.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/audio.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/binio.c#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/caljulian.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/clocktypes.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/decodenetnum.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/dolfptoa.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/humandate.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/icom.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/ieee754io.c#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/iosignal.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/log.c#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/log.h#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/machines.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/mktime.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/msyslog.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/random.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/ranny.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/statestr.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libntp/systime.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/README#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/boolean.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/configfile.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/cook.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/environment.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/genshell.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/genshell.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/libopts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/load.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/nested.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/numeric.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/proto.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/putshell.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/restore.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/save.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/sort.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/stack.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/usage.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libopts/version.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/README#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/binio.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/parse.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ltmain.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/missing#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/mkinstalldirs#5 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/Makefile.am#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/Makefile.in#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/cmd_args.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_config.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_control.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_crypto.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_filegen.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_intres.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_io.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_loopfilter.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_monitor.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_peer.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_proto.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_refclock.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_request.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_restrict.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_timer.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntp_util.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpd.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_acts.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_arbiter.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_arc.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_atom.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_bancomm.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_chu.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_conf.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_datum.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_fg.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_gpsvme.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_heath.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_hopfpci.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_hopfser.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_hpgps.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_irig.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_jjy.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_jupiter.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_leitch.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_local.c#5 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_msfees.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_mx4200.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_neoclock4x.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_nmea.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_oncore.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_palisade.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_palisade.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_parse.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_pst.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_ripencc.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_shm.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_ulink.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_usno.c#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_wwv.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpd/refclock_wwvb.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdate/Makefile.am#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdate/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdate/ntpdate.c#6 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdate/ntptimeset.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/Makefile.am#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpdc/ntpdc_ops.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/Makefile.am#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq.h#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/ntpq/ntpq_ops.c#3 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/packageinfo.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/parseutil/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/parseutil/dcfd.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/parseutil/testdcf.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/Makefile.am#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/VersionName#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/genver#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/html2man.in#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/mkver.in#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/ntpsweep.in#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/README#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/README#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/compile#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/config.guess#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/config.h.in#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/config.sub#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/configure#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/depcomp#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/header.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/install-sh#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/internet.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/internet.h#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/README#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/main.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/missing#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/sntp.1#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/socket.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/timing.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/sntp/version.def#1 branch .. //depot/user/imp/freebsd-imp/contrib/ntp/util/Makefile.am#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/util/Makefile.in#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/util/ansi2knr.c#4 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/util/hist.c#3 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/util/jitter.c#2 integrate .. //depot/user/imp/freebsd-imp/contrib/ntp/util/jitter.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 10:25:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 237AA106566B; Sun, 24 Aug 2008 10:25: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 DB7361065686 for ; Sun, 24 Aug 2008 10:25:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B713F8FC0A for ; Sun, 24 Aug 2008 10:25:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OAPj1I073913 for ; Sun, 24 Aug 2008 10:25:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OAPjhM073911 for perforce@freebsd.org; Sun, 24 Aug 2008 10:25:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 10:25:45 GMT Message-Id: <200808241025.m7OAPjhM073911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148242 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, 24 Aug 2008 10:25:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=148242 Change 148242 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 10:25:02 Canonicalize copyrights, licenses; credit Google. Add a big warning about using this yet. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_enter.2#3 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#10 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#16 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#5 (text+ko) ==== @@ -1,3 +1,6 @@ +WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED ON IN +PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND UNEXPECTED WAYS. + TrustedBSD Capabilities Project ------------------------------- ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_enter.2#3 (text+ko) ==== @@ -1,7 +1,14 @@ .\" -.\" Copyright (c) 2008 Robert Watson +.\" Copyright (c) 2008 Robert N. M. Watson .\" All rights reserved. .\" +.\" WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED +.\" ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND +.\" UNEXPECTED WAYS. +.\" +.\" This software was developed at the University of Cambridge Computer +.\" Laboratory with support from a grant from Google, Inc. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -90,7 +97,10 @@ .Tn TrustedBSD Project. .Sh BUGS -This is a work in progress, please don't use it. +WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED ON IN +PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND UNEXPECTED WAYS. .Sh AUTHORS These functions and the capability facility were created by -.An "Robert N. M. Watson" . +.An "Robert N. M. Watson" +at the University of Cambridge Computer Laboratory with support from a grant +from Google, Inc. ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#5 (text+ko) ==== @@ -1,7 +1,14 @@ .\" -.\" Copyright (c) 2008 Robert Watson +.\" Copyright (c) 2008 Robert N. M. Watson .\" All rights reserved. .\" +.\" WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED +.\" ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND +.\" UNEXPECTED WAYS. +.\" +.\" This software was developed at the University of Cambridge Computer +.\" Laboratory with support from a grant from Google, Inc. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -429,6 +436,11 @@ .Pp Capability rights sometimes have unclear indirect impacts, which should be documented, or at least hinted at. +.Pp +WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED ON IN +PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND UNEXPECTED WAYS. .Sh AUTHORS These functions and the capability facility were created by -.An "Robert N. M. Watson" . +.An "Robert N. M. Watson" +at the University of Cambridge Computer Laboratory with support from a grant +from Google, Inc. ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#10 (text+ko) ==== @@ -1,11 +1,44 @@ # +# Copyright (c) 2008 Robert N. M. Watson +# All rights reserved. +# +# WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED +# ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND +# UNEXPECTED WAYS. +# +# This software was developed at the University of Cambridge Computer +# Laboratory with support from a grant from Google, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (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$ +# # List of system calls enabled in capability mode, one name per line. # # Notes: # - sys_exit() and close() are very important. # - Sorted alphabetically, please keep it that way. # -# $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#9 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#10 $ # __acl_aclcheck_fd __acl_delete_fd ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#18 (text+ko) ==== @@ -2,6 +2,13 @@ * Copyright (c) 2008 Robert N. M. Watson * All rights reserved. * + * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED + * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND + * UNEXPECTED WAYS. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -43,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#17 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#18 $"); #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#16 (text+ko) ==== @@ -2,6 +2,13 @@ * Copyright (c) 2008 Robert N. M. Watson * All rights reserved. * + * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED + * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND + * UNEXPECTED WAYS. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#15 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#16 $ */ /* From owner-p4-projects@FreeBSD.ORG Sun Aug 24 17:09:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C25F1065670; Sun, 24 Aug 2008 17:09:41 +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 60A79106564A for ; Sun, 24 Aug 2008 17:09:41 +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 47E478FC1B for ; Sun, 24 Aug 2008 17:09:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OH9ftq033000 for ; Sun, 24 Aug 2008 17:09:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OH9fkQ032998 for perforce@freebsd.org; Sun, 24 Aug 2008 17:09:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 24 Aug 2008 17:09:41 GMT Message-Id: <200808241709.m7OH9fkQ032998@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 148257 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, 24 Aug 2008 17:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=148257 Change 148257 by hselasky@hselasky_laptop001 on 2008/08/24 17:09:02 Some fixes for the musbotg driver. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#5 (text+ko) ==== @@ -127,7 +127,7 @@ sc = MUSBOTG_BUS2SC(udev->bus); - if (ep_addr < sc->sc_ep_max) { + if (ep_addr <= sc->sc_ep_max) { if (ep_addr == 0) { /* control endpoint */ *ppf = musbotg_ep_profile; @@ -1495,6 +1495,7 @@ { uint8_t nrx; uint8_t ntx; + uint8_t temp; DPRINTFN(1, "start\n"); @@ -1512,21 +1513,12 @@ /* wait a little for things to stabilise */ usb2_pause_mtx(&sc->sc_bus.mtx, 1); - /* disable and clear all interrupts */ + /* disable all interrupts */ MUSB2_WRITE_1(sc, MUSB2_REG_INTUSBE, 0); MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, 0); MUSB2_WRITE_2(sc, MUSB2_REG_INTRXE, 0); - if (MUSB2_READ_1(sc, MUSB2_REG_INTUSB)) { - /* ignore */ - } - if (MUSB2_READ_2(sc, MUSB2_REG_INTTX)) { - /* ignore */ - } - if (MUSB2_READ_2(sc, MUSB2_REG_INTRX)) { - /* ignore */ - } /* disable pullup */ musbotg_pull_common(sc, 0); @@ -1544,6 +1536,14 @@ MUSB2_WRITE_1(sc, MUSB2_REG_POWER, MUSB2_MASK_HSENAB | MUSB2_MASK_ISOUPD); + /* clear Session bit, if set */ + + temp = MUSB2_READ_1(sc, MUSB2_REG_DEVCTL); + temp &= ~MUSB2_MASK_SESS; + MUSB2_WRITE_1(sc, MUSB2_REG_DEVCTL, temp); + + DPRINTF("DEVCTL=0x%02x\n", temp); + /* disable testmode */ MUSB2_WRITE_1(sc, MUSB2_REG_TESTMODE, 0); From owner-p4-projects@FreeBSD.ORG Sun Aug 24 17:13:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F376B1065683; Sun, 24 Aug 2008 17:13:45 +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 B66D61065671 for ; Sun, 24 Aug 2008 17:13:45 +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 842B88FC1D for ; Sun, 24 Aug 2008 17:13:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OHDjee033356 for ; Sun, 24 Aug 2008 17:13:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OHDjki033354 for perforce@freebsd.org; Sun, 24 Aug 2008 17:13:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 24 Aug 2008 17:13:45 GMT Message-Id: <200808241713.m7OHDjki033354@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 148258 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, 24 Aug 2008 17:13:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=148258 Change 148258 by hselasky@hselasky_laptop001 on 2008/08/24 17:13:07 Add generic musbotg system bus interface file for atmelarm. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 24 17:16:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89B93106567D; Sun, 24 Aug 2008 17:16: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 4C80A1065679 for ; Sun, 24 Aug 2008 17:16:49 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 333178FC17 for ; Sun, 24 Aug 2008 17:16:49 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OHGn6n033657 for ; Sun, 24 Aug 2008 17:16:49 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OHGmKY033655 for perforce@freebsd.org; Sun, 24 Aug 2008 17:16:48 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 24 Aug 2008 17:16:48 GMT Message-Id: <200808241716.m7OHGmKY033655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148259 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, 24 Aug 2008 17:16:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=148259 Change 148259 by ed@ed_dull on 2008/08/24 17:15:49 IFC my syscons + ttys commit. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#8 integrate .. //depot/projects/mpsafetty/etc/etc.amd64/ttys#3 integrate .. //depot/projects/mpsafetty/etc/etc.arm/ttys#2 integrate .. //depot/projects/mpsafetty/etc/etc.i386/ttys#3 integrate .. //depot/projects/mpsafetty/etc/etc.ia64/ttys#2 integrate .. //depot/projects/mpsafetty/etc/etc.mips/ttys#2 integrate .. //depot/projects/mpsafetty/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/mpsafetty/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/mpsafetty/libexec/Makefile#3 integrate .. //depot/projects/mpsafetty/libexec/pt_chown/Makefile#4 delete .. //depot/projects/mpsafetty/libexec/pt_chown/pt_chown.c#4 delete .. //depot/projects/mpsafetty/share/man/man4/man4.i386/Makefile#5 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/dpms.4#1 branch .. //depot/projects/mpsafetty/sys/arm/include/endian.h#2 integrate .. //depot/projects/mpsafetty/sys/conf/files#15 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#6 integrate .. //depot/projects/mpsafetty/sys/conf/options#8 integrate .. //depot/projects/mpsafetty/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/mpsafetty/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/mpsafetty/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/mpsafetty/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/conf/NOTES#5 integrate .. //depot/projects/mpsafetty/sys/i386/isa/dpms.c#1 branch .. //depot/projects/mpsafetty/sys/isa/isa_common.c#2 integrate .. //depot/projects/mpsafetty/sys/isa/isavar.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exec.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/tty_pty.c#10 integrate .. //depot/projects/mpsafetty/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#10 integrate .. //depot/projects/mpsafetty/sys/modules/dpms/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/central/central.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/cpio.c#5 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/main.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_basic.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_option_L.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_option_a.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_option_y.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_passthrough_dotdot.c#1 branch .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_passthrough_reverse.c#1 branch .. //depot/projects/mpsafetty/usr.bin/sed/sed.1#2 integrate Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.155 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.156 2008/08/24 10:01:22 ed 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. # +# 20080823: removal of unneeded pt_chown, to implement grantpt(3) +OLD_FILES+=usr/libexec/pt_chown # 20080820: MPSAFE TTY layer integrated OLD_FILES+=usr/include/sys/linedisc.h OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz ==== //depot/projects/mpsafetty/etc/etc.amd64/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.14 2008/07/13 07:20:14 ed Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.16 2008/08/24 08:41:29 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,262 +307,6 @@ ttySt none network ttySu none network ttySv none network -ttyl0 none network -ttyl1 none network -ttyl2 none network -ttyl3 none network -ttyl4 none network -ttyl5 none network -ttyl6 none network -ttyl7 none network -ttyl8 none network -ttyl9 none network -ttyla none network -ttylb none network -ttylc none network -ttyld none network -ttyle none network -ttylf none network -ttylg none network -ttylh none network -ttyli none network -ttylj none network -ttylk none network -ttyll none network -ttylm none network -ttyln none network -ttylo none network -ttylp none network -ttylq none network -ttylr none network -ttyls none network -ttylt none network -ttylu none network -ttylv none network -ttym0 none network -ttym1 none network -ttym2 none network -ttym3 none network -ttym4 none network -ttym5 none network -ttym6 none network -ttym7 none network -ttym8 none network -ttym9 none network -ttyma none network -ttymb none network -ttymc none network -ttymd none network -ttyme none network -ttymf none network -ttymg none network -ttymh none network -ttymi none network -ttymj none network -ttymk none network -ttyml none network -ttymm none network -ttymn none network -ttymo none network -ttymp none network -ttymq none network -ttymr none network -ttyms none network -ttymt none network -ttymu none network -ttymv none network -ttyn0 none network -ttyn1 none network -ttyn2 none network -ttyn3 none network -ttyn4 none network -ttyn5 none network -ttyn6 none network -ttyn7 none network -ttyn8 none network -ttyn9 none network -ttyna none network -ttynb none network -ttync none network -ttynd none network -ttyne none network -ttynf none network -ttyng none network -ttynh none network -ttyni none network -ttynj none network -ttynk none network -ttynl none network -ttynm none network -ttynn none network -ttyno none network -ttynp none network -ttynq none network -ttynr none network -ttyns none network -ttynt none network -ttynu none network -ttynv none network -ttyo0 none network -ttyo1 none network -ttyo2 none network -ttyo3 none network -ttyo4 none network -ttyo5 none network -ttyo6 none network -ttyo7 none network -ttyo8 none network -ttyo9 none network -ttyoa none network -ttyob none network -ttyoc none network -ttyod none network -ttyoe none network -ttyof none network -ttyog none network -ttyoh none network -ttyoi none network -ttyoj none network -ttyok none network -ttyol none network -ttyom none network -ttyon none network -ttyoo none network -ttyop none network -ttyoq none network -ttyor none network -ttyos none network -ttyot none network -ttyou none network -ttyov none network -ttyL0 none network -ttyL1 none network -ttyL2 none network -ttyL3 none network -ttyL4 none network -ttyL5 none network -ttyL6 none network -ttyL7 none network -ttyL8 none network -ttyL9 none network -ttyLa none network -ttyLb none network -ttyLc none network -ttyLd none network -ttyLe none network -ttyLf none network -ttyLg none network -ttyLh none network -ttyLi none network -ttyLj none network -ttyLk none network -ttyLl none network -ttyLm none network -ttyLn none network -ttyLo none network -ttyLp none network -ttyLq none network -ttyLr none network -ttyLs none network -ttyLt none network -ttyLu none network -ttyLv none network -ttyM0 none network -ttyM1 none network -ttyM2 none network -ttyM3 none network -ttyM4 none network -ttyM5 none network -ttyM6 none network -ttyM7 none network -ttyM8 none network -ttyM9 none network -ttyMa none network -ttyMb none network -ttyMc none network -ttyMd none network -ttyMe none network -ttyMf none network -ttyMg none network -ttyMh none network -ttyMi none network -ttyMj none network -ttyMk none network -ttyMl none network -ttyMm none network -ttyMn none network -ttyMo none network -ttyMp none network -ttyMq none network -ttyMr none network -ttyMs none network -ttyMt none network -ttyMu none network -ttyMv none network -ttyN0 none network -ttyN1 none network -ttyN2 none network -ttyN3 none network -ttyN4 none network -ttyN5 none network -ttyN6 none network -ttyN7 none network -ttyN8 none network -ttyN9 none network -ttyNa none network -ttyNb none network -ttyNc none network -ttyNd none network -ttyNe none network -ttyNf none network -ttyNg none network -ttyNh none network -ttyNi none network -ttyNj none network -ttyNk none network -ttyNl none network -ttyNm none network -ttyNn none network -ttyNo none network -ttyNp none network -ttyNq none network -ttyNr none network -ttyNs none network -ttyNt none network -ttyNu none network -ttyNv none network -ttyO0 none network -ttyO1 none network -ttyO2 none network -ttyO3 none network -ttyO4 none network -ttyO5 none network -ttyO6 none network -ttyO7 none network -ttyO8 none network -ttyO9 none network -ttyOa none network -ttyOb none network -ttyOc none network -ttyOd none network -ttyOe none network -ttyOf none network -ttyOg none network -ttyOh none network -ttyOi none network -ttyOj none network -ttyOk none network -ttyOl none network -ttyOm none network -ttyOn none network -ttyOo none network -ttyOp none network -ttyOq none network -ttyOr none network -ttyOs none network -ttyOt none network -ttyOu none network -ttyOv none network pts/0 none network pts/1 none network pts/2 none network @@ -819,3 +563,259 @@ pts/253 none network pts/254 none network pts/255 none network +pts/256 none network +pts/257 none network +pts/258 none network +pts/259 none network +pts/260 none network +pts/262 none network +pts/262 none network +pts/263 none network +pts/264 none network +pts/265 none network +pts/266 none network +pts/267 none network +pts/268 none network +pts/269 none network +pts/270 none network +pts/272 none network +pts/272 none network +pts/273 none network +pts/274 none network +pts/275 none network +pts/276 none network +pts/277 none network +pts/278 none network +pts/279 none network +pts/280 none network +pts/282 none network +pts/282 none network +pts/283 none network +pts/284 none network +pts/285 none network +pts/286 none network +pts/287 none network +pts/288 none network +pts/289 none network +pts/290 none network +pts/292 none network +pts/292 none network +pts/293 none network +pts/294 none network +pts/295 none network +pts/296 none network +pts/297 none network +pts/298 none network +pts/299 none network +pts/300 none network +pts/301 none network +pts/302 none network +pts/303 none network +pts/304 none network +pts/305 none network +pts/306 none network +pts/307 none network +pts/308 none network +pts/309 none network +pts/310 none network +pts/311 none network +pts/312 none network +pts/313 none network +pts/314 none network +pts/315 none network +pts/316 none network +pts/317 none network +pts/318 none network +pts/319 none network +pts/320 none network +pts/321 none network +pts/322 none network +pts/323 none network +pts/324 none network +pts/325 none network +pts/326 none network +pts/327 none network +pts/328 none network +pts/329 none network +pts/330 none network +pts/331 none network +pts/332 none network +pts/333 none network +pts/334 none network +pts/335 none network +pts/336 none network +pts/337 none network +pts/338 none network +pts/339 none network +pts/340 none network +pts/341 none network +pts/342 none network +pts/343 none network +pts/344 none network +pts/345 none network +pts/346 none network +pts/347 none network +pts/348 none network +pts/349 none network +pts/350 none network +pts/351 none network +pts/352 none network +pts/353 none network +pts/354 none network +pts/355 none network +pts/356 none network +pts/357 none network +pts/358 none network +pts/359 none network +pts/360 none network +pts/362 none network +pts/362 none network +pts/363 none network +pts/364 none network +pts/365 none network +pts/366 none network +pts/367 none network +pts/368 none network +pts/369 none network +pts/370 none network +pts/372 none network +pts/372 none network +pts/373 none network +pts/374 none network +pts/375 none network +pts/376 none network +pts/377 none network +pts/378 none network +pts/379 none network +pts/380 none network +pts/382 none network +pts/382 none network +pts/383 none network +pts/384 none network +pts/385 none network +pts/386 none network +pts/387 none network +pts/388 none network +pts/389 none network +pts/390 none network +pts/392 none network +pts/392 none network +pts/393 none network +pts/394 none network +pts/395 none network +pts/396 none network +pts/397 none network +pts/398 none network +pts/399 none network +pts/400 none network +pts/401 none network +pts/402 none network +pts/403 none network +pts/404 none network +pts/405 none network +pts/406 none network +pts/407 none network +pts/408 none network +pts/409 none network +pts/410 none network +pts/411 none network +pts/412 none network +pts/413 none network +pts/414 none network +pts/415 none network +pts/416 none network +pts/417 none network +pts/418 none network +pts/419 none network +pts/420 none network +pts/421 none network +pts/422 none network +pts/423 none network +pts/424 none network +pts/425 none network +pts/426 none network +pts/427 none network +pts/428 none network +pts/429 none network +pts/430 none network +pts/431 none network +pts/432 none network +pts/433 none network +pts/434 none network +pts/435 none network +pts/436 none network +pts/437 none network +pts/438 none network +pts/439 none network +pts/440 none network +pts/441 none network +pts/442 none network +pts/443 none network +pts/444 none network +pts/445 none network +pts/446 none network +pts/447 none network +pts/448 none network +pts/449 none network +pts/450 none network +pts/451 none network +pts/452 none network +pts/453 none network +pts/454 none network +pts/455 none network +pts/456 none network +pts/457 none network +pts/458 none network +pts/459 none network +pts/460 none network +pts/462 none network +pts/462 none network +pts/463 none network +pts/464 none network +pts/465 none network +pts/466 none network +pts/467 none network +pts/468 none network +pts/469 none network +pts/470 none network +pts/472 none network +pts/472 none network +pts/473 none network +pts/474 none network +pts/475 none network +pts/476 none network +pts/477 none network +pts/478 none network +pts/479 none network +pts/480 none network +pts/482 none network +pts/482 none network +pts/483 none network +pts/484 none network +pts/485 none network +pts/486 none network +pts/487 none network +pts/488 none network +pts/489 none network +pts/490 none network +pts/492 none network +pts/492 none network +pts/493 none network +pts/494 none network +pts/495 none network +pts/496 none network +pts/497 none network +pts/498 none network +pts/499 none network +pts/500 none network +pts/501 none network +pts/502 none network +pts/503 none network +pts/504 none network +pts/505 none network +pts/506 none network +pts/507 none network +pts/508 none network +pts/509 none network +pts/510 none network +pts/511 none network ==== //depot/projects/mpsafetty/etc/etc.arm/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.6 2007/11/19 20:49:41 jhb Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.8 2008/08/24 08:41:29 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,262 +307,6 @@ ttySt none network ttySu none network ttySv none network -ttyl0 none network -ttyl1 none network -ttyl2 none network -ttyl3 none network -ttyl4 none network -ttyl5 none network -ttyl6 none network -ttyl7 none network -ttyl8 none network -ttyl9 none network -ttyla none network -ttylb none network -ttylc none network -ttyld none network -ttyle none network -ttylf none network -ttylg none network -ttylh none network -ttyli none network -ttylj none network -ttylk none network -ttyll none network -ttylm none network -ttyln none network -ttylo none network -ttylp none network -ttylq none network -ttylr none network -ttyls none network -ttylt none network -ttylu none network -ttylv none network -ttym0 none network -ttym1 none network -ttym2 none network -ttym3 none network -ttym4 none network -ttym5 none network -ttym6 none network -ttym7 none network -ttym8 none network -ttym9 none network -ttyma none network -ttymb none network -ttymc none network -ttymd none network -ttyme none network -ttymf none network -ttymg none network -ttymh none network -ttymi none network -ttymj none network -ttymk none network -ttyml none network -ttymm none network -ttymn none network -ttymo none network -ttymp none network -ttymq none network -ttymr none network -ttyms none network -ttymt none network -ttymu none network -ttymv none network -ttyn0 none network -ttyn1 none network -ttyn2 none network -ttyn3 none network -ttyn4 none network -ttyn5 none network -ttyn6 none network -ttyn7 none network -ttyn8 none network -ttyn9 none network -ttyna none network -ttynb none network -ttync none network -ttynd none network -ttyne none network -ttynf none network -ttyng none network -ttynh none network -ttyni none network -ttynj none network -ttynk none network -ttynl none network -ttynm none network -ttynn none network -ttyno none network -ttynp none network -ttynq none network -ttynr none network -ttyns none network -ttynt none network -ttynu none network -ttynv none network -ttyo0 none network -ttyo1 none network -ttyo2 none network -ttyo3 none network -ttyo4 none network -ttyo5 none network -ttyo6 none network -ttyo7 none network -ttyo8 none network -ttyo9 none network -ttyoa none network -ttyob none network -ttyoc none network -ttyod none network -ttyoe none network -ttyof none network -ttyog none network -ttyoh none network -ttyoi none network -ttyoj none network -ttyok none network -ttyol none network -ttyom none network -ttyon none network -ttyoo none network -ttyop none network -ttyoq none network -ttyor none network -ttyos none network -ttyot none network -ttyou none network -ttyov none network -ttyL0 none network -ttyL1 none network -ttyL2 none network -ttyL3 none network -ttyL4 none network -ttyL5 none network -ttyL6 none network -ttyL7 none network -ttyL8 none network -ttyL9 none network -ttyLa none network -ttyLb none network -ttyLc none network -ttyLd none network -ttyLe none network -ttyLf none network -ttyLg none network -ttyLh none network -ttyLi none network -ttyLj none network -ttyLk none network -ttyLl none network -ttyLm none network -ttyLn none network -ttyLo none network -ttyLp none network -ttyLq none network -ttyLr none network -ttyLs none network -ttyLt none network -ttyLu none network -ttyLv none network -ttyM0 none network -ttyM1 none network -ttyM2 none network -ttyM3 none network -ttyM4 none network -ttyM5 none network -ttyM6 none network -ttyM7 none network -ttyM8 none network -ttyM9 none network -ttyMa none network -ttyMb none network -ttyMc none network -ttyMd none network -ttyMe none network -ttyMf none network -ttyMg none network -ttyMh none network -ttyMi none network -ttyMj none network -ttyMk none network -ttyMl none network -ttyMm none network -ttyMn none network -ttyMo none network -ttyMp none network -ttyMq none network -ttyMr none network -ttyMs none network -ttyMt none network -ttyMu none network -ttyMv none network -ttyN0 none network -ttyN1 none network -ttyN2 none network -ttyN3 none network -ttyN4 none network -ttyN5 none network -ttyN6 none network -ttyN7 none network -ttyN8 none network -ttyN9 none network -ttyNa none network -ttyNb none network -ttyNc none network -ttyNd none network -ttyNe none network -ttyNf none network -ttyNg none network -ttyNh none network -ttyNi none network -ttyNj none network -ttyNk none network -ttyNl none network -ttyNm none network -ttyNn none network -ttyNo none network -ttyNp none network -ttyNq none network -ttyNr none network -ttyNs none network -ttyNt none network -ttyNu none network -ttyNv none network -ttyO0 none network -ttyO1 none network -ttyO2 none network -ttyO3 none network -ttyO4 none network -ttyO5 none network -ttyO6 none network -ttyO7 none network -ttyO8 none network -ttyO9 none network -ttyOa none network -ttyOb none network -ttyOc none network -ttyOd none network -ttyOe none network -ttyOf none network -ttyOg none network -ttyOh none network -ttyOi none network -ttyOj none network -ttyOk none network -ttyOl none network -ttyOm none network -ttyOn none network -ttyOo none network -ttyOp none network -ttyOq none network -ttyOr none network -ttyOs none network -ttyOt none network -ttyOu none network -ttyOv none network pts/0 none network pts/1 none network pts/2 none network @@ -819,3 +563,259 @@ pts/253 none network pts/254 none network pts/255 none network +pts/256 none network +pts/257 none network +pts/258 none network >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 18:51:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFC8A1065677; Sun, 24 Aug 2008 18:51: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 A3D011065687 for ; Sun, 24 Aug 2008 18:51:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 588668FC15 for ; Sun, 24 Aug 2008 18:51:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OIpRqr043037 for ; Sun, 24 Aug 2008 18:51:27 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OIpRjH043035 for perforce@freebsd.org; Sun, 24 Aug 2008 18:51:27 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 Aug 2008 18:51:27 GMT Message-Id: <200808241851.m7OIpRjH043035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148266 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, 24 Aug 2008 18:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=148266 Change 148266 by trasz@trasz_traszkan on 2008/08/24 18:51:01 Fix a case when there is more than one file name given in the setfacl(1) command line. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#44 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#13 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#44 (text+ko) ==== @@ -2,6 +2,9 @@ - Add support for NFS4 ACLs to tar(1). +- Add unit test to verify correct operation if several file names + are given to getfacl(1) and setfacl(1). + - Clean up #defines. For example, make VREAD_NAMED_ATTRS equal to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#13 (text+ko) ==== @@ -65,16 +65,6 @@ acl_t acl = NULL; struct stat sb; - if (pathconf(filename, _PC_EXTENDED_SECURITY_NP)) { - if (type == ACL_TYPE_ACCESS) { - type = ACL_TYPE_NFS4; - } else { - warnx("%s: there are no default entries in NFS4 ACLs", - filename); - return (NULL); - } - } - switch (type) { case ACL_TYPE_ACCESS: case ACL_TYPE_NFS4: @@ -252,15 +242,24 @@ /* cycle through each file */ TAILQ_FOREACH(file, &filelist, next) { + local_error = 0; + + if (pathconf(file->filename, _PC_EXTENDED_SECURITY_NP)) { + if (acl_type == ACL_TYPE_DEFAULT) { + warnx("%s: there are no default entries " + "in NFS4 ACLs", file->filename); + continue; + } + + acl_type = ACL_TYPE_NFS4; + + } else if (acl_type == ACL_TYPE_NFS4) + acl_type = ACL_TYPE_ACCESS; + acl = get_file_acl(file->filename, acl_type, h_flag); if (acl == NULL) continue; - local_error = 0; - - if (acl_type != ACL_TYPE_DEFAULT && pathconf(file->filename, _PC_EXTENDED_SECURITY_NP)) - acl_type = ACL_TYPE_NFS4; - /* cycle through each option */ TAILQ_FOREACH(entry, &entrylist, next) { if (local_error) From owner-p4-projects@FreeBSD.ORG Sun Aug 24 19:28:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E22FC106568A; Sun, 24 Aug 2008 19:28: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 A4D771065684 for ; Sun, 24 Aug 2008 19:28:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A00708FC1A for ; Sun, 24 Aug 2008 19:28:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OJS4al047218 for ; Sun, 24 Aug 2008 19:28:04 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OJS4AA047216 for perforce@freebsd.org; Sun, 24 Aug 2008 19:28:04 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 24 Aug 2008 19:28:04 GMT Message-Id: <200808241928.m7OJS4AA047216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148269 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, 24 Aug 2008 19:28:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=148269 Change 148269 by rpaulo@rpaulo_epsilon on 2008/08/24 19:27:48 Left pad dumpfiles with 0. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#13 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#12 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#13 $ */ #include @@ -91,7 +91,7 @@ assert(cp->pktshead != NULL); for (i = 0; i < 3000; i++) { - snprintf(path, sizeof(path), "%s/dump%d.txt", DUMPER_PATH, i); + snprintf(path, sizeof(path), "%s/dump%03d.txt", DUMPER_PATH, i); if (access(path, F_OK) != 0) break; /* XXX: race [1] */ @@ -108,7 +108,7 @@ return; } - snprintf(cappath, sizeof(cappath), "%s/dump%d.cap", DUMPER_PATH, i); + snprintf(cappath, sizeof(cappath), "%s/dump%03d.cap", DUMPER_PATH, i); pd = pcap_dump_open(p, cappath); if (pd == NULL) { fprintf(stderr, "%s: %s\n", __func__, pcap_geterr(p)); From owner-p4-projects@FreeBSD.ORG Sun Aug 24 20:21:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F2CF1065670; Sun, 24 Aug 2008 20:21: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 33DAF106564A for ; Sun, 24 Aug 2008 20:21:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31E7C8FC19 for ; Sun, 24 Aug 2008 20:21:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OKL0dw053141 for ; Sun, 24 Aug 2008 20:21:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OKKx2o053139 for perforce@freebsd.org; Sun, 24 Aug 2008 20:20:59 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 20:20:59 GMT Message-Id: <200808242020.m7OKKx2o053139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148278 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, 24 Aug 2008 20:21:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=148278 Change 148278 by julian@julian_trafmon1 on 2008/08/24 20:20:45 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/vimage/src/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage/src/sys/arm/include/endian.h#3 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#30 integrate .. //depot/projects/vimage/src/sys/conf/files#36 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#18 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#10 integrate .. //depot/projects/vimage/src/sys/conf/options#29 integrate .. //depot/projects/vimage/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#9 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/vimage/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex_isa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_exvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#11 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#14 integrate .. //depot/projects/vimage/src/sys/dev/mii/mii.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/vimage/src/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/vimage/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scvesactl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/vimage/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/vimage/src/sys/dev/usb/uvisor.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#22 integrate .. //depot/projects/vimage/src/sys/i386/conf/XBOX#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#6 integrate .. //depot/projects/vimage/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#10 integrate .. //depot/projects/vimage/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/vimage/src/sys/isa/isa_common.c#3 integrate .. //depot/projects/vimage/src/sys/isa/isavar.h#2 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#21 integrate .. //depot/projects/vimage/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_acct.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#22 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#15 integrate .. //depot/projects/vimage/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/vimage/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#18 integrate .. //depot/projects/vimage/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/vimage/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/vimage/src/sys/kern/tty_cons.c#7 integrate .. //depot/projects/vimage/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/vimage/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/vimage/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/vimage/src/sys/kern/tty_pts.c#6 integrate .. //depot/projects/vimage/src/sys/kern/tty_pty.c#7 integrate .. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/vimage/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#26 integrate .. //depot/projects/vimage/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/if.c#34 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#36 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#14 edit .. //depot/projects/vimage/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/vimage/src/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#10 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#12 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#13 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_ifoff/mac_ifoff.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#12 integrate .. //depot/projects/vimage/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/vimage/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/fhc/fhc.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/sbus.c#8 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#11 integrate .. //depot/projects/vimage/src/sys/sys/copyright.h#5 integrate .. //depot/projects/vimage/src/sys/sys/file.h#7 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#14 integrate .. //depot/projects/vimage/src/sys/sys/linedisc.h#2 delete .. //depot/projects/vimage/src/sys/sys/param.h#25 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#21 integrate .. //depot/projects/vimage/src/sys/sys/resource.h#7 integrate .. //depot/projects/vimage/src/sys/sys/resourcevar.h#4 integrate .. //depot/projects/vimage/src/sys/sys/syscall.h#6 integrate .. //depot/projects/vimage/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/vimage/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/vimage/src/sys/sys/termios.h#4 integrate .. //depot/projects/vimage/src/sys/sys/tty.h#4 integrate .. //depot/projects/vimage/src/sys/sys/ttycom.h#4 integrate .. //depot/projects/vimage/src/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/vimage/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/vimage/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/vimage/src/sys/sys/user.h#8 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/vm/uma_core.c#9 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#3 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#20 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,7 @@ device random # Entropy device device ether # Ethernet support device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) +device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) ==== //depot/projects/vimage/src/sys/amd64/include/pci_cfgreg.h#3 (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/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ * */ @@ -37,6 +37,7 @@ #define CONF1_ENABLE_MSK1 0x80000001ul #define CONF1_ENABLE_RES1 0x80000000ul +int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); ==== //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); #include #include @@ -36,11 +36,26 @@ #include #include #include +#include +#include #include +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_PCIE, +}; + +static int pciereg_cfgread(int bus, unsigned slot, unsigned func, + unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +static int cfgmech; +static vm_offset_t pcie_base; +static int pcie_minbus, pcie_maxbus; static struct mtx pcicfg_mtx; /* @@ -49,12 +64,42 @@ int pci_cfgregopen(void) { - static int opened = 0; + uint64_t pciebar; + uint16_t did, vid; - if (opened) + if (cfgmech != CFGMECH_NONE) return (1); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); - opened = 1; + cfgmech = CFGMECH_1; + + /* + * Grope around in the PCI config space to see if this is a + * chipset that is capable of doing memory-mapped config cycles. + * This also implies that it can do PCIe extended config cycles. + */ + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + return (1); } @@ -130,6 +175,11 @@ int data = -1; int port; + if (cfgmech == CFGMECH_PCIE) { + data = pciereg_cfgread(bus, slot, func, reg, bytes); + return (data); + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -155,6 +205,11 @@ { int port; + if (cfgmech == CFGMECH_PCIE) { + pciereg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -173,3 +228,82 @@ } mtx_unlock_spin(&pcicfg_mtx); } + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (minbus != 0) + return (0); + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", + base); + + /* XXX: We should make sure this really fits into the direct map. */ + pcie_base = (vm_offset_t)pmap_mapdev(base, (maxbus + 1) << 20); + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + return (1); +} + +#define PCIE_VADDR(base, reg, bus, slot, func) \ + ((base) + \ + ((((bus) & 0xff) << 20) | \ + (((slot) & 0x1f) << 15) | \ + (((func) & 0x7) << 12) | \ + ((reg) & 0xfff))) + +static int +pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, + unsigned bytes) +{ + volatile vm_offset_t va; + int data = -1; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return (-1); + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + data = *(volatile uint32_t *)(va); + break; + case 2: + data = *(volatile uint16_t *)(va); + break; + case 1: + data = *(volatile uint8_t *)(va); + break; + } + + return (data); +} + +static void +pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes) +{ + volatile vm_offset_t va; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return; + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + *(volatile uint32_t *)(va) = data; + break; + case 2: + *(volatile uint16_t *)(va) = data; + break; + case 1: + *(volatile uint8_t *)(va) = data; + break; + } +} ==== //depot/projects/vimage/src/sys/arm/include/endian.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $ */ #ifndef _ENDIAN_H_ @@ -94,7 +94,7 @@ : "+r" (v), "=r" (t1)); return (v); - } +} static __inline __uint16_t __bswap16_var(__uint16_t v) ==== //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#5 (text+ko) ==== @@ -8,7 +8,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -28,7 +29,6 @@ #include #include -#include #include #include #include @@ -438,7 +438,7 @@ while (len) { if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 || itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) { - /* Allocate a physical page, claim the virtual area */ + /* Allocate a physical page, claim the virtual area. */ if (pa == (vm_offset_t)-1) { pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M); if (pa == (vm_offset_t)-1) @@ -448,7 +448,9 @@ panic("%s: can't claim virtual page " "(wanted %#lx, got %#lx)", __func__, va, mva); - /* The mappings may have changed, be paranoid. */ + /* + * The mappings may have changed, be paranoid. + */ continue; } /* @@ -553,6 +555,7 @@ } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); + if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max, sizeof(dtlb_slot_max)) == -1 || OF_getprop(child, "#itlb-entries", &itlb_slot_max, @@ -580,7 +583,7 @@ struct devsw **dp; /* - * Tell the Open Firmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the OFW gate. */ OF_init(openfirm); ==== //depot/projects/vimage/src/sys/bsm/audit_kevents.h#6 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.14 2008/08/20 08:31:58 ed Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -548,6 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ +#define AUE_POSIXOPENPT 43153 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 (text+ko) ==== @@ -382,6 +382,49 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN +#elif defined(__mips__) + +/* + * Define the appropriate "processor characteristics" + */ +#define _STACK_GROWS_DOWNWARD +#define _LONG_LONG_LTOH +#define _BIT_FIELDS_LTOH +#define _IEEE_754 +#define _CHAR_IS_SIGNED +#define _BOOL_ALIGNMENT 1 +#define _CHAR_ALIGNMENT 1 +#define _SHORT_ALIGNMENT 2 +#define _INT_ALIGNMENT 4 +#define _FLOAT_ALIGNMENT 4 +#define _FLOAT_COMPLEX_ALIGNMENT 4 +#define _LONG_ALIGNMENT 4 +#define _LONG_LONG_ALIGNMENT 4 +#define _DOUBLE_ALIGNMENT 4 +#define _DOUBLE_COMPLEX_ALIGNMENT 4 +#define _LONG_DOUBLE_ALIGNMENT 4 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4 +#define _POINTER_ALIGNMENT 4 +#define _MAX_ALIGNMENT 4 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT + +/* + * Define the appropriate "implementation choices". + */ +#define _ILP32 +#if !defined(_I32LPx) && defined(_KERNEL) +#define _I32LPx +#endif +#define _SUNOS_VTOC_16 +#define _DMA_USES_PHYSADDR +#define _FIRMWARE_NEEDS_FDISK +#define _PSM_MODULES +#define _RTC_CONFIG +#define _DONT_USE_1275_GENERIC_NAMES +#define _HAVE_CPUID_INSN + #elif defined(__powerpc__) /* ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.87 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.88 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.85 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.87 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ #define FREEBSD32_SYS_syscall 0 @@ -355,4 +355,5 @@ #define FREEBSD32_SYS_renameat 501 #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 -#define FREEBSD32_SYS_MAXSYSCALL 504 +#define FREEBSD32_SYS_posix_openpt 504 +#define FREEBSD32_SYS_MAXSYSCALL 505 ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.76 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.78 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ const char *freebsd32_syscallnames[] = { @@ -511,4 +511,5 @@ "renameat", /* 501 = renameat */ "symlinkat", /* 502 = symlinkat */ "unlinkat", /* 503 = unlinkat */ + "posix_openpt", /* 504 = posix_openpt */ }; ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.86 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.88 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ #include "opt_compat.h" @@ -542,4 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#10 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -31,6 +31,13 @@ ; NOSTD implemented but as a lkm that can be statically ; compiled in; sysent entry will be filled with lkmsys ; so the SYSCALL_MODULE macro works +; NOARGS same as STD except do not create structure in sys/sysproto.h +; NODEF same as STD except only have the entry in the syscall table +; added. Meaning - do do not create structure or function +; prototype in sys/sysproto.h +; NOPROTO same as STD except do not create structure or +; function prototype in sys/sysproto.h. Does add a +; definition to syscall.h besides adding a sysent. ; #ifdef's, etc. may be included, and are copied to the output files. @@ -846,3 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } +504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" @@ -297,6 +297,11 @@ unsigned short ws_xpixel, ws_ypixel; }; +struct speedtab { + int sp_speed; /* Speed. */ + int sp_code; /* Code. */ +}; + static struct speedtab sptab[] = { { B0, LINUX_B0 }, { B50, LINUX_B50 }, { B75, LINUX_B75 }, { B110, LINUX_B110 }, @@ -396,7 +401,7 @@ lios->c_oflag |= LINUX_OPOST; if (bios->c_oflag & ONLCR) lios->c_oflag |= LINUX_ONLCR; - if (bios->c_oflag & OXTABS) + if (bios->c_oflag & TAB3) lios->c_oflag |= LINUX_XTABS; lios->c_cflag = bsd_to_linux_speed(bios->c_ispeed, sptab); @@ -538,7 +543,7 @@ if (lios->c_oflag & LINUX_ONLCR) bios->c_oflag |= ONLCR; if (lios->c_oflag & LINUX_XTABS) - bios->c_oflag |= OXTABS; + bios->c_oflag |= TAB3; bios->c_cflag = (lios->c_cflag & LINUX_CSIZE) << 4; if (lios->c_cflag & LINUX_CSTOPB) ==== //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.92 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -109,8 +110,17 @@ if (fp->f_vnode != NULL && fp->f_vnode->v_un.vu_cdev != NULL && linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, - &major, &minor) == 0) + &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); + } else if (fp->f_type == DTYPE_PTS) { + struct tty *tp = fp->f_data; + + /* Convert the numbers for the slave device. */ + if (linux_driver_get_major_minor(tp->t_dev->si_name, + &major, &minor) == 0) { + buf->st_rdev = (major << 8 | minor); + } + } fdrop(fp, td); } ==== //depot/projects/vimage/src/sys/conf/NOTES#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1503 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1275,11 +1275,7 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -# The `pty' device usually turns out to be ``effectively mandatory'', -# as it is required for `telnetd', `rlogind', `screen', `emacs', and -# `xterm', among others. - -device pty #Pseudo ttys +device pty #BSD-style compatibility pseudo ttys device nmdm #back-to-back tty devices device md #Memory/malloc disk device ccd #Concatenated disk driver @@ -1291,9 +1287,6 @@ # Size of the kernel message buffer. Should be N * pagesize. options MSGBUF_SIZE=40960 -# Maximum size of a tty or pty input buffer. -options TTYHOG=8193 - ##################################################################### # HARDWARE DEVICE CONFIGURATION ==== //depot/projects/vimage/src/sys/conf/files#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -572,6 +572,7 @@ dev/drm/i915_drv.c optional i915drm dev/drm/i915_irq.c optional i915drm dev/drm/i915_mem.c optional i915drm +dev/drm/i915_suspend.c optional i915drm dev/drm/mach64_dma.c optional mach64drm dev/drm/mach64_drv.c optional mach64drm dev/drm/mach64_irq.c optional mach64drm @@ -1662,12 +1663,14 @@ kern/sysv_shm.c optional sysvshm kern/tty.c standard kern/tty_compat.c optional compat_43tty -kern/tty_conf.c standard kern/tty_cons.c standard kern/tty_info.c standard -kern/tty_pts.c optional pty +kern/tty_inq.c standard +kern/tty_outq.c standard +kern/tty_pts.c standard kern/tty_pty.c optional pty kern/tty_tty.c standard +kern/tty_ttydisc.c standard kern/uipc_accf.c optional inet kern/uipc_cow.c optional zero_copy_sockets kern/uipc_debug.c optional ddb @@ -2357,4 +2360,4 @@ dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen+dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage/src/sys/conf/files.i386#18 (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.604 2008/08/17 23:44:09 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -329,6 +329,7 @@ #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen +i386/isa/dpms.c optional dpms >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 20:42:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45BDD1065671; Sun, 24 Aug 2008 20:42: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 098C5106566B for ; Sun, 24 Aug 2008 20:42:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A2438FC14 for ; Sun, 24 Aug 2008 20:42:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OKgL3Z054923 for ; Sun, 24 Aug 2008 20:42:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OKgLOE054921 for perforce@freebsd.org; Sun, 24 Aug 2008 20:42:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 20:42:21 GMT Message-Id: <200808242042.m7OKgLOE054921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148280 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, 24 Aug 2008 20:42:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=148280 Change 148280 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 20:42:11 Fix syntax error. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_proc.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_proc.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ bcopy(ucred.cr_groups, kp->ki_groups, NGROUPS * sizeof(gid_t)); kp->ki_uid = ucred.cr_uid; - kp->ki_cr_flags = ucred.cr_flags + kp->ki_cr_flags = ucred.cr_flags; if (ucred.cr_prison != NULL) { if (KREAD(kd, (u_long)ucred.cr_prison, &pr)) { _kvm_err(kd, kd->program, From owner-p4-projects@FreeBSD.ORG Sun Aug 24 20:50:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9993D1065683; Sun, 24 Aug 2008 20:50:30 +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 5D42F1065681 for ; Sun, 24 Aug 2008 20:50:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E67D8FC0C for ; Sun, 24 Aug 2008 20:50:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OKoUuv064837 for ; Sun, 24 Aug 2008 20:50:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OKoUw1064835 for perforce@freebsd.org; Sun, 24 Aug 2008 20:50:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 20:50:30 GMT Message-Id: <200808242050.m7OKoUw1064835@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148281 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, 24 Aug 2008 20:50:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=148281 Change 148281 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 20:50:22 Don't allow setuid/setgid/MAC transition in capability mode for reasons of conservatism; comment on this. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#12 (text+ko) ==== @@ -631,6 +631,13 @@ * Don't honor setuid/setgid if the filesystem prohibits it or if * the process is being traced. * + * We disable setuid/setgid/etc in capability mode on the basis that + * most setugid applications are not written with that environment in + * mind, and will therefore almost certainly operate incorrectly. In + * principle there's no reason that setugid applications might not be + * useful in capability mode, so we may want to reconsider this + * conservative design choice in the future. + * * XXXMAC: For the time being, use NOSUID to also prohibit * transitions on the file system. */ @@ -647,6 +654,7 @@ #endif if (credential_changing && + (oldcred->cr_flags & CRED_FLAG_CAPMODE) == 0 && (imgp->vp->v_mount->mnt_flag & MNT_NOSUID) == 0 && (p->p_flag & P_TRACED) == 0) { /* From owner-p4-projects@FreeBSD.ORG Sun Aug 24 20:55:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 014BF1065690; Sun, 24 Aug 2008 20:55: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 B931C106567A for ; Sun, 24 Aug 2008 20:55:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A04638FC1B for ; Sun, 24 Aug 2008 20:55:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OKtZrc065286 for ; Sun, 24 Aug 2008 20:55:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OKtZA6065284 for perforce@freebsd.org; Sun, 24 Aug 2008 20:55:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 20:55:35 GMT Message-Id: <200808242055.m7OKtZA6065284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148282 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, 24 Aug 2008 20:55:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=148282 Change 148282 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 20:55:02 Remove man page TODO -- that's done. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#6 (text+ko) ==== @@ -19,8 +19,6 @@ mode so won't affect general performance, just capability mode performance until optimizations are found. -- man pages for system calls - - ... bigger and better things ... Low-level TODO list: From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:00:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49EFD1065675; Sun, 24 Aug 2008 21:00:41 +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 0E1DF106566B for ; Sun, 24 Aug 2008 21:00:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 102FD8FC1E for ; Sun, 24 Aug 2008 21:00:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OL0e46065752 for ; Sun, 24 Aug 2008 21:00:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OL0ekw065750 for perforce@freebsd.org; Sun, 24 Aug 2008 21:00:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 21:00:40 GMT Message-Id: <200808242100.m7OL0ekw065750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148284 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, 24 Aug 2008 21:00:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=148284 Change 148284 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 21:00:21 Make fgetcap(9) return a reference to the capability, not just the capability, that it retrieves. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#11 (text+ko) ==== @@ -2151,7 +2151,7 @@ fgetcap(struct thread *td, int fd, struct file **fpp) { - return (_fget(td, fd, fpp, 0, 0, FGET_GETCAP)); + return (_fget(td, fd, fpp, 0, 0, FGET_GETCAP | FGET_HOLD)); } /* From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:07:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7C2F1065692; Sun, 24 Aug 2008 21:07: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 8EA851065687 for ; Sun, 24 Aug 2008 21:07:49 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 900128FC0C for ; Sun, 24 Aug 2008 21:07:49 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OL7nT0067506 for ; Sun, 24 Aug 2008 21:07:49 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OL7mfQ067504 for perforce@freebsd.org; Sun, 24 Aug 2008 21:07:48 GMT (envelope-from marius@freebsd.org) Date: Sun, 24 Aug 2008 21:07:48 GMT Message-Id: <200808242107.m7OL7mfQ067504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 148286 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, 24 Aug 2008 21:07:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=148286 Change 148286 by marius@flak on 2008/08/24 21:07:02 IFC @148283 Affected files ... .. //depot/projects/usiii/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/usiii/arm/include/endian.h#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/usiii/conf/files#15 integrate .. //depot/projects/usiii/conf/files.i386#9 integrate .. //depot/projects/usiii/conf/files.sparc64#8 integrate .. //depot/projects/usiii/conf/options#14 integrate .. //depot/projects/usiii/dev/acpica/acpi.c#9 integrate .. //depot/projects/usiii/dev/agp/agp.c#2 integrate .. //depot/projects/usiii/dev/dc/if_dc.c#5 integrate .. //depot/projects/usiii/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/usiii/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/usiii/dev/drm/drm.h#2 integrate .. //depot/projects/usiii/dev/drm/drmP.h#3 integrate .. //depot/projects/usiii/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_auth.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_context.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_dma.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_fops.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_internal.h#1 branch .. //depot/projects/usiii/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_irq.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_lock.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_memory.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_pci.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/usiii/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/usiii/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_vm.c#2 integrate .. //depot/projects/usiii/dev/drm/i915_dma.c#3 integrate .. //depot/projects/usiii/dev/drm/i915_drm.h#2 integrate .. //depot/projects/usiii/dev/drm/i915_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/i915_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/i915_irq.c#2 integrate .. //depot/projects/usiii/dev/drm/i915_mem.c#2 integrate .. //depot/projects/usiii/dev/drm/i915_suspend.c#1 branch .. //depot/projects/usiii/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/usiii/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/usiii/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/usiii/dev/drm/mach64_state.c#2 integrate .. //depot/projects/usiii/dev/drm/mga_dma.c#2 integrate .. //depot/projects/usiii/dev/drm/mga_drm.h#2 integrate .. //depot/projects/usiii/dev/drm/mga_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/mga_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/mga_irq.c#2 integrate .. //depot/projects/usiii/dev/drm/mga_state.c#2 integrate .. //depot/projects/usiii/dev/drm/mga_warp.c#2 integrate .. //depot/projects/usiii/dev/drm/r128_cce.c#2 integrate .. //depot/projects/usiii/dev/drm/r128_drm.h#2 integrate .. //depot/projects/usiii/dev/drm/r128_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/r128_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/r128_irq.c#2 integrate .. //depot/projects/usiii/dev/drm/r128_state.c#2 integrate .. //depot/projects/usiii/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/usiii/dev/drm/r300_reg.h#2 integrate .. //depot/projects/usiii/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/usiii/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/usiii/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/usiii/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/usiii/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/usiii/dev/drm/radeon_state.c#2 integrate .. //depot/projects/usiii/dev/drm/savage_bci.c#2 integrate .. //depot/projects/usiii/dev/drm/savage_drm.h#2 integrate .. //depot/projects/usiii/dev/drm/savage_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/savage_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/savage_state.c#2 integrate .. //depot/projects/usiii/dev/drm/sis_drv.c#2 integrate .. //depot/projects/usiii/dev/drm/sis_drv.h#2 integrate .. //depot/projects/usiii/dev/drm/sis_mm.c#2 integrate .. //depot/projects/usiii/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/usiii/dev/ex/if_ex.c#3 integrate .. //depot/projects/usiii/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/usiii/dev/ex/if_exvar.h#3 integrate .. //depot/projects/usiii/dev/gem/if_gem.c#9 integrate .. //depot/projects/usiii/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/usiii/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/usiii/dev/mfi/mfi.c#6 integrate .. //depot/projects/usiii/dev/mii/mii.c#2 integrate .. //depot/projects/usiii/dev/mii/mlphy.c#2 integrate .. //depot/projects/usiii/dev/mii/tlphy.c#2 integrate .. //depot/projects/usiii/dev/pci/pci.c#7 integrate .. //depot/projects/usiii/dev/sis/if_sis.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/csa.c#2 integrate .. //depot/projects/usiii/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/usiii/dev/syscons/syscons.c#7 integrate .. //depot/projects/usiii/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/usiii/dev/usb/uvisor.c#2 integrate .. //depot/projects/usiii/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/usiii/i386/conf/NOTES#8 integrate .. //depot/projects/usiii/i386/cpufreq/est.c#8 integrate .. //depot/projects/usiii/i386/i386/local_apic.c#5 integrate .. //depot/projects/usiii/i386/isa/dpms.c#1 branch .. //depot/projects/usiii/isa/isa_common.c#2 integrate .. //depot/projects/usiii/isa/isavar.h#2 integrate .. //depot/projects/usiii/kern/kern_exec.c#9 integrate .. //depot/projects/usiii/kern/kern_intr.c#6 integrate .. //depot/projects/usiii/kern/tty.c#7 integrate .. //depot/projects/usiii/kern/tty_outq.c#2 integrate .. //depot/projects/usiii/kern/tty_pty.c#7 integrate .. //depot/projects/usiii/kern/vfs_cache.c#9 integrate .. //depot/projects/usiii/kern/vfs_mount.c#11 integrate .. //depot/projects/usiii/kern/vfs_subr.c#12 integrate .. //depot/projects/usiii/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/usiii/modules/Makefile#13 integrate .. //depot/projects/usiii/modules/dpms/Makefile#1 branch .. //depot/projects/usiii/modules/drm/i915/Makefile#2 integrate .. //depot/projects/usiii/net/if.c#9 integrate .. //depot/projects/usiii/net/if_spppsubr.c#3 integrate .. //depot/projects/usiii/netinet/sctp_output.c#8 integrate .. //depot/projects/usiii/netinet/tcp_lro.c#2 integrate .. //depot/projects/usiii/netinet/tcp_syncache.c#8 integrate .. //depot/projects/usiii/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/usiii/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/usiii/security/mac/mac_framework.c#2 integrate .. //depot/projects/usiii/security/mac/mac_framework.h#7 integrate .. //depot/projects/usiii/security/mac/mac_inet.c#5 integrate .. //depot/projects/usiii/security/mac/mac_internal.h#4 integrate .. //depot/projects/usiii/security/mac/mac_net.c#3 integrate .. //depot/projects/usiii/security/mac/mac_pipe.c#3 integrate .. //depot/projects/usiii/security/mac/mac_policy.h#7 integrate .. //depot/projects/usiii/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/usiii/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/usiii/security/mac/mac_process.c#4 integrate .. //depot/projects/usiii/security/mac/mac_socket.c#3 integrate .. //depot/projects/usiii/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/usiii/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/usiii/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/usiii/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/usiii/security/mac/mac_vfs.c#4 integrate .. //depot/projects/usiii/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/usiii/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/usiii/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/usiii/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/usiii/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/usiii/security/mac_none/mac_none.c#3 integrate .. //depot/projects/usiii/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/usiii/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/usiii/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/usiii/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/usiii/security/mac_test/mac_test.c#6 integrate .. //depot/projects/usiii/sparc64/central/central.c#2 integrate .. //depot/projects/usiii/sparc64/conf/GENERIC#12 integrate .. //depot/projects/usiii/sparc64/conf/NOTES#3 integrate .. //depot/projects/usiii/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/usiii/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/usiii/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/usiii/sparc64/pci/psycho.c#13 integrate .. //depot/projects/usiii/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/usiii/sparc64/sbus/sbus.c#6 integrate .. //depot/projects/usiii/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/usiii/sys/copyright.h#4 integrate .. //depot/projects/usiii/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/usiii/vm/uma_core.c#4 integrate Differences ... ==== //depot/projects/usiii/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/usiii/arm/include/endian.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $ */ #ifndef _ENDIAN_H_ @@ -94,7 +94,7 @@ : "+r" (v), "=r" (t1)); return (v); - } +} static __inline __uint16_t __bswap16_var(__uint16_t v) ==== //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 (text+ko) ==== @@ -382,6 +382,49 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN +#elif defined(__mips__) + +/* + * Define the appropriate "processor characteristics" + */ +#define _STACK_GROWS_DOWNWARD +#define _LONG_LONG_LTOH +#define _BIT_FIELDS_LTOH +#define _IEEE_754 +#define _CHAR_IS_SIGNED +#define _BOOL_ALIGNMENT 1 +#define _CHAR_ALIGNMENT 1 +#define _SHORT_ALIGNMENT 2 +#define _INT_ALIGNMENT 4 +#define _FLOAT_ALIGNMENT 4 +#define _FLOAT_COMPLEX_ALIGNMENT 4 +#define _LONG_ALIGNMENT 4 +#define _LONG_LONG_ALIGNMENT 4 +#define _DOUBLE_ALIGNMENT 4 +#define _DOUBLE_COMPLEX_ALIGNMENT 4 +#define _LONG_DOUBLE_ALIGNMENT 4 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4 +#define _POINTER_ALIGNMENT 4 +#define _MAX_ALIGNMENT 4 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT + +/* + * Define the appropriate "implementation choices". + */ +#define _ILP32 +#if !defined(_I32LPx) && defined(_KERNEL) +#define _I32LPx +#endif +#define _SUNOS_VTOC_16 +#define _DMA_USES_PHYSADDR +#define _FIRMWARE_NEEDS_FDISK +#define _PSM_MODULES +#define _RTC_CONFIG +#define _DONT_USE_1275_GENERIC_NAMES +#define _HAVE_CPUID_INSN + #elif defined(__powerpc__) /* ==== //depot/projects/usiii/conf/files#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1331 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -572,6 +572,7 @@ dev/drm/i915_drv.c optional i915drm dev/drm/i915_irq.c optional i915drm dev/drm/i915_mem.c optional i915drm +dev/drm/i915_suspend.c optional i915drm dev/drm/mach64_dma.c optional mach64drm dev/drm/mach64_drv.c optional mach64drm dev/drm/mach64_irq.c optional mach64drm ==== //depot/projects/usiii/conf/files.i386#9 (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.604 2008/08/17 23:44:09 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -329,6 +329,7 @@ #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen +i386/isa/dpms.c optional dpms i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa ==== //depot/projects/usiii/conf/files.sparc64#8 (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.sparc64,v 1.95 2008/04/26 11:01:37 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.96 2008/08/23 14:28:44 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -74,7 +74,7 @@ libkern/flsl.c standard sparc64/central/central.c optional central sparc64/ebus/ebus.c optional ebus -sparc64/fhc/clkbrd.c optional clkbrd fhc +sparc64/fhc/clkbrd.c optional fhc sparc64/fhc/fhc.c optional fhc sparc64/isa/isa.c optional isa sparc64/isa/isa_dma.c optional isa ==== //depot/projects/usiii/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.636 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/sys/conf/options,v 1.637 2008/08/23 15:26:36 rwatson Exp $ # # On the handling of kernel options # @@ -114,7 +114,6 @@ KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV MAC -MAC_ALWAYS_LABEL_MBUF opt_mac.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_IFOFF opt_dontuse.h ==== //depot/projects/usiii/dev/acpica/acpi.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.251 2008/08/22 02:14:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.252 2008/08/23 16:38:20 imp Exp $"); #include "opt_acpi.h" #include @@ -665,7 +665,9 @@ * device has an _SxD method for the next sleep state, use that power * state instead. */ - device_get_children(dev, &devlist, &numdevs); + error = device_get_children(dev, &devlist, &numdevs); + if (error) + return (error); for (i = 0; i < numdevs; i++) { /* If the device is not attached, we've powered it down elsewhere. */ child = devlist[i]; @@ -692,7 +694,7 @@ acpi_resume(device_t dev) { ACPI_HANDLE handle; - int i, numdevs; + int i, numdevs, error; device_t child, *devlist; GIANT_REQUIRED; @@ -701,7 +703,9 @@ * Put all devices in D0 before resuming them. Call _S0D on each one * since some systems expect this. */ - device_get_children(dev, &devlist, &numdevs); + error = device_get_children(dev, &devlist, &numdevs); + if (error) + return (error); for (i = 0; i < numdevs; i++) { child = devlist[i]; handle = acpi_get_handle(child); @@ -801,7 +805,8 @@ int i, numdevs; DEVICE_IDENTIFY(driver, dev); - device_get_children(dev, &devlist, &numdevs); + if (device_get_children(dev, &devlist, &numdevs)) + return; for (i = 0; i < numdevs; i++) { child = devlist[i]; if (device_get_state(child) == DS_NOTPRESENT) { ==== //depot/projects/usiii/dev/agp/agp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.58 2007/11/12 21:51:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.59 2008/08/23 15:57:43 imp Exp $"); #include "opt_bus.h" @@ -118,7 +118,8 @@ bus = devclass_get_device(pci, busnum); if (!bus) continue; - device_get_children(bus, &kids, &numkids); + if (device_get_children(bus, &kids, &numkids) != 0) + continue; for (i = 0; i < numkids; i++) { dev = kids[i]; if (pci_get_class(dev) == PCIC_DISPLAY ==== //depot/projects/usiii/dev/dc/if_dc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.195 2008/06/08 02:52:26 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.196 2008/08/23 20:57:48 marius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -3138,7 +3138,7 @@ bus_dma_segment_t segs[DC_MAXFRAGS]; struct dc_desc *f; struct mbuf *m; - int chainlen, cur, error, first, frag, i, idx, nseg; + int cur, defragged, error, first, frag, i, idx, nseg; /* * If there's no way we can send any packets, return now. @@ -3146,22 +3146,30 @@ if (DC_TX_LIST_CNT - sc->dc_cdata.dc_tx_cnt <= DC_TX_LIST_RSVD) return (ENOBUFS); - /* - * Count the number of frags in this chain to see if - * we need to m_defrag. Since the descriptor list is shared - * by all packets, we'll m_defrag long chains so that they - * do not use up the entire list, even if they would fit. - */ - chainlen = 0; - for (m = *m_head; m != NULL; m = m->m_next) - chainlen++; - m = NULL; - if ((sc->dc_flags & DC_TX_COALESCE && ((*m_head)->m_next != NULL || - sc->dc_flags & DC_TX_ALIGN)) || (chainlen > DC_TX_LIST_CNT / 4) || - (DC_TX_LIST_CNT - (chainlen + sc->dc_cdata.dc_tx_cnt) <= - DC_TX_LIST_RSVD)) { + defragged = 0; + if (sc->dc_flags & DC_TX_COALESCE && + ((*m_head)->m_next != NULL || sc->dc_flags & DC_TX_ALIGN)) { m = m_defrag(*m_head, M_DONTWAIT); + defragged = 1; + } else { + /* + * Count the number of frags in this chain to see if we + * need to m_collapse. Since the descriptor list is shared + * by all packets, we'll m_collapse long chains so that they + * do not use up the entire list, even if they would fit. + */ + i = 0; + for (m = *m_head; m != NULL; m = m->m_next) + i++; + if (i > DC_TX_LIST_CNT / 4 || + DC_TX_LIST_CNT - i + sc->dc_cdata.dc_tx_cnt <= + DC_TX_LIST_RSVD) { + m = m_collapse(*m_head, M_DONTWAIT, DC_MAXFRAGS); + defragged = 1; + } + } + if (defragged != 0) { if (m == NULL) { m_freem(*m_head); *m_head = NULL; @@ -3169,15 +3177,16 @@ } *m_head = m; } + idx = sc->dc_cdata.dc_tx_prod; error = bus_dmamap_load_mbuf_sg(sc->dc_mtag, sc->dc_cdata.dc_tx_map[idx], *m_head, segs, &nseg, 0); if (error == EFBIG) { - m = m_defrag(*m_head, M_DONTWAIT); - if (m == NULL) { + if (defragged != 0 || (m = m_collapse(*m_head, M_DONTWAIT, + DC_MAXFRAGS)) == NULL) { m_freem(*m_head); *m_head = NULL; - return (ENOBUFS); + return (defragged != 0 ? error : ENOBUFS); } *m_head = m; error = bus_dmamap_load_mbuf_sg(sc->dc_mtag, ==== //depot/projects/usiii/dev/drm/ati_pcigart.c#2 (text+ko) ==== @@ -1,6 +1,3 @@ -/* ati_pcigart.h -- ATI PCI GART support -*- linux-c -*- - * Created: Wed Dec 13 21:52:19 2000 by gareth@valinux.com - */ /*- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. @@ -30,74 +27,135 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/ati_pcigart.c,v 1.3 2005/11/28 23:13:52 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/ati_pcigart.c,v 1.4 2008/08/23 20:59:12 rnoland Exp $"); + +/** @file ati_pcigart.c + * Implementation of ATI's PCIGART, which provides an aperture in card virtual + * address space with addresses remapped to system memory. + */ #include "dev/drm/drmP.h" #define ATI_PCIGART_PAGE_SIZE 4096 /* PCI GART page size */ -#define ATI_MAX_PCIGART_PAGES 8192 /* 32 MB aperture, 4K pages */ -#define ATI_PCIGART_TABLE_SIZE 32768 +#define ATI_PCIGART_PAGE_MASK (~(ATI_PCIGART_PAGE_SIZE-1)) + +#define ATI_PCIE_WRITE 0x4 +#define ATI_PCIE_READ 0x8 + +static int drm_ati_alloc_pcigart_table(struct drm_device *dev, + struct drm_ati_pcigart_info *gart_info) +{ + dev->sg->dmah = drm_pci_alloc(dev, gart_info->table_size, + PAGE_SIZE, + gart_info->table_mask); + if (dev->sg->dmah == NULL) + return ENOMEM; + + return 0; +} + +static void drm_ati_free_pcigart_table(struct drm_device *dev, + struct drm_ati_pcigart_info *gart_info) +{ + drm_pci_free(dev, dev->sg->dmah); + dev->sg->dmah = NULL; +} + +int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info) +{ + /* we need to support large memory configurations */ + if (dev->sg == NULL) { + DRM_ERROR("no scatter/gather memory!\n"); + return 0; + } + + if (gart_info->bus_addr) { + if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) { + gart_info->bus_addr = 0; + if (dev->sg->dmah) + drm_ati_free_pcigart_table(dev, gart_info); + } + } + + return 1; +} -int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info) +int drm_ati_pcigart_init(struct drm_device *dev, + struct drm_ati_pcigart_info *gart_info) { + + void *address = NULL; unsigned long pages; - u32 *pci_gart = NULL, page_base; - int i, j; + u32 *pci_gart, page_base; + dma_addr_t bus_address = 0; + int i, j, ret = 0; + int max_pages; + dma_addr_t entry_addr; + /* we need to support large memory configurations */ if (dev->sg == NULL) { - DRM_ERROR( "no scatter/gather memory!\n" ); - return 0; + DRM_ERROR("no scatter/gather memory!\n"); + goto done; } if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) { - /* GART table in system memory */ - dev->sg->dmah = drm_pci_alloc(dev, ATI_PCIGART_TABLE_SIZE, 0, - 0xfffffffful); - if (dev->sg->dmah == NULL) { - DRM_ERROR("cannot allocate PCI GART table!\n"); - return 0; + DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n"); + + ret = drm_ati_alloc_pcigart_table(dev, gart_info); + if (ret) { + DRM_ERROR("cannot allocate PCI GART page!\n"); + goto done; } - - gart_info->addr = (void *)dev->sg->dmah->vaddr; - gart_info->bus_addr = dev->sg->dmah->busaddr; - pci_gart = (u32 *)dev->sg->dmah->vaddr; + + address = (void *)dev->sg->dmah->vaddr; + bus_address = dev->sg->dmah->busaddr; } else { - /* GART table in framebuffer memory */ - pci_gart = gart_info->addr; + address = gart_info->addr; + bus_address = gart_info->bus_addr; + DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n", + (unsigned int)bus_address, (unsigned long)address); } - - pages = DRM_MIN(dev->sg->pages, ATI_MAX_PCIGART_PAGES); + + pci_gart = (u32 *) address; + + max_pages = (gart_info->table_size / sizeof(u32)); + pages = (dev->sg->pages <= max_pages) + ? dev->sg->pages : max_pages; - bzero(pci_gart, ATI_PCIGART_TABLE_SIZE); + memset(pci_gart, 0, max_pages * sizeof(u32)); KASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE, ("page size too small")); - for ( i = 0 ; i < pages ; i++ ) { - page_base = (u32) dev->sg->busaddr[i]; - + for (i = 0; i < pages; i++) { + entry_addr = dev->sg->busaddr[i]; for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { - if (gart_info->is_pcie) - *pci_gart = (cpu_to_le32(page_base) >> 8) | 0xc; - else - *pci_gart = cpu_to_le32(page_base); + page_base = (u32) entry_addr & ATI_PCIGART_PAGE_MASK; + switch(gart_info->gart_reg_if) { + case DRM_ATI_GART_IGP: + page_base |= (upper_32_bits(entry_addr) & 0xff) << 4; + page_base |= 0xc; + break; + case DRM_ATI_GART_PCIE: + page_base >>= 8; + page_base |= (upper_32_bits(entry_addr) & 0xff) << 24; + page_base |= ATI_PCIE_READ | ATI_PCIE_WRITE; + break; + default: + case DRM_ATI_GART_PCI: + break; + } + *pci_gart = cpu_to_le32(page_base); pci_gart++; - page_base += ATI_PCIGART_PAGE_SIZE; + entry_addr += ATI_PCIGART_PAGE_SIZE; } } DRM_MEMORYBARRIER(); - return 1; -} + ret = 1; -int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info) -{ - if (dev->sg == NULL) { - DRM_ERROR( "no scatter/gather memory!\n" ); - return 0; - } - - drm_pci_free(dev, dev->sg->dmah); - - return 1; + done: + gart_info->addr = address; + gart_info->bus_addr = bus_address; + return ret; } ==== //depot/projects/usiii/dev/drm/drm-subprocess.pl#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/dev/drm/drm-subprocess.pl,v 1.1 2005/11/28 23:13:52 anholt Exp $ +# $FreeBSD: src/sys/dev/drm/drm-subprocess.pl,v 1.2 2008/08/23 20:59:12 rnoland Exp $ # # Props to Daniel Stone for starting this script for me. I hate perl. @@ -23,7 +23,7 @@ print $lastline; } } elsif ($foundopening && !$foundclosing && /\*\//) { - # print the $FreeBSD: src/sys/dev/drm/drm-subprocess.pl,v 1.1 2005/11/28 23:13:52 anholt Exp $ bits after the end of the license block + # print the $FreeBSD: src/sys/dev/drm/drm-subprocess.pl,v 1.2 2008/08/23 20:59:12 rnoland Exp $ bits after the end of the license block $foundclosing = 1; print; print "\n"; @@ -37,6 +37,7 @@ s/#include "(.*)_drm.h/#include "dev\/drm\/\1_drm.h/; s/#include "mga_ucode.h/#include "dev\/drm\/mga_ucode.h/; s/#include "r300_reg.h/#include "dev\/drm\/r300_reg.h/; + s/#include "radeon_microcode.h/#include "dev\/drm\/radeon_microcode.h/; s/#include "sis_ds.h/#include "dev\/drm\/sis_ds.h/; s/#include "drm/#include "dev\/drm\/drm/; print; @@ -47,4 +48,4 @@ # if we never found the copyright header, then we're still a line behind. if (!$foundopening) { print $lastline; -}+} ==== //depot/projects/usiii/dev/drm/drm.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm.h,v 1.12 2006/05/17 06:36:28 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm.h,v 1.13 2008/08/23 20:59:12 rnoland Exp $"); /** * \mainpage @@ -64,6 +64,9 @@ #ifndef __user #define __user #endif +#ifndef __iomem +#define __iomem +#endif #ifdef __GNUC__ # define DEPRECATED __attribute__ ((deprecated)) @@ -72,9 +75,6 @@ #endif #if defined(__linux__) -#if defined(__KERNEL__) -#include -#endif #include /* For _IO* macros */ #define DRM_IOCTL_NR(n) _IOC_NR(n) #define DRM_IOC_VOID _IOC_NONE @@ -83,14 +83,7 @@ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(IN_MODULE) -/* Prevent name collision when including sys/ioccom.h */ -#undef ioctl -#include -#define ioctl(a,b,c) xf86ioctl(a,b,c) -#else #include -#endif /* __FreeBSD__ && xf86ioctl */ #define DRM_IOCTL_NR(n) ((n) & 0xff) #define DRM_IOC_VOID IOC_VOID #define DRM_IOC_READ IOC_OUT @@ -99,24 +92,6 @@ #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) #endif -#define XFREE86_VERSION(major,minor,patch,snap) \ - ((major << 16) | (minor << 8) | patch) - -#ifndef CONFIG_XFREE86_VERSION -#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0) -#endif - -#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) -#define DRM_PROC_DEVICES "/proc/devices" -#define DRM_PROC_MISC "/proc/misc" -#define DRM_PROC_DRM "/proc/drm" -#define DRM_DEV_DRM "/dev/drm" -#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -#define DRM_DEV_UID 0 -#define DRM_DEV_GID 0 -#endif - -#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0) #ifdef __OpenBSD__ #define DRM_MAJOR 81 #endif @@ -124,7 +99,7 @@ #define DRM_MAJOR 226 #endif #define DRM_MAX_MINOR 15 -#endif + #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ @@ -139,6 +114,7 @@ #if defined(__linux__) typedef unsigned int drm_handle_t; #else +#include typedef unsigned long drm_handle_t; /**< To mapped regions */ #endif typedef unsigned int drm_context_t; /**< GLXContext handle */ @@ -154,23 +130,23 @@ * \note KW: Actually it's illegal to change either for * backwards-compatibility reasons. */ -typedef struct drm_clip_rect { +struct drm_clip_rect { unsigned short x1; unsigned short y1; unsigned short x2; unsigned short y2; -} drm_clip_rect_t; +}; /** * Texture region, */ -typedef struct drm_tex_region { +struct drm_tex_region { unsigned char next; unsigned char prev; unsigned char in_use; unsigned char padding; unsigned int age; -} drm_tex_region_t; +}; /** * Hardware lock. @@ -179,10 +155,10 @@ * processor bus contention on a multiprocessor system, there should not be any * other data stored in the same cache line. */ -typedef struct drm_hw_lock { +struct drm_hw_lock { __volatile__ unsigned int lock; /**< lock variable */ char padding[60]; /**< Pad to cache line */ -} drm_hw_lock_t; +}; /* This is beyond ugly, and only works on GCC. However, it allows me to use * drm.h in places (i.e., in the X-server) where I can't use size_t. The real @@ -205,7 +181,7 @@ * * \sa drmGetVersion(). */ -typedef struct drm_version { +struct drm_version { int version_major; /**< Major version */ int version_minor; /**< Minor version */ int version_patchlevel; /**< Patch level */ @@ -215,35 +191,35 @@ char __user *date; /**< User-space buffer to hold date */ DRM_SIZE_T desc_len; /**< Length of desc buffer */ char __user *desc; /**< User-space buffer to hold desc */ -} drm_version_t; +}; /** * DRM_IOCTL_GET_UNIQUE ioctl argument type. * * \sa drmGetBusid() and drmSetBusId(). */ -typedef struct drm_unique { +struct drm_unique { DRM_SIZE_T unique_len; /**< Length of unique */ char __user *unique; /**< Unique name for driver instantiation */ -} drm_unique_t; +}; #undef DRM_SIZE_T -typedef struct drm_list { +struct drm_list { int count; /**< Length of user-space structures */ - drm_version_t __user *version; -} drm_list_t; + struct drm_version __user *version; +}; -typedef struct drm_block { +struct drm_block { int unused; -} drm_block_t; +}; /** * DRM_IOCTL_CONTROL ioctl argument type. * * \sa drmCtlInstHandler() and drmCtlUninstHandler(). */ -typedef struct drm_control { +struct drm_control { enum { DRM_ADD_COMMAND, DRM_RM_COMMAND, @@ -251,37 +227,39 @@ DRM_UNINST_HANDLER } func; int irq; -} drm_control_t; +}; /** * Type of memory to map. */ -typedef enum drm_map_type { +enum drm_map_type { _DRM_FRAME_BUFFER = 0, /**< WC (no caching), no core dump */ _DRM_REGISTERS = 1, /**< no caching, no core dump */ _DRM_SHM = 2, /**< shared, cached */ _DRM_AGP = 3, /**< AGP/GART */ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ - _DRM_CONSISTENT = 5 /**< Consistent memory for PCI DMA */ -} drm_map_type_t; + _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ + _DRM_TTM = 6 +}; /** * Memory mapping flags. */ -typedef enum drm_map_flags { +enum drm_map_flags { _DRM_RESTRICTED = 0x01, /**< Cannot be mapped to user-virtual */ _DRM_READ_ONLY = 0x02, _DRM_LOCKED = 0x04, /**< shared, cached, locked */ _DRM_KERNEL = 0x08, /**< kernel requires access */ _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */ _DRM_CONTAINS_LOCK = 0x20, /**< SHM page that contains lock */ - _DRM_REMOVABLE = 0x40 /**< Removable mapping */ -} drm_map_flags_t; + _DRM_REMOVABLE = 0x40, /**< Removable mapping */ + _DRM_DRIVER = 0x80 /**< Managed by driver */ +}; -typedef struct drm_ctx_priv_map { +struct drm_ctx_priv_map { unsigned int ctx_id; /**< Context requesting private mapping */ void *handle; /**< Handle of map */ -} drm_ctx_priv_map_t; +}; /** * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls @@ -289,30 +267,30 @@ * * \sa drmAddMap(). */ -typedef struct drm_map { +struct drm_map { unsigned long offset; /**< Requested physical address (0 for SAREA)*/ unsigned long size; /**< Requested physical size (bytes) */ - drm_map_type_t type; /**< Type of memory to map */ - drm_map_flags_t flags; /**< Flags */ + enum drm_map_type type; /**< Type of memory to map */ + enum drm_map_flags flags; /**< Flags */ void *handle; /**< User-space: "Handle" to pass to mmap() */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:25:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACCAC1065670; Sun, 24 Aug 2008 21:25:07 +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 325321065678 for ; Sun, 24 Aug 2008 21:25:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2BCD68FC18 for ; Sun, 24 Aug 2008 21:25:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OLP6BZ069254 for ; Sun, 24 Aug 2008 21:25:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OLP6eu069252 for perforce@freebsd.org; Sun, 24 Aug 2008 21:25:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 21:25:06 GMT Message-Id: <200808242125.m7OLP6eu069252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148287 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, 24 Aug 2008 21:25:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=148287 Change 148287 by rwatson@rwatson_cinnamon on 2008/08/24 21:24:09 Update audit_event for AUE_POSIX_OPENPT; apparently missed in a previous submit. Add four new TrustedBSD Capabilities-related system calls to the event list. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#30 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#30 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#29 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#30 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -530,6 +530,10 @@ 43183:AUE_UMASK_EXTENDED:umask_extended(2):pc 43184:AUE_OPENAT:openat(2) - attr only:fa 43185:AUE_POSIX_OPENPT:posix_openpt(2):ip +43186:AUE_CAP_NEW:cap_new(2):fm +43187:AUE_CAP_GETRIGHTS:cap_getrights(2):fm +43188:AUE_CAP_ENTER:cap_enter(2):pc +43189:AUE_CAP_GETMODE:cap_getmode(2):pc # # User space system events. # ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#3 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#3 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -581,6 +581,10 @@ #define AUE_UMASK_EXTENDED 43183 /* Darwin. */ #define AUE_OPENAT 43184 /* FreeBSD. */ #define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ +#define AUE_CAP_NEW 43186 /* TrustedBSD. */ +#define AUE_CAP_GETRIGHTS 43187 /* TrustedBSD. */ +#define AUE_CAP_ENTER 43188 /* TrustedBSD. */ +#define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:26:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E69341065671; Sun, 24 Aug 2008 21:26:08 +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 8F8A81065678 for ; Sun, 24 Aug 2008 21:26:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 937DD8FC13 for ; Sun, 24 Aug 2008 21:26:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OLQ8oo069363 for ; Sun, 24 Aug 2008 21:26:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OLQ8Yq069361 for perforce@freebsd.org; Sun, 24 Aug 2008 21:26:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 21:26:08 GMT Message-Id: <200808242126.m7OLQ8Yq069361@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148289 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, 24 Aug 2008 21:26:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=148289 Change 148289 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 21:26:06 Merge capability-related system call audit event identifiers from OpenBSM. They will eventually loop back via subversion/the FreeBSD vendor branch, but not for a bit, so do it by hand for now. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_event#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_event#2 (text) ==== @@ -497,6 +497,10 @@ 43150:AUE_MKNODAT:mknodat(2):fc 43151:AUE_READLINKAT:readlinkat(2):fr 43152:AUE_SYMLINKAT:symlinkat(2):fc +43186:AUE_CAP_NEW:cap_new(2):fm +43187:AUE_CAP_GETRIGHTS:cap_getrights(2):fm +43188:AUE_CAP_ENTER:cap_enter(2):pc +43189:AUE_CAP_GETMODE:cap_getmode(2):pc # # User space system events. # ==== //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#3 (text) ==== @@ -549,6 +549,10 @@ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ #define AUE_POSIXOPENPT 43153 /* FreeBSD. */ +#define AUE_CAP_NEW 43186 /* TrustedBSD. */ +#define AUE_CAP_GETRIGHTS 43187 /* TrustedBSD. */ +#define AUE_CAP_ENTER 43188 /* TrustedBSD. */ +#define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:30:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E0A1106567D; Sun, 24 Aug 2008 21:30:13 +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 01BB01065675 for ; Sun, 24 Aug 2008 21:30:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0446C8FC15 for ; Sun, 24 Aug 2008 21:30:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OLUCTr069840 for ; Sun, 24 Aug 2008 21:30:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OLUCni069838 for perforce@freebsd.org; Sun, 24 Aug 2008 21:30:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Aug 2008 21:30:12 GMT Message-Id: <200808242130.m7OLUCni069838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148291 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, 24 Aug 2008 21:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=148291 Change 148291 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 21:30:10 Add 32-bit compat versions of capability system calls. Hook up audit event assignments to system call definitions. Regenerate. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#18 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.102 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -373,6 +373,20 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char times_l_[PADL_(struct timeval *)]; struct timeval * times; char times_r_[PADR_(struct timeval *)]; }; +struct cap_new_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rights_l_[PADL_(u_int64_t)]; u_int64_t rights; char rights_r_[PADR_(u_int64_t)]; +}; +struct cap_getrights_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rightsp_l_[PADL_(u_int64_t *)]; u_int64_t * rightsp; char rightsp_r_[PADR_(u_int64_t *)]; +}; +struct cap_enter_args { + register_t dummy; +}; +struct cap_getmode_args { + char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -437,6 +451,10 @@ int freebsd32_fexecve(struct thread *, struct freebsd32_fexecve_args *); int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *); int freebsd32_futimesat(struct thread *, struct freebsd32_futimesat_args *); +int cap_new(struct thread *, struct cap_new_args *); +int cap_getrights(struct thread *, struct cap_getrights_args *); +int cap_enter(struct thread *, struct cap_enter_args *); +int cap_getmode(struct thread *, struct cap_getmode_args *); #ifdef COMPAT_43 @@ -647,6 +665,10 @@ #define FREEBSD32_SYS_AUE_freebsd32_fexecve AUE_FEXECVE #define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT #define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT +#define FREEBSD32_SYS_AUE_cap_new AUE_CAP_NEW +#define FREEBSD32_SYS_AUE_cap_getrights AUE_CAP_GETRIGHTS +#define FREEBSD32_SYS_AUE_cap_enter AUE_CAP_ENTER +#define FREEBSD32_SYS_AUE_cap_getmode AUE_CAP_GETMODE #undef PAD_ #undef PADL_ ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.102 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp */ #define FREEBSD32_SYS_syscall 0 @@ -356,4 +356,8 @@ #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 #define FREEBSD32_SYS_posix_openpt 504 -#define FREEBSD32_SYS_MAXSYSCALL 505 +#define FREEBSD32_SYS_cap_new 505 +#define FREEBSD32_SYS_cap_getrights 506 +#define FREEBSD32_SYS_cap_enter 507 +#define FREEBSD32_SYS_cap_getmode 508 +#define FREEBSD32_SYS_MAXSYSCALL 509 ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.102 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp */ const char *freebsd32_syscallnames[] = { @@ -512,4 +512,8 @@ "symlinkat", /* 502 = symlinkat */ "unlinkat", /* 503 = unlinkat */ "posix_openpt", /* 504 = posix_openpt */ + "cap_new", /* 505 = cap_new */ + "cap_getrights", /* 506 = cap_getrights */ + "cap_enter", /* 507 = cap_enter */ + "cap_getmode", /* 508 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.102 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp */ #include "opt_compat.h" @@ -543,4 +543,8 @@ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0, 0 }, /* 503 = unlinkat */ { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0, 0 }, /* 504 = posix_openpt */ + { AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, 0 }, /* 505 = cap_new */ + { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, 0 }, /* 506 = cap_getrights */ + { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, 0 }, /* 507 = cap_enter */ + { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, 0 }, /* 508 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#7 (text+ko) ==== @@ -854,3 +854,8 @@ 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } 504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); } +505 AUE_CAP_NEW STD { int cap_new(int fd, u_int64_t rights); } +506 AUE_CAP_GETRIGHTS STD { int cap_getrights(int fd, \ + u_int64_t *rightsp); } +507 AUE_CAP_ENTER STD { int cap_enter(void); } +508 AUE_CAP_GETMODE STD { int cap_getmode(u_int *modep); } ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#18 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.244 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.245 2008/08/21 22:57:31 obrien Exp */ #include "opt_compat.h" @@ -510,7 +510,7 @@ { AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 479 = truncate */ { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 480 = ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0, 0 }, /* 481 = thr_kill2 */ - { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, 0 }, /* 482 = shm_open */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, SYF_CAPENABLED }, /* 482 = shm_open */ { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0, 0 }, /* 483 = shm_unlink */ { AS(cpuset_args), (sy_call_t *)cpuset, AUE_NULL, NULL, 0, 0, 0 }, /* 484 = cpuset */ { AS(cpuset_setid_args), (sy_call_t *)cpuset_setid, AUE_NULL, NULL, 0, 0, 0 }, /* 485 = cpuset_setid */ @@ -533,8 +533,8 @@ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0, 0 }, /* 503 = unlinkat */ { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0, 0 }, /* 504 = posix_openpt */ - { AS(cap_new_args), (sy_call_t *)cap_new, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 505 = cap_new */ - { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 506 = cap_getrights */ - { 0, (sy_call_t *)cap_enter, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 507 = cap_enter */ - { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 508 = cap_getmode */ + { AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, SYF_CAPENABLED }, /* 505 = cap_new */ + { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, SYF_CAPENABLED }, /* 506 = cap_getrights */ + { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED }, /* 507 = cap_enter */ + { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED }, /* 508 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#18 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.244 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.245 2008/08/21 22:57:31 obrien Exp */ const char *syscallnames[] = { ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#11 (text+ko) ==== @@ -895,10 +895,10 @@ char *path2); } 503 AUE_UNLINKAT STD { int unlinkat(int fd, char *path, int flag); } 504 AUE_POSIXOPENPT STD { int posix_openpt(int flags); } -505 AUE_NULL STD { int cap_new(int fd, u_int64_t rights); } -506 AUE_NULL STD { int cap_getrights(int fd, \ +505 AUE_CAP_NEW STD { int cap_new(int fd, u_int64_t rights); } +506 AUE_CAP_GETRIGHTS STD { int cap_getrights(int fd, \ u_int64_t *rightsp); } -507 AUE_NULL STD { int cap_enter(void); } -508 AUE_NULL STD { int cap_getmode(u_int *modep); } +507 AUE_CAP_ENTER STD { int cap_enter(void); } +508 AUE_CAP_GETMODE STD { int cap_getmode(u_int *modep); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#18 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#18 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.244 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.245 2008/08/21 22:57:31 obrien Exp */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#18 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.244 2008/08/20 08:31:58 ed Exp +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.245 2008/08/21 22:57:31 obrien Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#18 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.244 2008/08/20 08:31:58 ed Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.245 2008/08/21 22:57:31 obrien Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -2592,10 +2592,10 @@ #define SYS_AUE_symlinkat AUE_SYMLINKAT #define SYS_AUE_unlinkat AUE_UNLINKAT #define SYS_AUE_posix_openpt AUE_POSIXOPENPT -#define SYS_AUE_cap_new AUE_NULL -#define SYS_AUE_cap_getrights AUE_NULL -#define SYS_AUE_cap_enter AUE_NULL -#define SYS_AUE_cap_getmode AUE_NULL +#define SYS_AUE_cap_new AUE_CAP_NEW +#define SYS_AUE_cap_getrights AUE_CAP_GETRIGHTS +#define SYS_AUE_cap_enter AUE_CAP_ENTER +#define SYS_AUE_cap_getmode AUE_CAP_GETMODE #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:31:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B569C106568B; Sun, 24 Aug 2008 21:31: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 4A28E106567D for ; Sun, 24 Aug 2008 21:31:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4FD6E8FC1D for ; Sun, 24 Aug 2008 21:31:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OLVEgx069976 for ; Sun, 24 Aug 2008 21:31:14 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OLVEIN069974 for perforce@freebsd.org; Sun, 24 Aug 2008 21:31:14 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 21:31:14 GMT Message-Id: <200808242131.m7OLVEIN069974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148293 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, 24 Aug 2008 21:31:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148293 Change 148293 by julian@julian_trafmon1 on 2008/08/24 21:31:11 VIMAGE kernel now compiles Affected files ... .. //depot/projects/vimage/src/sys/conf/options#30 edit .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#5 edit .. //depot/projects/vimage/src/sys/net/if.c#35 edit .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#18 edit Differences ... ==== //depot/projects/vimage/src/sys/conf/options#30 (text+ko) ==== @@ -770,4 +770,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE +VIMAGE opt_global.h ==== //depot/projects/vimage/src/sys/ddb/db_textdump.c#5 (text+ko) ==== @@ -184,7 +184,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/net/if.c#35 (text+ko) ==== @@ -198,7 +198,7 @@ return (ifp); } -static void +void ifnet_setbyindex(u_short idx, struct ifnet *ifp) { @@ -374,6 +374,7 @@ static void if_init(void *dummy __unused) { + INIT_VNET_NET(curvnet); #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); ==== //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#18 (text+ko) ==== @@ -248,6 +248,7 @@ static void in6_clsroute(struct radix_node *rn, struct radix_node_head *head) { + INIT_VNET_INET6(curvnet); struct rtentry *rt = (struct rtentry *)rn; RT_LOCK_ASSERT(rt); @@ -292,6 +293,7 @@ static int in6_rtqkill(struct radix_node *rn, void *rock) { + INIT_VNET_INET6(curvnet); struct rtqk_arg *ap = rock; struct rtentry *rt = (struct rtentry *)rn; int err; From owner-p4-projects@FreeBSD.ORG Sun Aug 24 21:38:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A198106566B; Sun, 24 Aug 2008 21:38: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 0DEBB1065675 for ; Sun, 24 Aug 2008 21:38:27 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 140DE8FC08 for ; Sun, 24 Aug 2008 21:38:27 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OLcQkE070634 for ; Sun, 24 Aug 2008 21:38:26 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OLcQT9070632 for perforce@freebsd.org; Sun, 24 Aug 2008 21:38:26 GMT (envelope-from diego@FreeBSD.org) Date: Sun, 24 Aug 2008 21:38:26 GMT Message-Id: <200808242138.m7OLcQT9070632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148297 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, 24 Aug 2008 21:38:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=148297 Change 148297 by diego@diego_black on 2008/08/24 21:38:14 Add firewall events to audit_events Affected files ... .. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_event#2 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/contrib/openbsm/etc/audit_event#2 (text) ==== @@ -499,6 +499,15 @@ 43152:AUE_SYMLINKAT:symlinkat(2):fc 43153:AUE_PFIL_ENABLE:enable packet filter:fl 43154:AUE_PFIL_DISABLE:disable packet filter:fl +43155:AUE_PFIL_POLICY_ADDRULE:Add packet filter rule:fl +43156:AUE_PFIL_POLICY_DELRULE:Delete packet filter rule:fl +43157:AUE_PFIL_POLICY_FLUSH:Flush packet filter rules:fl +43158:AUE_PFIL_POLICY_ADDTABLE:Add packet filter table:fl +43159:AUE_PFIL_POLICY_DELTABLE:Delete packet filter table:fl +43160:AUE_PFIL_POLICY_FLUSHTABLE:Flush packet filter table:fl +43161:AUE_PFIL_FLOW_BEGIN:Connection flow begin:fl +43162:AUE_PFIL_FLOW_END:Connection flow end:fl + # # # User space system events. From owner-p4-projects@FreeBSD.ORG Sun Aug 24 22:00:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 059BD1065677; Sun, 24 Aug 2008 22:00: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 BD9E81065673 for ; Sun, 24 Aug 2008 22:00:49 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4F298FC0C for ; Sun, 24 Aug 2008 22:00:49 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OM0nQ4072326 for ; Sun, 24 Aug 2008 22:00:49 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OM0nei072324 for perforce@freebsd.org; Sun, 24 Aug 2008 22:00:49 GMT (envelope-from diego@FreeBSD.org) Date: Sun, 24 Aug 2008 22:00:49 GMT Message-Id: <200808242200.m7OM0nei072324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148298 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, 24 Aug 2008 22:00:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=148298 Change 148298 by diego@diego_black on 2008/08/24 22:00:17 Update project's README with links to wiki for more information on how to checkout and test the work. Affected files ... .. //depot/projects/soc2008/diego-audit/README#2 edit Differences ... ==== //depot/projects/soc2008/diego-audit/README#2 (text+ko) ==== @@ -1,2 +1,8 @@ -This project aims to provide auditing to events generated by different firewall -implementations on FreeBSD. +This project is part of TrustedBSD project and aims to provide auditing support +to security-related events generated by various firewall implementations on +FreeBSD such as IPFW, PF and IPFILTER. + +Make sure to check project's wiki page[1] for more information. + +[1] http://wiki.FreeBSD.org/DiegoGiagio/Audit_Firewall_Events_from_Kernel + From owner-p4-projects@FreeBSD.ORG Sun Aug 24 22:29:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F2DB1065671; Sun, 24 Aug 2008 22:29: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 94E631065673 for ; Sun, 24 Aug 2008 22:29:18 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9BCA68FC16 for ; Sun, 24 Aug 2008 22:29:18 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OMTIko075569 for ; Sun, 24 Aug 2008 22:29:18 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OMTI5L075567 for perforce@freebsd.org; Sun, 24 Aug 2008 22:29:18 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 22:29:18 GMT Message-Id: <200808242229.m7OMTI5L075567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148299 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, 24 Aug 2008 22:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=148299 Change 148299 by julian@julian_trafmon1 on 2008/08/24 22:29:12 IFC@148296 Affected files ... .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/vimage/src/sys/conf/options#31 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/vimage/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#27 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#14 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/vimage/src/sys/sys/syscall.h#7 integrate .. //depot/projects/vimage/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/vimage/src/sys/sys/sysproto.h#7 integrate Differences ... ==== //depot/projects/vimage/src/sys/bsm/audit_kevents.h#7 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.14 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -548,7 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ -#define AUE_POSIXOPENPT 43153 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.88 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.87 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.78 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.88 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -542,5 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ - { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#11 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -853,4 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } -504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/vimage/src/sys/conf/options#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.637 2008/08/23 15:26:36 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.638 2008/08/24 21:33:10 julian Exp $ # # On the handling of kernel options # ==== //depot/projects/vimage/src/sys/dev/syscons/syscons.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.461 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.462 2008/08/24 19:50:57 ed Exp $"); #include "opt_compat.h" #include "opt_syscons.h" @@ -103,7 +103,6 @@ static int sc_console_unit = -1; static int sc_saver_keyb_only = 1; static scr_stat *sc_console; -static struct tty *sc_console_tty; static struct consdev *sc_consptr; static void *kernel_console_ts; static scr_stat main_console; @@ -362,6 +361,7 @@ video_info_t info; #endif int vc; + struct tty *tp; flags &= ~SC_KERNEL_CONSOLE; @@ -457,8 +457,8 @@ */ } - sc_console_tty = sc_alloc_tty(0, "consolectl"); - SC_STAT(sc_console_tty) = sc_console; + tp = sc_alloc_tty(0, "consolectl"); + SC_STAT(tp) = sc_console; return 0; } @@ -639,13 +639,8 @@ while ((c = scgetc(sc, SCGETC_NONBLOCK)) != NOKEY) { cur_tty = SC_DEV(sc, sc->cur_scp->index); - if (!tty_opened(cur_tty)) { - cur_tty = sc_console_tty; - if (cur_tty == NULL) - continue; - if (!tty_opened(cur_tty)) - continue; - } + if (!tty_opened(cur_tty)) + continue; if ((*sc->cur_scp->tsw->te_input)(sc->cur_scp, c, cur_tty)) continue; @@ -1473,7 +1468,7 @@ return; /* initialize required fields */ - sprintf(cp->cn_name, "consolectl"); + strcpy(cp->cn_name, "ttyv0"); } static void ==== //depot/projects/vimage/src/sys/kern/init_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.242 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.243 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -532,5 +532,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ - { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/vimage/src/sys/kern/syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.226 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/kern/syscalls.c,v 1.227 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *syscallnames[] = { ==== //depot/projects/vimage/src/sys/kern/syscalls.master#8 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.245 2008/08/21 22:57:31 obrien Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.246 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -894,6 +894,6 @@ 502 AUE_SYMLINKAT STD { int symlinkat(char *path1, int fd, \ char *path2); } 503 AUE_UNLINKAT STD { int unlinkat(int fd, char *path, int flag); } -504 AUE_POSIXOPENPT STD { int posix_openpt(int flags); } +504 AUE_POSIX_OPENPT STD { int posix_openpt(int flags); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/vimage/src/sys/kern/vfs_subr.c#15 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.736 2008/07/30 12:39:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.737 2008/08/24 20:16:44 csjp Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -968,7 +968,7 @@ mac_vnode_init(vp); if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0) mac_vnode_associate_singlelabel(mp, vp); - else if (mp == NULL) + else if (mp == NULL && vops != &dead_vnodeops) printf("NULL mp in getnewvnode()\n"); #endif if (mp != NULL) { ==== //depot/projects/vimage/src/sys/modules/Makefile#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.585 2008/08/23 21:00:40 jhb Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.586 2008/08/24 21:27:01 imp Exp $ .include @@ -278,6 +278,7 @@ uftdi \ ugen \ uhid \ + uipaq \ ukbd \ ulpt \ umass \ ==== //depot/projects/vimage/src/sys/net/if_spppsubr.c#8 (text+ko) ==== @@ -18,24 +18,14 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.128 2008/08/17 23:27:27 bz Exp $ + * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.129 2008/08/24 20:40:00 imp Exp $ */ #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#endif - -#ifdef NetBSD1_3 -# if NetBSD1_3 > 6 -# include "opt_inet.h" -# include "opt_inet6.h" -# include "opt_iso.h" -# endif -#endif #include #include @@ -43,18 +33,12 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include -#endif #include #include #include -#if defined (__OpenBSD__) -#include -#else #include -#endif #include #include @@ -68,10 +52,6 @@ #include #include -#if defined (__NetBSD__) || defined (__OpenBSD__) -#include /* XXX for softnet */ -#endif - #include #include @@ -85,11 +65,7 @@ #include #endif -#if defined (__FreeBSD__) || defined (__OpenBSD__) -# include -#else -# include -#endif +#include #ifdef IPX #include @@ -98,12 +74,7 @@ #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -# define IOCTL_CMD_T u_long -#else -# define IOCTL_CMD_T int -#endif - +#define IOCTL_CMD_T u_long #define MAXALIVECNT 3 /* max. alive packets */ /* @@ -264,13 +235,8 @@ void (*scr)(struct sppp *sp); }; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 && __FreeBSD_version < 501113 -#define SPP_FMT "%s%d: " -#define SPP_ARGS(ifp) (ifp)->if_name, (ifp)->if_unit -#else #define SPP_FMT "%s: " #define SPP_ARGS(ifp) (ifp)->if_xname -#endif #define SPPP_LOCK(sp) \ do { \ @@ -1425,11 +1391,7 @@ ++sp->pp_loopcnt; /* Generate new local sequence number */ -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 sp->pp_seq[IDX_LCP] = random(); -#else - sp->pp_seq[IDX_LCP] ^= time.tv_sec ^ time.tv_usec; -#endif break; } sp->pp_loopcnt = 0; @@ -2674,11 +2636,7 @@ if (magic == ~sp->lcp.magic) { if (debug) log(-1, "magic glitch "); -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 sp->lcp.magic = random(); -#else - sp->lcp.magic = time.tv_sec + time.tv_usec; -#endif } else { sp->lcp.magic = magic; if (debug) @@ -2859,11 +2817,7 @@ if (sp->lcp.opts & (1 << LCP_OPT_MAGIC)) { if (! sp->lcp.magic) -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 sp->lcp.magic = random(); -#else - sp->lcp.magic = time.tv_sec + time.tv_usec; -#endif opt[i++] = LCP_OPT_MAGIC; opt[i++] = 6; opt[i++] = sp->lcp.magic >> 24; @@ -4386,15 +4340,7 @@ /* Compute random challenge. */ ch = (u_long *)sp->myauth.challenge; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 read_random(&seed, sizeof seed); -#else - { - struct timeval tv; - microtime(&tv); - seed = tv.tv_sec ^ tv.tv_usec; - } -#endif ch[0] = seed ^ random(); ch[1] = seed ^ random(); ch[2] = seed ^ random(); @@ -4903,17 +4849,7 @@ * aliases don't make any sense on a p2p link anyway. */ si = 0; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) -#elif defined(__NetBSD__) || defined (__OpenBSD__) - for (ifa = TAILQ_FIRST(&ifp->if_addrlist); - ifa; - ifa = TAILQ_NEXT(ifa, ifa_list)) -#else - for (ifa = ifp->if_addrlist; - ifa; - ifa = ifa->ifa_next) -#endif if (ifa->ifa_addr->sa_family == AF_INET) { si = (struct sockaddr_in *)ifa->ifa_addr; sm = (struct sockaddr_in *)ifa->ifa_netmask; @@ -4953,17 +4889,7 @@ * aliases don't make any sense on a p2p link anyway. */ si = 0; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) -#elif defined(__NetBSD__) || defined (__OpenBSD__) - for (ifa = TAILQ_FIRST(&ifp->if_addrlist); - ifa; - ifa = TAILQ_NEXT(ifa, ifa_list)) -#else - for (ifa = ifp->if_addrlist; - ifa; - ifa = ifa->ifa_next) -#endif { if (ifa->ifa_addr->sa_family == AF_INET) { @@ -4976,17 +4902,6 @@ if (ifa && si) { int error; -#if defined(__NetBSD__) && __NetBSD_Version__ >= 103080000 - struct sockaddr_in new_sin = *si; - - new_sin.sin_addr.s_addr = htonl(src); - error = in_ifinit(ifp, ifatoia(ifa), &new_sin, 1); - if(debug && error) - { - log(LOG_DEBUG, SPP_FMT "sppp_set_ip_addr: in_ifinit " - " failed, error=%d\n", SPP_ARGS(ifp), error); - } -#else /* delete old route */ error = rtinit(ifa, (int)RTM_DELETE, RTF_HOST); if(debug && error) @@ -5008,7 +4923,6 @@ log(LOG_DEBUG, SPP_FMT "sppp_set_ip_addr: rtinit ADD failed, error=%d", SPP_ARGS(ifp), error); } -#endif } } @@ -5033,17 +4947,7 @@ * aliases don't make any sense on a p2p link anyway. */ si = 0; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) -#elif defined(__NetBSD__) || defined (__OpenBSD__) - for (ifa = ifp->if_addrlist.tqh_first; - ifa; - ifa = ifa->ifa_list.tqe_next) -#else - for (ifa = ifp->if_addrlist; - ifa; - ifa = ifa->ifa_next) -#endif if (ifa->ifa_addr->sa_family == AF_INET6) { si = (struct sockaddr_in6 *)ifa->ifa_addr; sm = (struct sockaddr_in6 *)ifa->ifa_netmask; @@ -5096,15 +5000,7 @@ */ sin6 = NULL; -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) -#elif defined(__NetBSD__) || defined (__OpenBSD__) - for (ifa = ifp->if_addrlist.tqh_first; - ifa; - ifa = ifa->ifa_list.tqe_next) -#else - for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) -#endif { if (ifa->ifa_addr->sa_family == AF_INET6) { ==== //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#14 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.29 2008/08/23 14:39:01 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.30 2008/08/24 19:55:10 rwatson Exp $"); #include "opt_mac.h" @@ -508,7 +508,7 @@ if (error) return (error); if (td->td_ucred->cr_audit.ai_termid.at_type == AU_IPv6) - return (EOVERFLOW); + return (ERANGE); bzero(&ai, sizeof(ai)); ai.ai_auid = td->td_ucred->cr_audit.ai_auid; ai.ai_mask = td->td_ucred->cr_audit.ai_mask; ==== //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.91 2008/08/13 20:30:28 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.93 2008/08/24 20:53:36 marius Exp $"); #include "opt_ddb.h" #include "opt_ktr.h" @@ -388,6 +388,7 @@ struct proc *p; vm_offset_t va; vm_prot_t prot; + vm_map_entry_t entry; u_long ctx; int flags; int type; @@ -461,6 +462,19 @@ KASSERT(tf->tf_tstate & TSTATE_PRIV, ("trap_pfault: fault on nucleus context from user mode")); + if (tf->tf_tpc >= (u_long)copy_nofault_begin && + tf->tf_tpc <= (u_long)copy_nofault_end) { + vm_map_lock_read(kernel_map); + if (vm_map_lookup_entry(kernel_map, va, &entry) && + (entry->eflags & MAP_ENTRY_NOFAULT) != 0) { + tf->tf_tpc = (u_long)copy_fault; + tf->tf_tnpc = tf->tf_tpc + 4; + vm_map_unlock_read(kernel_map); + return (0); + } + vm_map_unlock_read(kernel_map); + } + /* * We don't have to worry about process locking or stacks in * the kernel. @@ -560,18 +574,15 @@ narg = callp->sy_narg; - if (narg <= regcnt) { - argp = &tf->tf_out[reg]; - error = 0; - } else { - KASSERT(narg <= sizeof(args) / sizeof(args[0]), - ("Too many syscall arguments!")); - argp = args; - bcopy(&tf->tf_out[reg], args, sizeof(args[0]) * regcnt); + KASSERT(narg <= sizeof(args) / sizeof(args[0]), + ("Too many syscall arguments!")); + error = 0; + argp = args; + bcopy(&tf->tf_out[reg], args, sizeof(args[0]) * regcnt); + if (narg > regcnt) error = copyin((void *)(tf->tf_out[6] + SPOFF + offsetof(struct frame, fr_pad[6])), &args[regcnt], (narg - regcnt) * sizeof(args[0])); - } CTR5(KTR_SYSC, "syscall: td=%p %s(%#lx, %#lx, %#lx)", td, syscallnames[code], argp[0], argp[1], argp[2]); ==== //depot/projects/vimage/src/sys/sys/syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.223 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/sys/syscall.h,v 1.224 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define SYS_syscall 0 ==== //depot/projects/vimage/src/sys/sys/syscall.mk#7 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.178 2008/08/20 08:39:10 ed Exp $ -# created from FreeBSD: head/sys/kern/syscalls.master 181905 2008-08-20 08:31:58Z ed +# $FreeBSD: src/sys/sys/syscall.mk,v 1.179 2008/08/24 21:23:08 rwatson Exp $ +# created from FreeBSD: head/sys/kern/syscalls.master 182123 2008-08-24 21:20:35Z rwatson MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/vimage/src/sys/sys/sysproto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.227 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/sys/sysproto.h,v 1.228 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/kern/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _SYS_SYSPROTO_H_ @@ -2573,7 +2573,7 @@ #define SYS_AUE_renameat AUE_RENAMEAT #define SYS_AUE_symlinkat AUE_SYMLINKAT #define SYS_AUE_unlinkat AUE_UNLINKAT -#define SYS_AUE_posix_openpt AUE_POSIXOPENPT +#define SYS_AUE_posix_openpt AUE_POSIX_OPENPT #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Sun Aug 24 23:00:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10E621065675; Sun, 24 Aug 2008 23:00:52 +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 C83851065671 for ; Sun, 24 Aug 2008 23:00:51 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFF4C8FC0A for ; Sun, 24 Aug 2008 23:00:51 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ON0pam078981 for ; Sun, 24 Aug 2008 23:00:51 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ON0oUh078979 for perforce@freebsd.org; Sun, 24 Aug 2008 23:00:50 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 23:00:50 GMT Message-Id: <200808242300.m7ON0oUh078979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148301 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, 24 Aug 2008 23:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148301 Change 148301 by julian@julian_trafmon1 on 2008/08/24 23:00:19 IFC@148296 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#7 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#10 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/isa/isavar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/vimage-commit2/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#7 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/copyright.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/file.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kernel.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/linedisc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/sys/param.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/resource.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscall.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/termios.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tty.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttycom.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/user.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_xs.c#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,7 @@ device random # Entropy device device ether # Ethernet support device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) +device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) ==== //depot/projects/vimage-commit2/src/sys/amd64/include/pci_cfgreg.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/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ * */ @@ -37,6 +37,7 @@ #define CONF1_ENABLE_MSK1 0x80000001ul #define CONF1_ENABLE_RES1 0x80000000ul +int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); ==== //depot/projects/vimage-commit2/src/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); #include #include @@ -36,11 +36,26 @@ #include #include #include +#include +#include #include +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_PCIE, +}; + +static int pciereg_cfgread(int bus, unsigned slot, unsigned func, + unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +static int cfgmech; +static vm_offset_t pcie_base; +static int pcie_minbus, pcie_maxbus; static struct mtx pcicfg_mtx; /* @@ -49,12 +64,42 @@ int pci_cfgregopen(void) { - static int opened = 0; + uint64_t pciebar; + uint16_t did, vid; - if (opened) + if (cfgmech != CFGMECH_NONE) return (1); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); - opened = 1; + cfgmech = CFGMECH_1; + + /* + * Grope around in the PCI config space to see if this is a + * chipset that is capable of doing memory-mapped config cycles. + * This also implies that it can do PCIe extended config cycles. + */ + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + return (1); } @@ -130,6 +175,11 @@ int data = -1; int port; + if (cfgmech == CFGMECH_PCIE) { + data = pciereg_cfgread(bus, slot, func, reg, bytes); + return (data); + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -155,6 +205,11 @@ { int port; + if (cfgmech == CFGMECH_PCIE) { + pciereg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -173,3 +228,82 @@ } mtx_unlock_spin(&pcicfg_mtx); } + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (minbus != 0) + return (0); + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", + base); + + /* XXX: We should make sure this really fits into the direct map. */ + pcie_base = (vm_offset_t)pmap_mapdev(base, (maxbus + 1) << 20); + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + return (1); +} + +#define PCIE_VADDR(base, reg, bus, slot, func) \ + ((base) + \ + ((((bus) & 0xff) << 20) | \ + (((slot) & 0x1f) << 15) | \ + (((func) & 0x7) << 12) | \ + ((reg) & 0xfff))) + +static int +pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, + unsigned bytes) +{ + volatile vm_offset_t va; + int data = -1; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return (-1); + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + data = *(volatile uint32_t *)(va); + break; + case 2: + data = *(volatile uint16_t *)(va); + break; + case 1: + data = *(volatile uint8_t *)(va); + break; + } + + return (data); +} + +static void +pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes) +{ + volatile vm_offset_t va; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return; + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + *(volatile uint32_t *)(va) = data; + break; + case 2: + *(volatile uint16_t *)(va) = data; + break; + case 1: + *(volatile uint8_t *)(va) = data; + break; + } +} ==== //depot/projects/vimage-commit2/src/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $ */ #ifndef _ENDIAN_H_ @@ -94,7 +94,7 @@ : "+r" (v), "=r" (t1)); return (v); - } +} static __inline __uint16_t __bswap16_var(__uint16_t v) ==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -8,7 +8,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -28,7 +29,6 @@ #include #include -#include #include #include #include @@ -438,7 +438,7 @@ while (len) { if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 || itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) { - /* Allocate a physical page, claim the virtual area */ + /* Allocate a physical page, claim the virtual area. */ if (pa == (vm_offset_t)-1) { pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M); if (pa == (vm_offset_t)-1) @@ -448,7 +448,9 @@ panic("%s: can't claim virtual page " "(wanted %#lx, got %#lx)", __func__, va, mva); - /* The mappings may have changed, be paranoid. */ + /* + * The mappings may have changed, be paranoid. + */ continue; } /* @@ -553,6 +555,7 @@ } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); + if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max, sizeof(dtlb_slot_max)) == -1 || OF_getprop(child, "#itlb-entries", &itlb_slot_max, @@ -580,7 +583,7 @@ struct devsw **dp; /* - * Tell the Open Firmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the OFW gate. */ OF_init(openfirm); ==== //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#3 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -548,6 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 (text+ko) ==== @@ -382,6 +382,49 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN +#elif defined(__mips__) + +/* + * Define the appropriate "processor characteristics" + */ +#define _STACK_GROWS_DOWNWARD +#define _LONG_LONG_LTOH +#define _BIT_FIELDS_LTOH +#define _IEEE_754 +#define _CHAR_IS_SIGNED +#define _BOOL_ALIGNMENT 1 +#define _CHAR_ALIGNMENT 1 +#define _SHORT_ALIGNMENT 2 +#define _INT_ALIGNMENT 4 +#define _FLOAT_ALIGNMENT 4 +#define _FLOAT_COMPLEX_ALIGNMENT 4 +#define _LONG_ALIGNMENT 4 +#define _LONG_LONG_ALIGNMENT 4 +#define _DOUBLE_ALIGNMENT 4 +#define _DOUBLE_COMPLEX_ALIGNMENT 4 +#define _LONG_DOUBLE_ALIGNMENT 4 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4 +#define _POINTER_ALIGNMENT 4 +#define _MAX_ALIGNMENT 4 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT + +/* + * Define the appropriate "implementation choices". + */ +#define _ILP32 +#if !defined(_I32LPx) && defined(_KERNEL) +#define _I32LPx +#endif +#define _SUNOS_VTOC_16 +#define _DMA_USES_PHYSADDR +#define _FIRMWARE_NEEDS_FDISK +#define _PSM_MODULES +#define _RTC_CONFIG +#define _DONT_USE_1275_GENERIC_NAMES +#define _HAVE_CPUID_INSN + #elif defined(__powerpc__) /* ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.87 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.85 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define FREEBSD32_SYS_syscall 0 @@ -355,4 +355,5 @@ #define FREEBSD32_SYS_renameat 501 #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 -#define FREEBSD32_SYS_MAXSYSCALL 504 +#define FREEBSD32_SYS_posix_openpt 504 +#define FREEBSD32_SYS_MAXSYSCALL 505 ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.76 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *freebsd32_syscallnames[] = { @@ -511,4 +511,5 @@ "renameat", /* 501 = renameat */ "symlinkat", /* 502 = symlinkat */ "unlinkat", /* 503 = unlinkat */ + "posix_openpt", /* 504 = posix_openpt */ }; ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.86 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -542,4 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -31,6 +31,13 @@ ; NOSTD implemented but as a lkm that can be statically ; compiled in; sysent entry will be filled with lkmsys ; so the SYSCALL_MODULE macro works +; NOARGS same as STD except do not create structure in sys/sysproto.h +; NODEF same as STD except only have the entry in the syscall table +; added. Meaning - do do not create structure or function +; prototype in sys/sysproto.h +; NOPROTO same as STD except do not create structure or +; function prototype in sys/sysproto.h. Does add a +; definition to syscall.h besides adding a sysent. ; #ifdef's, etc. may be included, and are copied to the output files. @@ -846,3 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); #include #include @@ -296,6 +296,11 @@ unsigned short ws_xpixel, ws_ypixel; }; +struct speedtab { + int sp_speed; /* Speed. */ + int sp_code; /* Code. */ +}; + static struct speedtab sptab[] = { { B0, LINUX_B0 }, { B50, LINUX_B50 }, { B75, LINUX_B75 }, { B110, LINUX_B110 }, @@ -395,7 +400,7 @@ lios->c_oflag |= LINUX_OPOST; if (bios->c_oflag & ONLCR) lios->c_oflag |= LINUX_ONLCR; - if (bios->c_oflag & OXTABS) + if (bios->c_oflag & TAB3) lios->c_oflag |= LINUX_XTABS; lios->c_cflag = bsd_to_linux_speed(bios->c_ispeed, sptab); @@ -537,7 +542,7 @@ if (lios->c_oflag & LINUX_ONLCR) bios->c_oflag |= ONLCR; if (lios->c_oflag & LINUX_XTABS) - bios->c_oflag |= OXTABS; + bios->c_oflag |= TAB3; bios->c_cflag = (lios->c_cflag & LINUX_CSIZE) << 4; if (lios->c_cflag & LINUX_CSTOPB) ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.92 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -109,8 +110,17 @@ if (fp->f_vnode != NULL && fp->f_vnode->v_un.vu_cdev != NULL && linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, - &major, &minor) == 0) + &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); + } else if (fp->f_type == DTYPE_PTS) { + struct tty *tp = fp->f_data; + + /* Convert the numbers for the slave device. */ + if (linux_driver_get_major_minor(tp->t_dev->si_name, + &major, &minor) == 0) { + buf->st_rdev = (major << 8 | minor); + } + } fdrop(fp, td); } ==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1503 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1275,11 +1275,7 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -# The `pty' device usually turns out to be ``effectively mandatory'', -# as it is required for `telnetd', `rlogind', `screen', `emacs', and -# `xterm', among others. - -device pty #Pseudo ttys +device pty #BSD-style compatibility pseudo ttys device nmdm #back-to-back tty devices device md #Memory/malloc disk device ccd #Concatenated disk driver @@ -1291,9 +1287,6 @@ # Size of the kernel message buffer. Should be N * pagesize. options MSGBUF_SIZE=40960 -# Maximum size of a tty or pty input buffer. -options TTYHOG=8193 - ##################################################################### # HARDWARE DEVICE CONFIGURATION ==== //depot/projects/vimage-commit2/src/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -572,6 +572,7 @@ dev/drm/i915_drv.c optional i915drm dev/drm/i915_irq.c optional i915drm dev/drm/i915_mem.c optional i915drm +dev/drm/i915_suspend.c optional i915drm dev/drm/mach64_dma.c optional mach64drm dev/drm/mach64_drv.c optional mach64drm dev/drm/mach64_irq.c optional mach64drm @@ -1661,12 +1662,14 @@ kern/sysv_shm.c optional sysvshm kern/tty.c standard kern/tty_compat.c optional compat_43tty -kern/tty_conf.c standard kern/tty_cons.c standard kern/tty_info.c standard -kern/tty_pts.c optional pty +kern/tty_inq.c standard +kern/tty_outq.c standard +kern/tty_pts.c standard kern/tty_pty.c optional pty kern/tty_tty.c standard +kern/tty_ttydisc.c standard kern/uipc_accf.c optional inet kern/uipc_cow.c optional zero_copy_sockets kern/uipc_debug.c optional ddb @@ -2354,4 +2357,4 @@ dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen+dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage-commit2/src/sys/conf/files.i386#6 (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.604 2008/08/17 23:44:09 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -329,6 +329,7 @@ #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 23:05:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89649106566C; Sun, 24 Aug 2008 23:05: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 4C30D1065681 for ; Sun, 24 Aug 2008 23:05:58 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5479A8FC1B for ; Sun, 24 Aug 2008 23:05:58 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ON5wrN080520 for ; Sun, 24 Aug 2008 23:05:58 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ON5v7I080516 for perforce@freebsd.org; Sun, 24 Aug 2008 23:05:57 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 23:05:57 GMT Message-Id: <200808242305.m7ON5v7I080516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148302 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, 24 Aug 2008 23:05:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=148302 Change 148302 by julian@julian_trafmon1 on 2008/08/24 23:04:58 IFparent@148301 Affected files ... .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/conf/NOTES#6 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files#7 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files.i386#5 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options#7 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit3/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/vimage-commit3/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/isa/isavar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/init_main.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/vimage-commit3/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/vimage-commit3/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/vimage-commit3/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/vimage-commit3/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/Makefile#6 integrate .. //depot/projects/vimage-commit3/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/if.c#8 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/vimage-commit3/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit3/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/vimage-commit3/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/conf.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/copyright.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/file.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/kernel.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/sys/linedisc.h#2 delete .. //depot/projects/vimage-commit3/src/sys/sys/param.h#7 integrate .. //depot/projects/vimage-commit3/src/sys/sys/proc.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/sys/resource.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/syscall.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/termios.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/tty.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/ttycom.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/user.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_xs.c#4 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,7 @@ device random # Entropy device device ether # Ethernet support device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) +device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) ==== //depot/projects/vimage-commit3/src/sys/amd64/include/pci_cfgreg.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/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ * */ @@ -37,6 +37,7 @@ #define CONF1_ENABLE_MSK1 0x80000001ul #define CONF1_ENABLE_RES1 0x80000000ul +int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); ==== //depot/projects/vimage-commit3/src/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); #include #include @@ -36,11 +36,26 @@ #include #include #include +#include +#include #include +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_PCIE, +}; + +static int pciereg_cfgread(int bus, unsigned slot, unsigned func, + unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +static int cfgmech; +static vm_offset_t pcie_base; +static int pcie_minbus, pcie_maxbus; static struct mtx pcicfg_mtx; /* @@ -49,12 +64,42 @@ int pci_cfgregopen(void) { - static int opened = 0; + uint64_t pciebar; + uint16_t did, vid; - if (opened) + if (cfgmech != CFGMECH_NONE) return (1); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); - opened = 1; + cfgmech = CFGMECH_1; + + /* + * Grope around in the PCI config space to see if this is a + * chipset that is capable of doing memory-mapped config cycles. + * This also implies that it can do PCIe extended config cycles. + */ + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + return (1); } @@ -130,6 +175,11 @@ int data = -1; int port; + if (cfgmech == CFGMECH_PCIE) { + data = pciereg_cfgread(bus, slot, func, reg, bytes); + return (data); + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -155,6 +205,11 @@ { int port; + if (cfgmech == CFGMECH_PCIE) { + pciereg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -173,3 +228,82 @@ } mtx_unlock_spin(&pcicfg_mtx); } + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (minbus != 0) + return (0); + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", + base); + + /* XXX: We should make sure this really fits into the direct map. */ + pcie_base = (vm_offset_t)pmap_mapdev(base, (maxbus + 1) << 20); + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + return (1); +} + +#define PCIE_VADDR(base, reg, bus, slot, func) \ + ((base) + \ + ((((bus) & 0xff) << 20) | \ + (((slot) & 0x1f) << 15) | \ + (((func) & 0x7) << 12) | \ + ((reg) & 0xfff))) + +static int +pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, + unsigned bytes) +{ + volatile vm_offset_t va; + int data = -1; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return (-1); + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + data = *(volatile uint32_t *)(va); + break; + case 2: + data = *(volatile uint16_t *)(va); + break; + case 1: + data = *(volatile uint8_t *)(va); + break; + } + + return (data); +} + +static void +pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes) +{ + volatile vm_offset_t va; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return; + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + *(volatile uint32_t *)(va) = data; + break; + case 2: + *(volatile uint16_t *)(va) = data; + break; + case 1: + *(volatile uint8_t *)(va) = data; + break; + } +} ==== //depot/projects/vimage-commit3/src/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $ */ #ifndef _ENDIAN_H_ @@ -94,7 +94,7 @@ : "+r" (v), "=r" (t1)); return (v); - } +} static __inline __uint16_t __bswap16_var(__uint16_t v) ==== //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -8,7 +8,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -28,7 +29,6 @@ #include #include -#include #include #include #include @@ -438,7 +438,7 @@ while (len) { if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 || itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) { - /* Allocate a physical page, claim the virtual area */ + /* Allocate a physical page, claim the virtual area. */ if (pa == (vm_offset_t)-1) { pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M); if (pa == (vm_offset_t)-1) @@ -448,7 +448,9 @@ panic("%s: can't claim virtual page " "(wanted %#lx, got %#lx)", __func__, va, mva); - /* The mappings may have changed, be paranoid. */ + /* + * The mappings may have changed, be paranoid. + */ continue; } /* @@ -553,6 +555,7 @@ } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); + if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max, sizeof(dtlb_slot_max)) == -1 || OF_getprop(child, "#itlb-entries", &itlb_slot_max, @@ -580,7 +583,7 @@ struct devsw **dp; /* - * Tell the Open Firmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the OFW gate. */ OF_init(openfirm); ==== //depot/projects/vimage-commit3/src/sys/bsm/audit_kevents.h#3 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -548,6 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/vimage-commit3/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 (text+ko) ==== @@ -382,6 +382,49 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN +#elif defined(__mips__) + +/* + * Define the appropriate "processor characteristics" + */ +#define _STACK_GROWS_DOWNWARD +#define _LONG_LONG_LTOH +#define _BIT_FIELDS_LTOH +#define _IEEE_754 +#define _CHAR_IS_SIGNED +#define _BOOL_ALIGNMENT 1 +#define _CHAR_ALIGNMENT 1 +#define _SHORT_ALIGNMENT 2 +#define _INT_ALIGNMENT 4 +#define _FLOAT_ALIGNMENT 4 +#define _FLOAT_COMPLEX_ALIGNMENT 4 +#define _LONG_ALIGNMENT 4 +#define _LONG_LONG_ALIGNMENT 4 +#define _DOUBLE_ALIGNMENT 4 +#define _DOUBLE_COMPLEX_ALIGNMENT 4 +#define _LONG_DOUBLE_ALIGNMENT 4 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4 +#define _POINTER_ALIGNMENT 4 +#define _MAX_ALIGNMENT 4 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT + +/* + * Define the appropriate "implementation choices". + */ +#define _ILP32 +#if !defined(_I32LPx) && defined(_KERNEL) +#define _I32LPx +#endif +#define _SUNOS_VTOC_16 +#define _DMA_USES_PHYSADDR +#define _FIRMWARE_NEEDS_FDISK +#define _PSM_MODULES +#define _RTC_CONFIG +#define _DONT_USE_1275_GENERIC_NAMES +#define _HAVE_CPUID_INSN + #elif defined(__powerpc__) /* ==== //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.87 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.85 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define FREEBSD32_SYS_syscall 0 @@ -355,4 +355,5 @@ #define FREEBSD32_SYS_renameat 501 #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 -#define FREEBSD32_SYS_MAXSYSCALL 504 +#define FREEBSD32_SYS_posix_openpt 504 +#define FREEBSD32_SYS_MAXSYSCALL 505 ==== //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.76 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *freebsd32_syscallnames[] = { @@ -511,4 +511,5 @@ "renameat", /* 501 = renameat */ "symlinkat", /* 502 = symlinkat */ "unlinkat", /* 503 = unlinkat */ + "posix_openpt", /* 504 = posix_openpt */ }; ==== //depot/projects/vimage-commit3/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.86 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -542,4 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/vimage-commit3/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -31,6 +31,13 @@ ; NOSTD implemented but as a lkm that can be statically ; compiled in; sysent entry will be filled with lkmsys ; so the SYSCALL_MODULE macro works +; NOARGS same as STD except do not create structure in sys/sysproto.h +; NODEF same as STD except only have the entry in the syscall table +; added. Meaning - do do not create structure or function +; prototype in sys/sysproto.h +; NOPROTO same as STD except do not create structure or +; function prototype in sys/sysproto.h. Does add a +; definition to syscall.h besides adding a sysent. ; #ifdef's, etc. may be included, and are copied to the output files. @@ -846,3 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); #include #include @@ -296,6 +296,11 @@ unsigned short ws_xpixel, ws_ypixel; }; +struct speedtab { + int sp_speed; /* Speed. */ + int sp_code; /* Code. */ +}; + static struct speedtab sptab[] = { { B0, LINUX_B0 }, { B50, LINUX_B50 }, { B75, LINUX_B75 }, { B110, LINUX_B110 }, @@ -395,7 +400,7 @@ lios->c_oflag |= LINUX_OPOST; if (bios->c_oflag & ONLCR) lios->c_oflag |= LINUX_ONLCR; - if (bios->c_oflag & OXTABS) + if (bios->c_oflag & TAB3) lios->c_oflag |= LINUX_XTABS; lios->c_cflag = bsd_to_linux_speed(bios->c_ispeed, sptab); @@ -537,7 +542,7 @@ if (lios->c_oflag & LINUX_ONLCR) bios->c_oflag |= ONLCR; if (lios->c_oflag & LINUX_XTABS) - bios->c_oflag |= OXTABS; + bios->c_oflag |= TAB3; bios->c_cflag = (lios->c_cflag & LINUX_CSIZE) << 4; if (lios->c_cflag & LINUX_CSTOPB) ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.92 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -109,8 +110,17 @@ if (fp->f_vnode != NULL && fp->f_vnode->v_un.vu_cdev != NULL && linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, - &major, &minor) == 0) + &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); + } else if (fp->f_type == DTYPE_PTS) { + struct tty *tp = fp->f_data; + + /* Convert the numbers for the slave device. */ + if (linux_driver_get_major_minor(tp->t_dev->si_name, + &major, &minor) == 0) { + buf->st_rdev = (major << 8 | minor); + } + } fdrop(fp, td); } ==== //depot/projects/vimage-commit3/src/sys/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1503 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1275,11 +1275,7 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -# The `pty' device usually turns out to be ``effectively mandatory'', -# as it is required for `telnetd', `rlogind', `screen', `emacs', and -# `xterm', among others. - -device pty #Pseudo ttys +device pty #BSD-style compatibility pseudo ttys device nmdm #back-to-back tty devices device md #Memory/malloc disk device ccd #Concatenated disk driver @@ -1291,9 +1287,6 @@ # Size of the kernel message buffer. Should be N * pagesize. options MSGBUF_SIZE=40960 -# Maximum size of a tty or pty input buffer. -options TTYHOG=8193 - ##################################################################### # HARDWARE DEVICE CONFIGURATION ==== //depot/projects/vimage-commit3/src/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -572,6 +572,7 @@ dev/drm/i915_drv.c optional i915drm dev/drm/i915_irq.c optional i915drm dev/drm/i915_mem.c optional i915drm +dev/drm/i915_suspend.c optional i915drm dev/drm/mach64_dma.c optional mach64drm dev/drm/mach64_drv.c optional mach64drm dev/drm/mach64_irq.c optional mach64drm @@ -1661,12 +1662,14 @@ kern/sysv_shm.c optional sysvshm kern/tty.c standard kern/tty_compat.c optional compat_43tty -kern/tty_conf.c standard kern/tty_cons.c standard kern/tty_info.c standard -kern/tty_pts.c optional pty +kern/tty_inq.c standard +kern/tty_outq.c standard +kern/tty_pts.c standard kern/tty_pty.c optional pty kern/tty_tty.c standard +kern/tty_ttydisc.c standard kern/uipc_accf.c optional inet kern/uipc_cow.c optional zero_copy_sockets kern/uipc_debug.c optional ddb @@ -2354,4 +2357,4 @@ dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen+dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage-commit3/src/sys/conf/files.i386#5 (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.604 2008/08/17 23:44:09 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -329,6 +329,7 @@ #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 23:15:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 701951065681; Sun, 24 Aug 2008 23:15:08 +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 2C41A1065673 for ; Sun, 24 Aug 2008 23:15:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 352818FC1B for ; Sun, 24 Aug 2008 23:15:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ONF7Ow081214 for ; Sun, 24 Aug 2008 23:15:07 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ONF7Lm081212 for perforce@freebsd.org; Sun, 24 Aug 2008 23:15:07 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 23:15:07 GMT Message-Id: <200808242315.m7ONF7Lm081212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148303 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, 24 Aug 2008 23:15:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=148303 Change 148303 by julian@julian_trafmon1 on 2008/08/24 23:14:23 Move the contents of vimage3 down to vimage3 in preparation for the next set of commits Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC_NODEBUG#3 branch .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC_NODEBUG#3 branch .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#1 branch .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/vnetgraph.h#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#1 branch .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#1 branch .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#13 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#7 (text+ko) ==== @@ -1000,6 +1000,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { + INIT_VNET_NET(TD_TO_VNET(curthread)); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#10 (text+ko) ==== @@ -2051,6 +2051,7 @@ int linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) { + INIT_VNET_NET(ifp->if_vnet); struct ifnet *ifscan; int ethno; @@ -2084,6 +2085,7 @@ static struct ifnet * ifname_linux_to_bsd(const char *lxname, char *bsdname) { + INIT_VNET_NET(TD_TO_VNET(curthread)); struct ifnet *ifp; int len, unit; char *ep; @@ -2124,6 +2126,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + INIT_VNET_NET(TD_TO_VNET(td)); #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#8 (text+ko) ==== @@ -714,6 +714,7 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { + INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#6 (text+ko) ==== @@ -184,6 +184,7 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { + INIT_VPROCG(TD_TO_VPROCG(&thread0)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#6 (text+ko) ==== @@ -678,6 +678,7 @@ static void fw_reset_crom(struct firewire_comm *fc) { + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct crom_src_buf *buf; struct crom_src *src; struct crom_chunk *root; ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#8 (text+ko) ==== @@ -114,6 +114,7 @@ ISO_RRIP_SLINK *p; ISO_RRIP_ANALYZE *ana; { + INIT_VPROCG(TD_TO_VPROCG(curthread)); ISO_RRIP_SLINK_COMPONENT *pcomp; ISO_RRIP_SLINK_COMPONENT *pcompe; int len, wlen, cont; @@ -224,6 +225,7 @@ ISO_RRIP_ALTNAME *p; ISO_RRIP_ANALYZE *ana; { + INIT_VPROCG(TD_TO_VPROCG(curthread)); char *inbuf; int wlen; int cont; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#9 (text+ko) ==== @@ -475,6 +475,7 @@ void getcredhostname(struct ucred *cred, char *buf, size_t size) { + INIT_VPROCG(cred->cr_vimage->v_procg); if (jailed(cred)) { mtx_lock(&cred->cr_prison->pr_mtx); ==== //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#7 (text+ko) ==== @@ -219,6 +219,7 @@ static int sysctl_hostname(SYSCTL_HANDLER_ARGS) { + INIT_VPROCG(TD_TO_VPROCG(req->td)); struct prison *pr; char tmphostname[MAXHOSTNAMELEN]; int error; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#7 (text+ko) ==== @@ -88,6 +88,7 @@ static void uuid_node(uint16_t *node) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; struct sockaddr_dl *sdl; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#8 (text+ko) ==== @@ -246,6 +246,7 @@ struct thread *td; struct getdomainname_args *uap; { + INIT_VPROCG(TD_TO_VPROCG(td)); char tmpdomainname[MAXHOSTNAMELEN]; int domainnamelen; @@ -271,6 +272,7 @@ struct thread *td; struct setdomainname_args *uap; { + INIT_VPROCG(TD_TO_VPROCG(td)); char tmpdomainname[MAXHOSTNAMELEN]; int error, domainnamelen; ==== //depot/projects/vimage-commit2/src/sys/net/if.c#12 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include + #include #include @@ -279,6 +280,7 @@ static int netkqfilter(struct cdev *dev, struct knote *kn) { + INIT_VNET_NET(curvnet); struct knlist *klist; struct ifnet *ifp; int idx; @@ -383,6 +385,7 @@ struct ifnet* if_alloc(u_char type) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; ifp = malloc(sizeof(struct ifnet), M_IFNET, M_WAITOK|M_ZERO); @@ -445,6 +448,7 @@ void if_free_type(struct ifnet *ifp, u_char type) { + INIT_VNET_NET(curvnet); /* ifp->if_vnet can be NULL here ! */ if (ifp != ifnet_byindex(ifp->if_index)) { if_printf(ifp, "%s: value was not if_alloced, skipping\n", @@ -482,6 +486,7 @@ void if_attach(struct ifnet *ifp) { + INIT_VNET_NET(curvnet); unsigned socksize, ifasize; int namelen, masklen; struct sockaddr_dl *sdl; @@ -595,6 +600,7 @@ static void if_attachdomain(void *dummy) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; int s; @@ -705,6 +711,7 @@ void if_detach(struct ifnet *ifp) { + INIT_VNET_NET(ifp->if_vnet); struct ifaddr *ifa; struct radix_node_head *rnh; int s; @@ -820,6 +827,7 @@ int if_addgroup(struct ifnet *ifp, const char *groupname) { + INIT_VNET_NET(ifp->if_vnet); struct ifg_list *ifgl; struct ifg_group *ifg = NULL; struct ifg_member *ifgm; @@ -889,6 +897,7 @@ int if_delgroup(struct ifnet *ifp, const char *groupname) { + INIT_VNET_NET(ifp->if_vnet); struct ifg_list *ifgl; struct ifg_member *ifgm; @@ -978,6 +987,7 @@ static int if_getgroupmembers(struct ifgroupreq *data) { + INIT_VNET_NET(curvnet); struct ifgroupreq *ifgr = data; struct ifg_group *ifg; struct ifg_member *ifgm; @@ -1087,6 +1097,7 @@ struct ifaddr * ifa_ifwithaddr(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; @@ -1117,6 +1128,7 @@ struct ifaddr * ifa_ifwithbroadaddr(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; @@ -1144,6 +1156,7 @@ struct ifaddr * ifa_ifwithdstaddr(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; @@ -1172,6 +1185,7 @@ struct ifaddr * ifa_ifwithnet(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; struct ifaddr *ifa_maybe = (struct ifaddr *) 0; @@ -1415,6 +1429,7 @@ struct ifnet *ifp = (struct ifnet *)arg; int link_state = ifp->if_link_state; int link; + CURVNET_SET(ifp->if_vnet); /* Notify that the link state has changed. */ rt_ifmsg(ifp); @@ -1451,6 +1466,7 @@ if (log_link_state_change) log(LOG_NOTICE, "%s: link state changed to %s\n", ifp->if_xname, (link_state == LINK_STATE_UP) ? "UP" : "DOWN" ); + CURVNET_RESTORE(); } /* @@ -1517,12 +1533,15 @@ int s = splimp(); IFNET_RLOCK(); + VNET_ITERLOOP_BEGIN(); + INIT_VNET_NET(curvnet); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_timer == 0 || --ifp->if_timer) continue; if (ifp->if_watchdog) (*ifp->if_watchdog)(ifp); } + VNET_ITERLOOP_END(); IFNET_RUNLOCK(); splx(s); timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ); @@ -1535,6 +1554,7 @@ struct ifnet * ifunit(const char *name) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; IFNET_RLOCK(); @@ -2107,6 +2127,7 @@ static int ifconf(u_long cmd, caddr_t data) { + INIT_VNET_NET(curvnet); struct ifconf *ifc = (struct ifconf *)data; #ifdef __amd64__ struct ifconf32 *ifc32 = (struct ifconf32 *)data; @@ -2466,6 +2487,7 @@ int lastref; #ifdef INVARIANTS struct ifnet *oifp; + INIT_VNET_NET(ifp->if_vnet); IFNET_RLOCK(); TAILQ_FOREACH(oifp, &V_ifnet, if_link) ==== //depot/projects/vimage-commit2/src/sys/net/if.h#3 (text+ko) ==== @@ -457,4 +457,8 @@ #include #endif +#ifdef _KERNEL +#include +#endif + #endif /* !_NET_IF_H_ */ ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#6 (text+ko) ==== @@ -388,6 +388,7 @@ { int error; #if defined(INET) || defined(INET6) + INIT_VNET_NET(ifp->if_vnet); struct ip_fw *rule = ip_dn_claim_rule(m); if (IPFW_LOADED && V_ether_ipfw != 0) { @@ -419,6 +420,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, struct ip_fw **rule, int shared) { + INIT_VNET_IPFW(dst->if_vnet); struct ether_header *eh; struct ether_header save_eh; struct mbuf *m; @@ -711,6 +713,7 @@ KASSERT(ifp != NULL, ("%s: NULL interface pointer", __func__)); #if defined(INET) || defined(INET6) + INIT_VNET_NET(ifp->if_vnet); /* * Allow dummynet and/or ipfw to claim the frame. * Do not do this for PROMISC frames in case we are re-entered. ==== //depot/projects/vimage-commit2/src/sys/net/if_faith.c#6 (text+ko) ==== @@ -324,6 +324,7 @@ faithprefix(in6) struct in6_addr *in6; { + INIT_VNET_INET6(curvnet); struct rtentry *rt; struct sockaddr_in6 sin6; int ret; ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#6 (text+ko) ==== @@ -154,6 +154,7 @@ int unit; caddr_t params; { + INIT_VNET_GIF(curvnet); struct gif_softc *sc; sc = malloc(sizeof(struct gif_softc), M_GIF, M_WAITOK | M_ZERO); @@ -364,6 +365,7 @@ struct sockaddr *dst; struct rtentry *rt; /* added in net2 */ { + INIT_VNET_GIF(ifp->if_vnet); struct gif_softc *sc = ifp->if_softc; struct m_tag *mtag; int error = 0; @@ -854,6 +856,7 @@ struct sockaddr *src; struct sockaddr *dst; { + INIT_VNET_GIF(ifp->if_vnet); struct gif_softc *sc = ifp->if_softc; struct gif_softc *sc2; struct sockaddr *osrc, *odst, *sa; ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.h#2 (text+ko) ==== @@ -110,6 +110,29 @@ void gif_delete_tunnel(struct ifnet *); int gif_encapcheck(const struct mbuf *, int, int, void *); +/* + * Virtualization support + */ + +#define INIT_VNET_GIF(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) + +#define VNET_GIF(sym) VSYM(vnet_gif, sym) + +struct vnet_gif { + LIST_HEAD(, gif_softc) _gif_softc_list; + int _max_gif_nesting; + int _parallel_tunnels; + int _ip_gif_ttl; + int _ip6_gif_hlim; +}; + +#define V_gif_softc_list VNET_GIF(gif_softc_list) +#define V_max_gif_nesting VNET_GIF(max_gif_nesting) +#define V_parallel_tunnels VNET_GIF(parallel_tunnels) +#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) +#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) + #endif /* _KERNEL */ #endif /* _NET_IF_GIF_H_ */ ==== //depot/projects/vimage-commit2/src/sys/net/if_gre.c#8 (text+ko) ==== @@ -241,6 +241,9 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt) { +#ifdef INET6 + INIT_VNET_INET(ifp->if_vnet); +#endif int error = 0; struct gre_softc *sc = ifp->if_softc; struct greip *gh; ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#8 (text+ko) ==== @@ -115,6 +115,7 @@ static int lo_clone_create(struct if_clone *ifc, int unit, caddr_t params) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; ifp = if_alloc(IFT_LOOP); @@ -214,6 +215,7 @@ int if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen) { + INIT_VNET_NET(ifp->if_vnet); int isr; M_ASSERTPKTHDR(m); ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#7 (text+ko) ==== @@ -71,6 +71,7 @@ static int sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */ { + INIT_VNET_NET(curvnet); int *name = (int *)arg1; int error; u_int namelen = arg2; ==== //depot/projects/vimage-commit2/src/sys/net/if_stf.c#6 (text+ko) ==== @@ -365,6 +365,7 @@ stf_getsrcifa6(ifp) struct ifnet *ifp; { + INIT_VNET_INET(ifp->if_vnet); struct ifaddr *ia; struct in_ifaddr *ia4; struct sockaddr_in6 *sin6; @@ -560,6 +561,7 @@ struct in_addr *in; struct ifnet *inifp; /* incoming interface */ { + INIT_VNET_INET(curvnet); struct in_ifaddr *ia4; /* ==== //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#7 (text+ko) ==== @@ -573,6 +573,7 @@ static struct ifnet * vlan_clone_match_ethertag(struct if_clone *ifc, const char *name, int *tag) { + INIT_VNET_NET(curvnet); const char *cp; struct ifnet *ifp; int t = 0; ==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#8 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include /* @@ -75,6 +76,7 @@ int raw_attach(struct socket *so, int proto) { + INIT_VNET_NET(so->so_vnet); struct rawcb *rp = sotorawcb(so); int error; ==== //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#8 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF); @@ -56,6 +57,7 @@ void raw_init(void) { + INIT_VNET_NET(curvnet); LIST_INIT(&V_rawcb_list); } @@ -70,6 +72,7 @@ void raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src) { + INIT_VNET_NET(curvnet); struct rawcb *rp; struct mbuf *m = m0; struct socket *last; ==== //depot/projects/vimage-commit2/src/sys/net/route.c#7 (text+ko) ==== @@ -278,6 +278,7 @@ u_int fibnum) { struct radix_node_head *rnh; + INIT_VNET_NET(curvnet); struct rtentry *rt; struct radix_node *rn; struct rtentry *newrt; @@ -382,6 +383,7 @@ void rtfree(struct rtentry *rt) { + INIT_VNET_NET(curvnet); struct radix_node_head *rnh; KASSERT(rt != NULL,("%s: NULL rt", __func__)); @@ -482,6 +484,7 @@ struct sockaddr *src, u_int fibnum) { + INIT_VNET_NET(curvnet); struct rtentry *rt, *rt0 = NULL; int error = 0; short *stat = NULL; @@ -788,6 +791,7 @@ int rtexpunge(struct rtentry *rt) { + INIT_VNET_NET(curvnet); struct radix_node *rn; struct radix_node_head *rnh; struct ifaddr *ifa; @@ -879,6 +883,7 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, struct rtentry **ret_nrt, u_int fibnum) { + INIT_VNET_NET(curvnet); int error = 0; register struct rtentry *rt; register struct radix_node *rn; @@ -1309,6 +1314,7 @@ int rt_setgate(struct rtentry *rt, struct sockaddr *dst, struct sockaddr *gate) { + INIT_VNET_NET(curvnet); /* XXX dst may be overwritten, can we move this to below */ struct radix_node_head *rnh = V_rt_tables[rt->rt_fibnum][dst->sa_family]; int dlen = SA_SIZE(dst), glen = SA_SIZE(gate); @@ -1450,6 +1456,7 @@ static inline int rtinit1(struct ifaddr *ifa, int cmd, int flags, int fibnum) { + INIT_VNET_NET(curvnet); struct sockaddr *dst; struct sockaddr *netmask; struct rtentry *rt = NULL; ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#8 (text+ko) ==== @@ -314,6 +314,7 @@ route_output(struct mbuf *m, struct socket *so) { #define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) + INIT_VNET_NET(so->so_vnet); struct rt_msghdr *rtm = NULL; struct rtentry *rt = NULL; struct radix_node_head *rnh; @@ -1075,6 +1076,7 @@ static void rt_dispatch(struct mbuf *m, const struct sockaddr *sa) { + INIT_VNET_NET(curvnet); struct m_tag *tag; /* @@ -1138,6 +1140,7 @@ static int sysctl_iflist(int af, struct walkarg *w) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; struct rt_addrinfo info; @@ -1198,6 +1201,7 @@ int sysctl_ifmalist(int af, struct walkarg *w) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifmultiaddr *ifma; struct rt_addrinfo info; @@ -1247,6 +1251,7 @@ static int sysctl_rtsock(SYSCTL_HANDLER_ARGS) { + INIT_VNET_NET(curvnet); int *name = (int *)arg1; u_int namelen = arg2; struct radix_node_head *rnh; ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include - #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#3 (text+ko) ==== @@ -1184,3 +1184,69 @@ #define ng_copy_meta(meta) NULL #endif /* _NETGRAPH_NETGRAPH_H_ */ +/*- + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation + * + * This software was developed by the University of Zagreb and the + * FreeBSD Foundation under sponsorship by the Stichting NLnet and the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _NETGRAPH_VNETGRPAH_H_ +#define _NETGRAPH_VNETGRAPH_H_ + +#include + +#define INIT_VNET_NETGRAPH(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_NETGRAPH, \ + struct vnet_netgraph, vnet_netgraph) + +#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) + +#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */ +#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ + +#ifdef VIMAGE +struct vnet_netgraph { + LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_name_hash[NG_ID_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_nodelist; + ng_ID_t _nextID; + struct unrhdr *_ng_iface_unit; + struct unrhdr *_ng_eiface_unit; + struct unrhdr *_ng_wormhole_unit; +}; +#endif + +/* Symbol translation macros */ +#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) +#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) +#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) +#define V_nextID VNET_NETGRAPH(nextID) +#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) +#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) +#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) + +#endif /* !_NETGRAPH_VNETGRAPH_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#9 (text+ko) ==== @@ -167,7 +167,6 @@ /* Hash related definitions */ /* XXX Don't need to initialise them because it's a LIST */ -#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ static LIST_HEAD(, ng_node) ng_ID_hash[NG_ID_HASH_SIZE]; static struct mtx ng_idhash_mtx; /* Method to find a node.. used twice so do it here */ @@ -612,6 +611,7 @@ int ng_make_node_common(struct ng_type *type, node_p *nodepp) { + INIT_VNET_NETGRAPH(curvnet); node_p node; /* Require the node type to have been already installed */ @@ -793,6 +793,7 @@ static node_p ng_ID2noderef(ng_ID_t ID) { + INIT_VNET_NETGRAPH(curvnet); node_p node; mtx_lock(&ng_idhash_mtx); NG_IDHASH_FIND(ID, node); @@ -818,6 +819,7 @@ int ng_name_node(node_p node, const char *name) { + INIT_VNET_NETGRAPH(curvnet); int i, hash; node_p node2; @@ -868,6 +870,7 @@ node_p ng_name2noderef(node_p here, const char *name) { + INIT_VNET_NETGRAPH(curvnet); node_p node; ng_ID_t temp; int hash; @@ -2416,6 +2419,7 @@ static int ng_generic_msg(node_p here, item_p item, hook_p lasthook) { + INIT_VNET_NETGRAPH(curvnet); int error = 0; struct ng_mesg *msg; struct ng_mesg *resp = NULL; ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#7 (text+ko) ==== @@ -333,6 +333,7 @@ static int ng_eiface_constructor(node_p node) { + INIT_VNET_NETGRAPH(curvnet); struct ifnet *ifp; priv_p priv; u_char eaddr[6] = {0,0,0,0,0,0}; @@ -545,11 +546,14 @@ static int ng_eiface_rmnode(node_p node) { + INIT_VNET_NETGRAPH(curvnet); const priv_p priv = NG_NODE_PRIVATE(node); struct ifnet *const ifp = priv->ifp; + CURVNET_SET_QUIET(ifp->if_vnet); ether_ifdetach(ifp); if_free(ifp); + CURVNET_RESTORE(); free_unr(V_ng_eiface_unit, priv->unit); FREE(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#7 (text+ko) ==== @@ -506,6 +506,7 @@ static int ng_iface_constructor(node_p node) { + INIT_VNET_NETGRAPH(curvnet); struct ifnet *ifp; priv_p priv; @@ -766,11 +767,14 @@ static int ng_iface_shutdown(node_p node) { + INIT_VNET_NETGRAPH(curvnet); const priv_p priv = NG_NODE_PRIVATE(node); + CURVNET_SET_QUIET(priv->ifp->if_vnet); bpfdetach(priv->ifp); if_detach(priv->ifp); if_free(priv->ifp); + CURVNET_RESTORE(); priv->ifp = NULL; free_unr(V_ng_iface_unit, priv->unit); FREE(priv, M_NETGRAPH_IFACE); ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#9 (text+ko) ==== @@ -149,6 +149,8 @@ static void arp_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info) { + INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); struct sockaddr *gate; struct llinfo_arp *la; static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; @@ -360,6 +362,7 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, struct sockaddr *dst, u_char *desten) { + INIT_VNET_INET(ifp->if_vnet); struct llinfo_arp *la = NULL; struct rtentry *rt = NULL; struct sockaddr_dl *sdl; @@ -603,7 +606,8 @@ sin.sin_len = sizeof(struct sockaddr_in); sin.sin_family = AF_INET; sin.sin_addr.s_addr = 0; - + INIT_VNET_INET(ifp->if_vnet); + if (ifp->if_bridge) bridged = 1; if (ifp->if_type == IFT_BRIDGE) ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#6 (text+ko) ==== @@ -145,6 +145,7 @@ static struct router_info * find_rti(struct ifnet *ifp) { + INIT_VNET_INET(ifp->if_vnet); struct router_info *rti; mtx_assert(&igmp_mtx, MA_OWNED); @@ -183,6 +184,7 @@ struct in_multistep step; struct router_info *rti; int timer; /** timer value in the igmp query header **/ + INIT_VNET_INET(ifp->if_vnet); ++V_igmpstat.igps_rcv_total; @@ -445,6 +447,7 @@ IGMP_PRINTF("[igmp.c,_slowtimo] -- > entering \n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 24 23:21:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90394106567E; Sun, 24 Aug 2008 23:21: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 548B81065671 for ; Sun, 24 Aug 2008 23:21:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45BA28FC08 for ; Sun, 24 Aug 2008 23:21:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ONLEw3081699 for ; Sun, 24 Aug 2008 23:21:14 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ONLElw081697 for perforce@freebsd.org; Sun, 24 Aug 2008 23:21:14 GMT (envelope-from julian@freebsd.org) Date: Sun, 24 Aug 2008 23:21:14 GMT Message-Id: <200808242321.m7ONLElw081697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148304 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, 24 Aug 2008 23:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148304 Change 148304 by julian@julian_trafmon1 on 2008/08/24 23:21:02 commit2 and commit3 are now the same. Affected files ... .. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#8 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/sys/vimage.h#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 25 00:23:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CADE1065679; Mon, 25 Aug 2008 00:23:17 +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 18866106566B for ; Mon, 25 Aug 2008 00:23:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23D208FC12 for ; Mon, 25 Aug 2008 00:23:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P0NGWt088006 for ; Mon, 25 Aug 2008 00:23:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P0NGmC088004 for perforce@freebsd.org; Mon, 25 Aug 2008 00:23:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 00:23:16 GMT Message-Id: <200808250023.m7P0NGmC088004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148306 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, 25 Aug 2008 00:23:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=148306 Change 148306 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 00:22:52 Teach the audit subsystem about capability rights masks, which are encoded as a 64-bit argument token. Audit various capability system calls. Audit fexecve(2) (to merge to SVN). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_arg.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_private.h#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#19 (text+ko) ==== @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#18 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#19 $"); #include #include @@ -65,6 +65,8 @@ #include #include +#include + #include #ifdef CAPABILITIES @@ -228,6 +230,8 @@ struct file *fp, *fp_cap, *fp_object; int error, fd_cap; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(rights, uap->rights); if ((uap->rights | CAP_MASK_VALID) != CAP_MASK_VALID) return (EINVAL); @@ -309,6 +313,7 @@ struct file *fp; int error; + AUDIT_ARG(fd, uap->fd); error = fgetcap(td, uap->fd, &fp); if (error) return (error); ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit.h#4 (text) ==== @@ -114,6 +114,7 @@ #define ARG_IOVECSTR 0x0000800000000000ULL #define ARG_ARGV 0x0001000000000000ULL #define ARG_ENVV 0x0002000000000000ULL +#define ARG_RIGHTS 0x0004000000000000ULL #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL @@ -171,6 +172,7 @@ void audit_arg_file(struct proc *p, struct file *fp); void audit_arg_argv(char *argv, int argc, int length); void audit_arg_envv(char *envv, int envc, int length); +void audit_arg_rights(cap_rights_t rights); void audit_sysclose(struct thread *td, int fd); void audit_cred_copy(struct ucred *src, struct ucred *dest); void audit_cred_destroy(struct ucred *cred); ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_arg.c#5 (text) ==== @@ -823,6 +823,19 @@ ARG_SET_VALID(ar, ARG_ENVV); } +void +audit_arg_rights(cap_rights_t rights) +{ + struct kaudit_record *ar; + + ar = currecord(); + if (ar == NULL) + return; + + ar->k_ar.ar_arg_rights = rights; + ARG_SET_VALID(ar, ARG_RIGHTS); +} + /* * The close() system call uses it's own audit call to capture the path/vnode * information because those pieces are not easily obtained within the system ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#4 (text) ==== @@ -762,6 +762,7 @@ EXTATTR_TOKENS; break; + case AUE_FEXECVE: case AUE_EXECVE: if (ARG_IS_VALID(kar, ARG_ARGV)) { tok = au_to_exec_args(ar->ar_arg_argv, @@ -1416,6 +1417,28 @@ } break; + case AUE_CAP_NEW: + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_RIGHTS)) { + tok = au_to_arg64(2, "rights", ar->ar_arg_rights); + kau_write(rec, tok); + } + break; + + case AUE_CAP_GETRIGHTS: + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } + break; + + case AUE_CAP_ENTER: + case AUE_CAP_GETMODE: + break; + case AUE_NULL: default: printf("BSM conversion requested for unknown event %d\n", ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_private.h#5 (text) ==== @@ -209,6 +209,7 @@ int ar_arg_exitstatus; int ar_arg_exitretval; struct sockaddr_storage ar_arg_sockaddr; + cap_rights_t ar_arg_rights; }; /* From owner-p4-projects@FreeBSD.ORG Mon Aug 25 00:44:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DED81065678; Mon, 25 Aug 2008 00:44: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 11C7B1065676 for ; Mon, 25 Aug 2008 00:44:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1EED48FC14 for ; Mon, 25 Aug 2008 00:44:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P0icb9089881 for ; Mon, 25 Aug 2008 00:44:38 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P0ic7O089879 for perforce@freebsd.org; Mon, 25 Aug 2008 00:44:38 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 00:44:38 GMT Message-Id: <200808250044.m7P0ic7O089879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148309 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, 25 Aug 2008 00:44:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=148309 Change 148309 by julian@julian_trafmon1 on 2008/08/25 00:44:02 loop back sysncach change we already have (and catch if_wpi.c while here) Affected files ... .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#15 integrate Differences ... ==== //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#7 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071127" #include -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.16 2008/06/23 15:40:56 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.17 2008/08/24 22:42:39 benjsc Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -148,10 +148,10 @@ { 0x8086, 0x4222, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, { 0x8086, 0x4227, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, /* The below entries only support BG */ - { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1014, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945AB" }, + { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4227, 0x1014, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945BG" }, { 0, 0, 0, NULL } }; ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#37 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.154 2008/08/23 14:22:12 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.155 2008/08/25 00:33:30 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.3 2008/07/21 02:11:06 kmacy Exp $ + * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.4 2008/08/25 00:33:30 julian Exp $ */ #ifndef _NETINET_TCP_SYNCACHE_H_ @@ -61,8 +61,7 @@ struct syncache { TAILQ_ENTRY(syncache) sc_hash; struct in_conninfo sc_inc; /* addresses */ - u_long sc_rxttime; /* retransmit time */ - u_int16_t sc_flags; + int sc_rxttime; /* retransmit time */ u_int16_t sc_rxmits; /* retransmit counter */ u_int32_t sc_tsreflect; /* timestamp to reflect */ @@ -79,6 +78,7 @@ u_int8_t sc_ip_tos; /* IPv4 TOS */ u_int8_t sc_requested_s_scale:4, sc_requested_r_scale:4; + u_int16_t sc_flags; #define SCF_NOOPT 0x01 /* no TCP options */ #define SCF_WINSCALE 0x02 /* negotiated window scaling */ #define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ @@ -86,24 +86,23 @@ #define SCF_UNREACH 0x10 /* icmp unreachable received */ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ -#define SCF_ECN 0x100 /* ECN enabled */ +#define SCF_ECN 0x100 /* send ECN setup packet */ #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ - void *sc_toepcb; /* TOE protocol block */ -#endif + void *sc_toepcb; /* TOE protocol block */ +#endif #ifdef MAC struct label *sc_label; /* MAC label reference */ #endif struct ucred *sc_cred; /* cred cache for jail checks */ }; -#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ -#define SYNCOOKIE_LIFETIME 16 /* seconds */ +#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ +#define SYNCOOKIE_LIFETIME 16 /* seconds */ struct syncache_head { struct mtx sch_mtx; TAILQ_HEAD(sch_head, syncache) sch_bucket; - struct vnet *sch_vnet; struct callout sch_timer; int sch_nextc; u_int sch_length; @@ -126,4 +125,4 @@ }; #endif /* _KERNEL */ -#endif /* !_NETINET_TCP_SYNCACHE_H_ */ +#endif /* _NETINET_TCP_SYNCACHE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 00:46:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C8E61065679; Mon, 25 Aug 2008 00:46:41 +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 40DE4106566B for ; Mon, 25 Aug 2008 00:46:41 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E2EE8FC13 for ; Mon, 25 Aug 2008 00:46:41 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P0kfaN090073 for ; Mon, 25 Aug 2008 00:46:41 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P0kfpP090071 for perforce@freebsd.org; Mon, 25 Aug 2008 00:46:41 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 00:46:41 GMT Message-Id: <200808250046.m7P0kfpP090071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148310 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, 25 Aug 2008 00:46:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=148310 Change 148310 by julian@julian_trafmon1 on 2008/08/25 00:46:06 diff reduction Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#3 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071127" #include -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.16 2008/06/23 15:40:56 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.17 2008/08/24 22:42:39 benjsc Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -148,10 +148,10 @@ { 0x8086, 0x4222, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, { 0x8086, 0x4227, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, /* The below entries only support BG */ - { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1014, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945AB" }, + { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4227, 0x1014, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945BG" }, { 0, 0, 0, NULL } }; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.154 2008/08/23 14:22:12 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.155 2008/08/25 00:33:30 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -108,67 +108,12 @@ &tcp_syncookiesonly, 0, "Use only TCP SYN cookies"); -#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ -#define SYNCOOKIE_LIFETIME 16 /* seconds */ - -struct syncache { - TAILQ_ENTRY(syncache) sc_hash; - struct in_conninfo sc_inc; /* addresses */ - int sc_rxttime; /* retransmit time */ - u_int16_t sc_rxmits; /* retransmit counter */ - - u_int32_t sc_tsreflect; /* timestamp to reflect */ - u_int32_t sc_ts; /* our timestamp to send */ - u_int32_t sc_tsoff; /* ts offset w/ syncookies */ - u_int32_t sc_flowlabel; /* IPv6 flowlabel */ - tcp_seq sc_irs; /* seq from peer */ - tcp_seq sc_iss; /* our ISS */ - struct mbuf *sc_ipopts; /* source route */ - - u_int16_t sc_peer_mss; /* peer's MSS */ - u_int16_t sc_wnd; /* advertised window */ - u_int8_t sc_ip_ttl; /* IPv4 TTL */ - u_int8_t sc_ip_tos; /* IPv4 TOS */ - u_int8_t sc_requested_s_scale:4, - sc_requested_r_scale:4; - u_int16_t sc_flags; -#define SCF_NOOPT 0x01 /* no TCP options */ -#define SCF_WINSCALE 0x02 /* negotiated window scaling */ -#define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ - /* MSS is implicit */ -#define SCF_UNREACH 0x10 /* icmp unreachable received */ -#define SCF_SIGNATURE 0x20 /* send MD5 digests */ -#define SCF_SACK 0x80 /* send SACK option */ -#define SCF_ECN 0x100 /* send ECN setup packet */ -#ifndef TCP_OFFLOAD_DISABLE - struct toe_usrreqs *sc_tu; /* TOE operations */ - void *sc_toepcb; /* TOE protocol block */ -#endif -#ifdef MAC - struct label *sc_label; /* MAC label reference */ -#endif - struct ucred *sc_cred; /* cred cache for jail checks */ -}; - #ifdef TCP_OFFLOAD_DISABLE #define TOEPCB_ISSET(sc) (0) #else #define TOEPCB_ISSET(sc) ((sc)->sc_toepcb != NULL) #endif - -struct syncache_head { - struct mtx sch_mtx; - TAILQ_HEAD(sch_head, syncache) sch_bucket; - struct callout sch_timer; - int sch_nextc; - u_int sch_length; - u_int sch_oddeven; - u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; - u_int32_t sch_secbits_even[SYNCOOKIE_SECRET_SIZE]; - u_int sch_reseed; /* time_uptime, seconds */ -}; - static void syncache_drop(struct syncache *, struct syncache_head *); static void syncache_free(struct syncache *); static void syncache_insert(struct syncache *, struct syncache_head *); @@ -197,17 +142,6 @@ #define TCP_SYNCACHE_HASHSIZE 512 #define TCP_SYNCACHE_BUCKETLIMIT 30 -struct tcp_syncache { - struct syncache_head *hashbase; - uma_zone_t zone; - u_int hashsize; - u_int hashmask; - u_int bucket_limit; - u_int cache_count; /* XXX: unprotected */ - u_int cache_limit; - u_int rexmt_limit; - u_int hash_secret; -}; static struct tcp_syncache tcp_syncache; SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN cache"); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.3 2008/07/21 02:11:06 kmacy Exp $ + * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.4 2008/08/25 00:33:30 julian Exp $ */ #ifndef _NETINET_TCP_SYNCACHE_H_ @@ -51,5 +51,71 @@ int syncache_pcbcount(void); int syncache_pcblist(struct sysctl_req *req, int max_pcbs, int *pcbs_exported); +struct syncache { + TAILQ_ENTRY(syncache) sc_hash; + struct in_conninfo sc_inc; /* addresses */ + int sc_rxttime; /* retransmit time */ + u_int16_t sc_rxmits; /* retransmit counter */ + + u_int32_t sc_tsreflect; /* timestamp to reflect */ + u_int32_t sc_ts; /* our timestamp to send */ + u_int32_t sc_tsoff; /* ts offset w/ syncookies */ + u_int32_t sc_flowlabel; /* IPv6 flowlabel */ + tcp_seq sc_irs; /* seq from peer */ + tcp_seq sc_iss; /* our ISS */ + struct mbuf *sc_ipopts; /* source route */ + + u_int16_t sc_peer_mss; /* peer's MSS */ + u_int16_t sc_wnd; /* advertised window */ + u_int8_t sc_ip_ttl; /* IPv4 TTL */ + u_int8_t sc_ip_tos; /* IPv4 TOS */ + u_int8_t sc_requested_s_scale:4, + sc_requested_r_scale:4; + u_int16_t sc_flags; +#define SCF_NOOPT 0x01 /* no TCP options */ +#define SCF_WINSCALE 0x02 /* negotiated window scaling */ +#define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ + /* MSS is implicit */ +#define SCF_UNREACH 0x10 /* icmp unreachable received */ +#define SCF_SIGNATURE 0x20 /* send MD5 digests */ +#define SCF_SACK 0x80 /* send SACK option */ +#define SCF_ECN 0x100 /* send ECN setup packet */ +#ifndef TCP_OFFLOAD_DISABLE + struct toe_usrreqs *sc_tu; /* TOE operations */ + void *sc_toepcb; /* TOE protocol block */ +#endif +#ifdef MAC + struct label *sc_label; /* MAC label reference */ +#endif + struct ucred *sc_cred; /* cred cache for jail checks */ +}; + +#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ +#define SYNCOOKIE_LIFETIME 16 /* seconds */ + +struct syncache_head { + struct mtx sch_mtx; + TAILQ_HEAD(sch_head, syncache) sch_bucket; + struct callout sch_timer; + int sch_nextc; + u_int sch_length; + u_int sch_oddeven; + u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; + u_int32_t sch_secbits_even[SYNCOOKIE_SECRET_SIZE]; + u_int sch_reseed; /* time_uptime, seconds */ +}; + +struct tcp_syncache { + struct syncache_head *hashbase; + uma_zone_t zone; + u_int hashsize; + u_int hashmask; + u_int bucket_limit; + u_int cache_count; /* XXX: unprotected */ + u_int cache_limit; + u_int rexmt_limit; + u_int hash_secret; +}; + #endif /* _KERNEL */ -#endif /* _NETINET_TCP_SYNCACHE_H_ */ +#endif /* !_NETINET_TCP_SYNCACHE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 00:48:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04EC81065691; Mon, 25 Aug 2008 00:48: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 BC997106568A for ; Mon, 25 Aug 2008 00:48:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9F028FC0A for ; Mon, 25 Aug 2008 00:48:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P0mhsF099475 for ; Mon, 25 Aug 2008 00:48:43 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P0mhBV099473 for perforce@freebsd.org; Mon, 25 Aug 2008 00:48:43 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 00:48:43 GMT Message-Id: <200808250048.m7P0mhBV099473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148311 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, 25 Aug 2008 00:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=148311 Change 148311 by julian@julian_trafmon1 on 2008/08/25 00:48:28 loop back changes Affected files ... .. //depot/projects/vimage-commit3/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.h#3 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/dev/wpi/if_wpi.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071127" #include -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.16 2008/06/23 15:40:56 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.17 2008/08/24 22:42:39 benjsc Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -148,10 +148,10 @@ { 0x8086, 0x4222, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, { 0x8086, 0x4227, 0x0, "Intel(R) PRO/Wireless 3945ABG" }, /* The below entries only support BG */ - { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1014, "Intel(R) PRO/Wireless 3945AB" }, - { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945AB" }, + { 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4227, 0x1014, "Intel(R) PRO/Wireless 3945BG" }, + { 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945BG" }, { 0, 0, 0, NULL } }; ==== //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.154 2008/08/23 14:22:12 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.155 2008/08/25 00:33:30 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -108,67 +108,12 @@ &tcp_syncookiesonly, 0, "Use only TCP SYN cookies"); -#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ -#define SYNCOOKIE_LIFETIME 16 /* seconds */ - -struct syncache { - TAILQ_ENTRY(syncache) sc_hash; - struct in_conninfo sc_inc; /* addresses */ - int sc_rxttime; /* retransmit time */ - u_int16_t sc_rxmits; /* retransmit counter */ - - u_int32_t sc_tsreflect; /* timestamp to reflect */ - u_int32_t sc_ts; /* our timestamp to send */ - u_int32_t sc_tsoff; /* ts offset w/ syncookies */ - u_int32_t sc_flowlabel; /* IPv6 flowlabel */ - tcp_seq sc_irs; /* seq from peer */ - tcp_seq sc_iss; /* our ISS */ - struct mbuf *sc_ipopts; /* source route */ - - u_int16_t sc_peer_mss; /* peer's MSS */ - u_int16_t sc_wnd; /* advertised window */ - u_int8_t sc_ip_ttl; /* IPv4 TTL */ - u_int8_t sc_ip_tos; /* IPv4 TOS */ - u_int8_t sc_requested_s_scale:4, - sc_requested_r_scale:4; - u_int16_t sc_flags; -#define SCF_NOOPT 0x01 /* no TCP options */ -#define SCF_WINSCALE 0x02 /* negotiated window scaling */ -#define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ - /* MSS is implicit */ -#define SCF_UNREACH 0x10 /* icmp unreachable received */ -#define SCF_SIGNATURE 0x20 /* send MD5 digests */ -#define SCF_SACK 0x80 /* send SACK option */ -#define SCF_ECN 0x100 /* send ECN setup packet */ -#ifndef TCP_OFFLOAD_DISABLE - struct toe_usrreqs *sc_tu; /* TOE operations */ - void *sc_toepcb; /* TOE protocol block */ -#endif -#ifdef MAC - struct label *sc_label; /* MAC label reference */ -#endif - struct ucred *sc_cred; /* cred cache for jail checks */ -}; - #ifdef TCP_OFFLOAD_DISABLE #define TOEPCB_ISSET(sc) (0) #else #define TOEPCB_ISSET(sc) ((sc)->sc_toepcb != NULL) #endif - -struct syncache_head { - struct mtx sch_mtx; - TAILQ_HEAD(sch_head, syncache) sch_bucket; - struct callout sch_timer; - int sch_nextc; - u_int sch_length; - u_int sch_oddeven; - u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; - u_int32_t sch_secbits_even[SYNCOOKIE_SECRET_SIZE]; - u_int sch_reseed; /* time_uptime, seconds */ -}; - static void syncache_drop(struct syncache *, struct syncache_head *); static void syncache_free(struct syncache *); static void syncache_insert(struct syncache *, struct syncache_head *); @@ -197,17 +142,6 @@ #define TCP_SYNCACHE_HASHSIZE 512 #define TCP_SYNCACHE_BUCKETLIMIT 30 -struct tcp_syncache { - struct syncache_head *hashbase; - uma_zone_t zone; - u_int hashsize; - u_int hashmask; - u_int bucket_limit; - u_int cache_count; /* XXX: unprotected */ - u_int cache_limit; - u_int rexmt_limit; - u_int hash_secret; -}; static struct tcp_syncache tcp_syncache; SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN cache"); ==== //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.3 2008/07/21 02:11:06 kmacy Exp $ + * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.4 2008/08/25 00:33:30 julian Exp $ */ #ifndef _NETINET_TCP_SYNCACHE_H_ @@ -51,5 +51,71 @@ int syncache_pcbcount(void); int syncache_pcblist(struct sysctl_req *req, int max_pcbs, int *pcbs_exported); +struct syncache { + TAILQ_ENTRY(syncache) sc_hash; + struct in_conninfo sc_inc; /* addresses */ + int sc_rxttime; /* retransmit time */ + u_int16_t sc_rxmits; /* retransmit counter */ + + u_int32_t sc_tsreflect; /* timestamp to reflect */ + u_int32_t sc_ts; /* our timestamp to send */ + u_int32_t sc_tsoff; /* ts offset w/ syncookies */ + u_int32_t sc_flowlabel; /* IPv6 flowlabel */ + tcp_seq sc_irs; /* seq from peer */ + tcp_seq sc_iss; /* our ISS */ + struct mbuf *sc_ipopts; /* source route */ + + u_int16_t sc_peer_mss; /* peer's MSS */ + u_int16_t sc_wnd; /* advertised window */ + u_int8_t sc_ip_ttl; /* IPv4 TTL */ + u_int8_t sc_ip_tos; /* IPv4 TOS */ + u_int8_t sc_requested_s_scale:4, + sc_requested_r_scale:4; + u_int16_t sc_flags; +#define SCF_NOOPT 0x01 /* no TCP options */ +#define SCF_WINSCALE 0x02 /* negotiated window scaling */ +#define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ + /* MSS is implicit */ +#define SCF_UNREACH 0x10 /* icmp unreachable received */ +#define SCF_SIGNATURE 0x20 /* send MD5 digests */ +#define SCF_SACK 0x80 /* send SACK option */ +#define SCF_ECN 0x100 /* send ECN setup packet */ +#ifndef TCP_OFFLOAD_DISABLE + struct toe_usrreqs *sc_tu; /* TOE operations */ + void *sc_toepcb; /* TOE protocol block */ +#endif +#ifdef MAC + struct label *sc_label; /* MAC label reference */ +#endif + struct ucred *sc_cred; /* cred cache for jail checks */ +}; + +#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ +#define SYNCOOKIE_LIFETIME 16 /* seconds */ + +struct syncache_head { + struct mtx sch_mtx; + TAILQ_HEAD(sch_head, syncache) sch_bucket; + struct callout sch_timer; + int sch_nextc; + u_int sch_length; + u_int sch_oddeven; + u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; + u_int32_t sch_secbits_even[SYNCOOKIE_SECRET_SIZE]; + u_int sch_reseed; /* time_uptime, seconds */ +}; + +struct tcp_syncache { + struct syncache_head *hashbase; + uma_zone_t zone; + u_int hashsize; + u_int hashmask; + u_int bucket_limit; + u_int cache_count; /* XXX: unprotected */ + u_int cache_limit; + u_int rexmt_limit; + u_int hash_secret; +}; + #endif /* _KERNEL */ -#endif /* _NETINET_TCP_SYNCACHE_H_ */ +#endif /* !_NETINET_TCP_SYNCACHE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 01:06:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60711106567D; Mon, 25 Aug 2008 01:06: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 245A01065675 for ; Mon, 25 Aug 2008 01:06:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30E658FC15 for ; Mon, 25 Aug 2008 01:06:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P1607R002155 for ; Mon, 25 Aug 2008 01:06:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P160v8002153 for perforce@freebsd.org; Mon, 25 Aug 2008 01:06:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 01:06:00 GMT Message-Id: <200808250106.m7P160v8002153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148312 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, 25 Aug 2008 01:06:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=148312 Change 148312 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 01:05:56 For AUE_FEXECVE, audit file descriptor and vnode information. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#13 (text+ko) ==== @@ -426,12 +426,14 @@ imgp->vp = binvp; } else { /* XXXRW: Possibly should just be CAP_FEXECVE? */ + AUDIT_ARG(fd, args->fd); error = fgetvp_read(td, args->fd, CAP_READ | CAP_FEXECVE, &binvp); if (error) goto exec_fail; vfslocked = VFS_LOCK_GIANT(binvp->v_mount); vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY); + AUDIT_ARG(vnode, binvp, ARG_VNODE1); imgp->vp = binvp; } ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#5 (text) ==== @@ -763,6 +763,11 @@ break; case AUE_FEXECVE: + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(1, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } + case AUE_EXECVE: if (ARG_IS_VALID(kar, ARG_ARGV)) { tok = au_to_exec_args(ar->ar_arg_argv, From owner-p4-projects@FreeBSD.ORG Mon Aug 25 01:10:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3EE41065689; Mon, 25 Aug 2008 01:10: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 799B21065683 for ; Mon, 25 Aug 2008 01:10:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C4918FC16 for ; Mon, 25 Aug 2008 01:10:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P1A50f002453 for ; Mon, 25 Aug 2008 01:10:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P1A5ob002451 for perforce@freebsd.org; Mon, 25 Aug 2008 01:10:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 01:10:05 GMT Message-Id: <200808250110.m7P1A5ob002451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148313 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, 25 Aug 2008 01:10:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=148313 Change 148313 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 01:09:33 Capability system calls now audited. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#7 (text+ko) ==== @@ -47,5 +47,3 @@ maxprot. - MAC control of capability facility. - -- Audit for capability facility. From owner-p4-projects@FreeBSD.ORG Mon Aug 25 01:45:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E45E41065679; Mon, 25 Aug 2008 01:45:41 +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 A8837106564A for ; Mon, 25 Aug 2008 01:45:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B619B8FC15 for ; Mon, 25 Aug 2008 01:45:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P1jf7a007756 for ; Mon, 25 Aug 2008 01:45:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P1jfSs007754 for perforce@freebsd.org; Mon, 25 Aug 2008 01:45:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 01:45:41 GMT Message-Id: <200808250145.m7P1jfSs007754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148315 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, 25 Aug 2008 01:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=148315 Change 148315 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 01:45:26 Audit extended file descriptor information for cap_new(2) so that we see information on the underlying object a capability is created for in the audit trail. Right now the utility functions in audit_bsm.c doesn't properly capture all of this in the BSM trail, which needs to be fixed. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#20 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#20 (text+ko) ==== @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#19 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#20 $"); #include #include @@ -246,6 +246,8 @@ if (error) goto fail; + AUDIT_ARG(file, td->td_proc, fp); + /* * If a new capability is being derived from an existing capability, * then the new capability rights must be a subset of the existing ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm.c#6 (text) ==== @@ -1423,10 +1423,10 @@ break; case AUE_CAP_NEW: - if (ARG_IS_VALID(kar, ARG_FD)) { - tok = au_to_arg32(1, "fd", ar->ar_arg_fd); - kau_write(rec, tok); - } + /* + * XXXRW: Would be nice to audit socket/etc information also. + */ + FD_VNODE1_TOKENS; if (ARG_IS_VALID(kar, ARG_RIGHTS)) { tok = au_to_arg64(2, "rights", ar->ar_arg_rights); kau_write(rec, tok); From owner-p4-projects@FreeBSD.ORG Mon Aug 25 04:35:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C24D4106567B; Mon, 25 Aug 2008 04:35: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 84D141065677 for ; Mon, 25 Aug 2008 04:35:35 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8EB938FC14 for ; Mon, 25 Aug 2008 04:35:35 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P4ZZab028123 for ; Mon, 25 Aug 2008 04:35:35 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P4ZYtj028121 for perforce@freebsd.org; Mon, 25 Aug 2008 04:35:34 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 04:35:34 GMT Message-Id: <200808250435.m7P4ZYtj028121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148324 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, 25 Aug 2008 04:35:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=148324 Change 148324 by julian@julian_trafmon1 on 2008/08/25 04:35:14 IFC@148308 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#8 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#12 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#7 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#9 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/vimage-commit/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/vimage-commit/src/sys/isa/isavar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/init_main.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/vimage-commit/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#9 integrate .. //depot/projects/vimage-commit/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#6 integrate .. //depot/projects/vimage-commit/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/conf.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/copyright.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/file.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/kernel.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/linedisc.h#2 delete .. //depot/projects/vimage-commit/src/sys/sys/param.h#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/proc.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/resource.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/syscall.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/termios.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/tty.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/ttycom.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/user.h#3 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_xs.c#3 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,7 @@ device random # Entropy device device ether # Ethernet support device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) +device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) ==== //depot/projects/vimage-commit/src/sys/amd64/include/pci_cfgreg.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/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ * */ @@ -37,6 +37,7 @@ #define CONF1_ENABLE_MSK1 0x80000001ul #define CONF1_ENABLE_RES1 0x80000000ul +int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); ==== //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); #include #include @@ -36,11 +36,26 @@ #include #include #include +#include +#include #include +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_PCIE, +}; + +static int pciereg_cfgread(int bus, unsigned slot, unsigned func, + unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +static int cfgmech; +static vm_offset_t pcie_base; +static int pcie_minbus, pcie_maxbus; static struct mtx pcicfg_mtx; /* @@ -49,12 +64,42 @@ int pci_cfgregopen(void) { - static int opened = 0; + uint64_t pciebar; + uint16_t did, vid; - if (opened) + if (cfgmech != CFGMECH_NONE) return (1); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); - opened = 1; + cfgmech = CFGMECH_1; + + /* + * Grope around in the PCI config space to see if this is a + * chipset that is capable of doing memory-mapped config cycles. + * This also implies that it can do PCIe extended config cycles. + */ + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + return (1); } @@ -130,6 +175,11 @@ int data = -1; int port; + if (cfgmech == CFGMECH_PCIE) { + data = pciereg_cfgread(bus, slot, func, reg, bytes); + return (data); + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -155,6 +205,11 @@ { int port; + if (cfgmech == CFGMECH_PCIE) { + pciereg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -173,3 +228,82 @@ } mtx_unlock_spin(&pcicfg_mtx); } + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (minbus != 0) + return (0); + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", + base); + + /* XXX: We should make sure this really fits into the direct map. */ + pcie_base = (vm_offset_t)pmap_mapdev(base, (maxbus + 1) << 20); + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + return (1); +} + +#define PCIE_VADDR(base, reg, bus, slot, func) \ + ((base) + \ + ((((bus) & 0xff) << 20) | \ + (((slot) & 0x1f) << 15) | \ + (((func) & 0x7) << 12) | \ + ((reg) & 0xfff))) + +static int +pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, + unsigned bytes) +{ + volatile vm_offset_t va; + int data = -1; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return (-1); + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + data = *(volatile uint32_t *)(va); + break; + case 2: + data = *(volatile uint16_t *)(va); + break; + case 1: + data = *(volatile uint8_t *)(va); + break; + } + + return (data); +} + +static void +pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes) +{ + volatile vm_offset_t va; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return; + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + *(volatile uint32_t *)(va) = data; + break; + case 2: + *(volatile uint16_t *)(va) = data; + break; + case 1: + *(volatile uint8_t *)(va) = data; + break; + } +} ==== //depot/projects/vimage-commit/src/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $ */ #ifndef _ENDIAN_H_ @@ -94,7 +94,7 @@ : "+r" (v), "=r" (t1)); return (v); - } +} static __inline __uint16_t __bswap16_var(__uint16_t v) ==== //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -8,7 +8,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -28,7 +29,6 @@ #include #include -#include #include #include #include @@ -438,7 +438,7 @@ while (len) { if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 || itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) { - /* Allocate a physical page, claim the virtual area */ + /* Allocate a physical page, claim the virtual area. */ if (pa == (vm_offset_t)-1) { pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M); if (pa == (vm_offset_t)-1) @@ -448,7 +448,9 @@ panic("%s: can't claim virtual page " "(wanted %#lx, got %#lx)", __func__, va, mva); - /* The mappings may have changed, be paranoid. */ + /* + * The mappings may have changed, be paranoid. + */ continue; } /* @@ -553,6 +555,7 @@ } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); + if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max, sizeof(dtlb_slot_max)) == -1 || OF_getprop(child, "#itlb-entries", &itlb_slot_max, @@ -580,7 +583,7 @@ struct devsw **dp; /* - * Tell the Open Firmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the OFW gate. */ OF_init(openfirm); ==== //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#3 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -548,6 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 (text+ko) ==== @@ -382,6 +382,49 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN +#elif defined(__mips__) + +/* + * Define the appropriate "processor characteristics" + */ +#define _STACK_GROWS_DOWNWARD +#define _LONG_LONG_LTOH +#define _BIT_FIELDS_LTOH +#define _IEEE_754 +#define _CHAR_IS_SIGNED +#define _BOOL_ALIGNMENT 1 +#define _CHAR_ALIGNMENT 1 +#define _SHORT_ALIGNMENT 2 +#define _INT_ALIGNMENT 4 +#define _FLOAT_ALIGNMENT 4 +#define _FLOAT_COMPLEX_ALIGNMENT 4 +#define _LONG_ALIGNMENT 4 +#define _LONG_LONG_ALIGNMENT 4 +#define _DOUBLE_ALIGNMENT 4 +#define _DOUBLE_COMPLEX_ALIGNMENT 4 +#define _LONG_DOUBLE_ALIGNMENT 4 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4 +#define _POINTER_ALIGNMENT 4 +#define _MAX_ALIGNMENT 4 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT + +/* + * Define the appropriate "implementation choices". + */ +#define _ILP32 +#if !defined(_I32LPx) && defined(_KERNEL) +#define _I32LPx +#endif +#define _SUNOS_VTOC_16 +#define _DMA_USES_PHYSADDR +#define _FIRMWARE_NEEDS_FDISK +#define _PSM_MODULES +#define _RTC_CONFIG +#define _DONT_USE_1275_GENERIC_NAMES +#define _HAVE_CPUID_INSN + #elif defined(__powerpc__) /* ==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.87 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.85 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define FREEBSD32_SYS_syscall 0 @@ -355,4 +355,5 @@ #define FREEBSD32_SYS_renameat 501 #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 -#define FREEBSD32_SYS_MAXSYSCALL 504 +#define FREEBSD32_SYS_posix_openpt 504 +#define FREEBSD32_SYS_MAXSYSCALL 505 ==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.76 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *freebsd32_syscallnames[] = { @@ -511,4 +511,5 @@ "renameat", /* 501 = renameat */ "symlinkat", /* 502 = symlinkat */ "unlinkat", /* 503 = unlinkat */ + "posix_openpt", /* 504 = posix_openpt */ }; ==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.86 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -542,4 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -31,6 +31,13 @@ ; NOSTD implemented but as a lkm that can be statically ; compiled in; sysent entry will be filled with lkmsys ; so the SYSCALL_MODULE macro works +; NOARGS same as STD except do not create structure in sys/sysproto.h +; NODEF same as STD except only have the entry in the syscall table +; added. Meaning - do do not create structure or function +; prototype in sys/sysproto.h +; NOPROTO same as STD except do not create structure or +; function prototype in sys/sysproto.h. Does add a +; definition to syscall.h besides adding a sysent. ; #ifdef's, etc. may be included, and are copied to the output files. @@ -846,3 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" @@ -296,6 +296,11 @@ unsigned short ws_xpixel, ws_ypixel; }; +struct speedtab { + int sp_speed; /* Speed. */ + int sp_code; /* Code. */ +}; + static struct speedtab sptab[] = { { B0, LINUX_B0 }, { B50, LINUX_B50 }, { B75, LINUX_B75 }, { B110, LINUX_B110 }, @@ -395,7 +400,7 @@ lios->c_oflag |= LINUX_OPOST; if (bios->c_oflag & ONLCR) lios->c_oflag |= LINUX_ONLCR; - if (bios->c_oflag & OXTABS) + if (bios->c_oflag & TAB3) lios->c_oflag |= LINUX_XTABS; lios->c_cflag = bsd_to_linux_speed(bios->c_ispeed, sptab); @@ -537,7 +542,7 @@ if (lios->c_oflag & LINUX_ONLCR) bios->c_oflag |= ONLCR; if (lios->c_oflag & LINUX_XTABS) - bios->c_oflag |= OXTABS; + bios->c_oflag |= TAB3; bios->c_cflag = (lios->c_cflag & LINUX_CSIZE) << 4; if (lios->c_cflag & LINUX_CSTOPB) ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.92 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -109,8 +110,17 @@ if (fp->f_vnode != NULL && fp->f_vnode->v_un.vu_cdev != NULL && linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, - &major, &minor) == 0) + &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); + } else if (fp->f_type == DTYPE_PTS) { + struct tty *tp = fp->f_data; + + /* Convert the numbers for the slave device. */ + if (linux_driver_get_major_minor(tp->t_dev->si_name, + &major, &minor) == 0) { + buf->st_rdev = (major << 8 | minor); + } + } fdrop(fp, td); } ==== //depot/projects/vimage-commit/src/sys/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1503 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1275,11 +1275,7 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -# The `pty' device usually turns out to be ``effectively mandatory'', -# as it is required for `telnetd', `rlogind', `screen', `emacs', and -# `xterm', among others. - -device pty #Pseudo ttys +device pty #BSD-style compatibility pseudo ttys device nmdm #back-to-back tty devices device md #Memory/malloc disk device ccd #Concatenated disk driver @@ -1291,9 +1287,6 @@ # Size of the kernel message buffer. Should be N * pagesize. options MSGBUF_SIZE=40960 -# Maximum size of a tty or pty input buffer. -options TTYHOG=8193 - ##################################################################### # HARDWARE DEVICE CONFIGURATION ==== //depot/projects/vimage-commit/src/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -572,6 +572,7 @@ dev/drm/i915_drv.c optional i915drm dev/drm/i915_irq.c optional i915drm dev/drm/i915_mem.c optional i915drm +dev/drm/i915_suspend.c optional i915drm dev/drm/mach64_dma.c optional mach64drm dev/drm/mach64_drv.c optional mach64drm dev/drm/mach64_irq.c optional mach64drm @@ -1661,12 +1662,14 @@ kern/sysv_shm.c optional sysvshm kern/tty.c standard kern/tty_compat.c optional compat_43tty -kern/tty_conf.c standard kern/tty_cons.c standard kern/tty_info.c standard -kern/tty_pts.c optional pty +kern/tty_inq.c standard +kern/tty_outq.c standard +kern/tty_pts.c standard kern/tty_pty.c optional pty kern/tty_tty.c standard +kern/tty_ttydisc.c standard kern/uipc_accf.c optional inet kern/uipc_cow.c optional zero_copy_sockets kern/uipc_debug.c optional ddb @@ -2354,4 +2357,4 @@ dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen+dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage-commit/src/sys/conf/files.i386#6 (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.604 2008/08/17 23:44:09 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.605 2008/08/23 21:00:40 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -329,6 +329,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 25 04:48:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 592931065679; Mon, 25 Aug 2008 04:48: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 1BE381065672 for ; Mon, 25 Aug 2008 04:48:49 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CB548FC21 for ; Mon, 25 Aug 2008 04:48:49 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P4mm0L038455 for ; Mon, 25 Aug 2008 04:48:48 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P4mmdk038453 for perforce@freebsd.org; Mon, 25 Aug 2008 04:48:48 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 04:48:48 GMT Message-Id: <200808250448.m7P4mmdk038453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148325 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, 25 Aug 2008 04:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=148325 Change 148325 by julian@julian_trafmon1 on 2008/08/25 04:48:32 script to get diff with commit2 Affected files ... .. //depot/projects/vimage-commit/makemeat2.pl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 25 05:11:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 630111065679; Mon, 25 Aug 2008 05:11:13 +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 25C921065675 for ; Mon, 25 Aug 2008 05:11:13 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EC5D8FC14 for ; Mon, 25 Aug 2008 05:11:13 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P5BCvG041636 for ; Mon, 25 Aug 2008 05:11:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P5BCCM041634 for perforce@freebsd.org; Mon, 25 Aug 2008 05:11:12 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 05:11:12 GMT Message-Id: <200808250511.m7P5BCCM041634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148335 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, 25 Aug 2008 05:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=148335 Change 148335 by julian@julian_trafmon1 on 2008/08/25 05:11:03 fix accidental deletion Affected files ... .. //depot/projects/vimage-commit/src/sys/kern/tty.c#8 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/kern/tty.c#8 (text+ko) ==== @@ -1508,6 +1508,8 @@ tty_flush(tp, flags); return (0); } + case TIOCDRAIN: + /* Drain TTY output. */ return tty_drain(tp); case TIOCCONS: /* Set terminal as console TTY. */ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 05:12:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2039106567A; Mon, 25 Aug 2008 05:12: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 A400A1065676 for ; Mon, 25 Aug 2008 05:12: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 AB07D8FC12 for ; Mon, 25 Aug 2008 05:12:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P5CGQ5041702 for ; Mon, 25 Aug 2008 05:12:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P5CEaR041698 for perforce@freebsd.org; Mon, 25 Aug 2008 05:12:14 GMT (envelope-from jb@freebsd.org) Date: Mon, 25 Aug 2008 05:12:14 GMT Message-Id: <200808250512.m7P5CEaR041698@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 148336 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, 25 Aug 2008 05:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=148336 Change 148336 by jb@freebsd3 on 2008/08/25 05:11:14 IF6 Affected files ... .. //depot/projects/dtrace6/src/contrib/openpam/CREDITS#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/HISTORY#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/INSTALL#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/LICENSE#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/MANIFEST#2 delete .. //depot/projects/dtrace6/src/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/README#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/compile#1 branch .. //depot/projects/dtrace6/src/contrib/openpam/config.h.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/configure#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/configure.ac#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/configure.in#2 delete .. //depot/projects/dtrace6/src/contrib/openpam/depcomp#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/dtrace6/src/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/install-sh#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/ltconfig#2 delete .. //depot/projects/dtrace6/src/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/missing#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/dtrace6/src/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/dtrace6/src/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/dtrace6/src/contrib/tcsh/tc.func.c#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/sysctl#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive.h#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/archive.h.in#2 delete .. //depot/projects/dtrace6/src/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/cpio.5#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/tar.5#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/test/Makefile#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/README#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/main.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test.h#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_archive_api_feature.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_bad_fd.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_link_resolver.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_data_large.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_extract.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_bin.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_bin_Z.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_odc.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_empty.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_gz.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_iso_gz.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_isorr_bz2.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_pax_bz2.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_tar.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_tbz.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_tgz.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_tz.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_zip.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_large.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_position.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_read_truncated.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_ustar_filenames.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_disk.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_disk_perms.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_disk_secure.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_cpio_empty.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_shar_empty.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_tar.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_tar_empty.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_format_tar_ustar.c#1 branch .. //depot/projects/dtrace6/src/lib/libarchive/test/test_write_open_memory.c#1 branch .. //depot/projects/dtrace6/src/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/dtrace6/src/lib/libexpat/expat_config.h#2 integrate .. //depot/projects/dtrace6/src/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/dtrace6/src/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/dtrace6/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/dtrace6/src/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/dtrace6/src/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/dtrace6/src/lib/libutil/expand_number.c#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/dtrace6/src/sbin/routed/main.c#2 integrate .. //depot/projects/dtrace6/src/share/colldef/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/colldef/no_NO.ISO8859-1.src#1 branch .. //depot/projects/dtrace6/src/share/colldef/no_NO.ISO8859-15.src#1 branch .. //depot/projects/dtrace6/src/share/man/man4/Makefile#3 integrate .. //depot/projects/dtrace6/src/share/man/man4/altq.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/jme.4#1 branch .. //depot/projects/dtrace6/src/share/man/man4/miibus.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/xl.4#2 integrate .. //depot/projects/dtrace6/src/share/timedef/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/timedef/nb_NO.ISO8859-1.src#1 branch .. //depot/projects/dtrace6/src/share/timedef/nb_NO.UTF-8.src#1 branch .. //depot/projects/dtrace6/src/share/timedef/nn_NO.ISO8859-1.src#1 branch .. //depot/projects/dtrace6/src/share/timedef/nn_NO.UTF-8.src#1 branch .. //depot/projects/dtrace6/src/share/timedef/no_NO.ISO8859-1.src#2 delete .. //depot/projects/dtrace6/src/share/timedef/no_NO.UTF-8.src#2 delete .. //depot/projects/dtrace6/src/share/zoneinfo/Theory#2 delete .. //depot/projects/dtrace6/src/share/zoneinfo/africa#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/asia#5 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/australasia#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/europe#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/northamerica#4 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/southamerica#5 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/dtrace6/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/dtrace6/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/dtrace6/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/dtrace6/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/dtrace6/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/dtrace6/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/dtrace6/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/dtrace6/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/dtrace6/src/sys/conf/NOTES#5 integrate .. //depot/projects/dtrace6/src/sys/conf/files#8 integrate .. //depot/projects/dtrace6/src/sys/conf/files.amd64#7 integrate .. //depot/projects/dtrace6/src/sys/conf/files.i386#7 integrate .. //depot/projects/dtrace6/src/sys/conf/options.sparc64#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/dtrace6/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/jme/if_jme.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/jme/if_jmereg.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/jme/if_jmevar.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/jmphy.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/mii/jmphyreg.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/dtrace6/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/dtrace6/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/dtrace6/src/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/dtrace6/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/dtrace6/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/dtrace6/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/dtrace6/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/dtrace6/src/sys/modules/Makefile#9 integrate .. //depot/projects/dtrace6/src/sys/modules/jme/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/dtrace6/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/net/bpf.c#5 integrate .. //depot/projects/dtrace6/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/dtrace6/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/dtrace6/src/sys/net/if.h#2 integrate .. //depot/projects/dtrace6/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/dtrace6/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/dtrace6/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/dtrace6/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/dtrace6/src/sys/netinet/in.c#3 integrate .. //depot/projects/dtrace6/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/dtrace6/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/dtrace6/src/sys/pci/if_sis.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/in_cksum.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/dtrace6/src/sys/sys/copyright.h#3 integrate .. //depot/projects/dtrace6/src/sys/sys/malloc.h#3 integrate .. //depot/projects/dtrace6/src/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/dtrace6/src/sys/sys/sockio.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/sx.h#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/dtrace6/src/sys/vm/memguard.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/memguard.h#2 integrate .. //depot/projects/dtrace6/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/dtrace6/src/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/dtrace6/src/tools/regression/usr.bin/Makefile#2 integrate .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/Makefile#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/calendar.calibrate#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.a1.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.a2.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.a3.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.a4.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.a5.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.b1.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.b2.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.b3.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.b4.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.b5.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.s1.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.s2.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.s3.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.s4.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.sh#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.t#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-1.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-2.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-3.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-4.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-5.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-6.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.w0-7.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-1.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-2.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-3.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-4.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-5.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-6.out#1 branch .. //depot/projects/dtrace6/src/tools/regression/usr.bin/calendar/regress.wn-7.out#1 branch .. //depot/projects/dtrace6/src/usr.bin/calendar/calendar.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/dtrace6/src/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/dtrace6/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/calendar/io.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/calendar/ostern.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/calendar/paskha.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/dtrace6/src/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/gzip/unbzip2.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/gzip/znew#2 integrate .. //depot/projects/dtrace6/src/usr.bin/ipcs/ipc.c#2 integrate .. //depot/projects/dtrace6/src/usr.bin/ldd/ldd.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/netstat/route.c#4 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/Makefile#4 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/read.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/util.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/tar/write.c#3 integrate .. //depot/projects/dtrace6/src/usr.bin/units/units.lib#2 integrate .. //depot/projects/dtrace6/src/usr.bin/window/:tt#2 delete .. //depot/projects/dtrace6/src/usr.bin/window/:tty#2 delete .. //depot/projects/dtrace6/src/usr.bin/window/:var#2 delete .. //depot/projects/dtrace6/src/usr.bin/window/:ww#2 delete .. //depot/projects/dtrace6/src/usr.bin/yacc/skeleton.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.sh#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/config/config.y#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/config/lang.l#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/cron/cron/cron.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pw/pwupd.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/sysinstall/package.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/contrib/openpam/CREDITS#2 (text) ==== @@ -14,6 +14,7 @@ Andrew Morgan Brian Fundakowski Feldman Christos Zoulas + Daniel Richard G. Darren J. Moffat Dmitry V. Levin Emmanuel Dreyfus @@ -24,11 +25,13 @@ Hubert Feyrer Mark Murray Mike Petullo + Mikhail Teterin Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto + Wojciech A. Koszek Yar Tikhiy -$P4: //depot/projects/openpam/CREDITS#12 $ +$Id: CREDITS 400 2007-10-24 15:04:23Z des $ ==== //depot/projects/dtrace6/src/contrib/openpam/HISTORY#2 (text) ==== @@ -1,4 +1,27 @@ -OpenPAM Figwort 2005-06-16 +OpenPAM Hydrangea 2007-12-21 + + - ENHANCE: when compiling with GCC, mark up API functions with GCC + attributes where appropriate. + + - BUGFIX: fixed numerous warnings uncovered by GCC 4. + + - ENHANCE: building the documentation is now optional. + + - ENHANCE: corrected a number of mistakes and style issues in the + build system. + + - ENHANCE: API function arguments are now const where appropriate, to + match corresponding changes in the Solaris PAM and Linux-PAM APIs. + + - ENHANCE: corrected a number of C namespace violations. + + - ENHANCE: the module cache has been removed, allowing long-lived + applications to pick up module changes. This also allows multiple + threads to use PAM simultaneously (as long as they use separate PAM + contexts), since the module cache was the only part of OpenPAM that + was not thread-safe. +============================================================================ +OpenPAM Figwort 2005-06-16 - BUGFIX: Correct several small signedness and initialization bugs discovered during review by the NetBSD team. @@ -304,4 +327,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#24 $ +$Id: HISTORY 409 2007-12-21 11:38:50Z des $ ==== //depot/projects/dtrace6/src/contrib/openpam/INSTALL#2 (text) ==== @@ -16,23 +16,29 @@ Use the "configure" shell script to configure OpenPAM for your system. Options include: + --enable-debug + Turn debugging on by default. + --with-modules-dir=DIR Indicates the directory where PAM modules will be installed. This option should not be used if you intend to install PAM modules in the system library directory. - --with-pam-su - Builds the sample PAM application. + --without-doc + Skips the documentation. --with-pam-unix Builds the sample PAM module. + --with-su + Builds the sample su(1) implementation. + For more information about configuration options, use the --help option. A typical invocation might look like this: - # ./configure --with-pam-su --with-pam-unix + # ./configure --with-pam-unix --with-su 3. COMPILATION @@ -49,4 +55,4 @@ # make install -$P4: //depot/projects/openpam/INSTALL#4 $ +$Id: INSTALL 388 2006-04-12 10:31:52Z des $ ==== //depot/projects/dtrace6/src/contrib/openpam/LICENSE#2 (text) ==== @@ -1,5 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. +Copyright (c) 2004-2007 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +32,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#6 $ +$Id: LICENSE 408 2007-12-21 11:36:24Z des $ ==== //depot/projects/dtrace6/src/contrib/openpam/Makefile.am#2 (text) ==== @@ -1,5 +1,17 @@ -# $P4: //depot/projects/openpam/Makefile.am#3 $ +# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ + +SUBDIRS = lib bin modules include -SUBDIRS = lib bin modules doc include +if WITH_DOC +SUBDIRS += doc +endif -EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES +EXTRA_DIST = \ + CREDITS \ + HISTORY \ + INSTALL \ + LICENSE \ + README \ + RELNOTES \ + autogen.sh \ + misc/gendoc.pl ==== //depot/projects/dtrace6/src/contrib/openpam/Makefile.in#2 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 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. @@ -14,7 +14,7 @@ @SET_MAKE@ -# $P4: //depot/projects/openpam/Makefile.am#3 $ +# $Id: Makefile.am 395 2007-06-03 20:26:18Z des $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -38,6 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@WITH_DOC_TRUE@am__append_1 = doc DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure INSTALL compile config.guess \ @@ -49,7 +50,7 @@ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(mkdir_p) +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = SOURCES = @@ -62,7 +63,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib bin modules include doc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -105,6 +106,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -127,20 +129,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WITH_PAM_SU_FALSE = @WITH_PAM_SU_FALSE@ -WITH_PAM_SU_TRUE = @WITH_PAM_SU_TRUE@ +WITH_DOC_FALSE = @WITH_DOC_FALSE@ +WITH_DOC_TRUE = @WITH_DOC_TRUE@ WITH_PAM_UNIX_FALSE = @WITH_PAM_UNIX_FALSE@ WITH_PAM_UNIX_TRUE = @WITH_PAM_UNIX_TRUE@ -ac_ct_AR = @ac_ct_AR@ +WITH_SU_FALSE = @WITH_SU_FALSE@ +WITH_SU_TRUE = @WITH_SU_TRUE@ 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@ @@ -148,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -155,23 +159,30 @@ build_os = @build_os@ build_vendor = @build_vendor@ 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@ sysconfdir = @sysconfdir@ @@ -180,8 +191,17 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -SUBDIRS = lib bin modules doc include -EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES +SUBDIRS = lib bin modules include $(am__append_1) +EXTRA_DIST = \ + CREDITS \ + HISTORY \ + INSTALL \ + LICENSE \ + README \ + RELNOTES \ + autogen.sh \ + misc/gendoc.pl + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -254,7 +274,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -266,7 +292,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -274,7 +300,13 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -295,7 +327,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -370,6 +402,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) + $(mkdir_p) $(distdir)/misc @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -396,15 +429,17 @@ || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || mkdir "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="../$(top_distdir)" \ - distdir="../$(distdir)/$$subdir" \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -415,15 +450,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -436,7 +471,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -445,11 +480,11 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ @@ -530,7 +565,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/dtrace6/src/contrib/openpam/README#2 (text) ==== @@ -24,4 +24,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/README#5 $ +$Id: README 320 2006-02-16 20:33:19Z des $ ==== //depot/projects/dtrace6/src/contrib/openpam/RELNOTES#2 (text) ==== @@ -1,6 +1,6 @@ - Release notes for OpenPAM Figwort - ================================= + Release notes for OpenPAM Hydrangea + =================================== This release corresponds to the code used in FreeBSD-CURRENT as of the release date. It has also been tested on several other platforms, and @@ -26,4 +26,4 @@ Please direct bug reports and inquiries to . -$P4: //depot/projects/openpam/RELNOTES#22 $ +$Id: RELNOTES 404 2007-11-28 12:31:04Z des $ ==== //depot/projects/dtrace6/src/contrib/openpam/aclocal.m4#2 (text) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 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. @@ -13,7 +13,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 25 05:14:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CC9A1065670; Mon, 25 Aug 2008 05:14:19 +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 D53A1106566B for ; Mon, 25 Aug 2008 05:14:18 +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 DEB238FC18 for ; Mon, 25 Aug 2008 05:14:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P5EIqX041842 for ; Mon, 25 Aug 2008 05:14:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P5EIpn041840 for perforce@freebsd.org; Mon, 25 Aug 2008 05:14:18 GMT (envelope-from jb@freebsd.org) Date: Mon, 25 Aug 2008 05:14:18 GMT Message-Id: <200808250514.m7P5EIpn041840@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 148337 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, 25 Aug 2008 05:14:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=148337 Change 148337 by jb@freebsd3 on 2008/08/25 05:14:02 Call callout_drain to finalise the callouts as the stage is being freed. Affected files ... .. //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 edit Differences ... ==== //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text) ==== @@ -13618,8 +13618,8 @@ if (state->dts_deadman != CYCLIC_NONE) cyclic_remove(state->dts_deadman); #else - callout_stop(&state->dts_cleaner); - callout_stop(&state->dts_deadman); + callout_drain(&state->dts_cleaner); + callout_drain(&state->dts_deadman); #endif dtrace_dstate_fini(&vstate->dtvs_dynvars); From owner-p4-projects@FreeBSD.ORG Mon Aug 25 06:23:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8E37106567D; Mon, 25 Aug 2008 06:23: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 6BDC81065674 for ; Mon, 25 Aug 2008 06:23:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D4C08FC08 for ; Mon, 25 Aug 2008 06:23:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P6N0fL048809 for ; Mon, 25 Aug 2008 06:23:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P6N011048807 for perforce@freebsd.org; Mon, 25 Aug 2008 06:23:00 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 06:23:00 GMT Message-Id: <200808250623.m7P6N011048807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148351 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, 25 Aug 2008 06:23:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=148351 Change 148351 by julian@julian_trafmon1 on 2008/08/25 06:22:30 loop back some fixes Affected files ... .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#14 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#8 (text+ko) ==== @@ -39,8 +39,10 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.121 2008/08/25 04:55:29 julian Exp $"); #include #include @@ -89,7 +91,6 @@ #include #endif /* __i386__ || __amd64__ */ -#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#11 (text+ko) ==== @@ -26,8 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); #include #include @@ -62,8 +64,6 @@ #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); #include #include @@ -37,9 +37,9 @@ #include #include #include + #include - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis_quirks.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.17 2007/10/12 08:26:15 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.18 2008/08/25 04:59:43 imp Exp $"); #define PCCARDDEBUG @@ -137,6 +137,27 @@ 0, /* maxtwins */ }; +static struct pccard_function pccard_3c1_func0 = { + 0, /* function number */ + PCCARD_FUNCTION_NETWORK, + 0x05, /* last cfe number */ + 0x400, /* ccr_base */ + 0x267, /* ccr_mask */ +}; + +static struct pccard_config_entry pccard_3c1_func0_cfe0 = { + 0x05, /* cfe number */ + PCCARD_CFE_IO8 | PCCARD_CFE_IO16 | PCCARD_CFE_IRQLEVEL, + PCCARD_IFTYPE_IO, + 1, /* num_iospace */ + 5, /* iomask */ + { { 0x0010, 0 } }, /* iospace */ + 0xffff, /* irqmask */ + 0, /* num_memspace */ + { }, /* memspace */ + 0, /* maxtwins */ +}; + static struct pccard_function pccard_sveclancard_func0 = { 0, /* function number */ PCCARD_FUNCTION_NETWORK, @@ -228,6 +249,8 @@ { PCMCIA_VENDOR_SIERRA, PCMCIA_PRODUCT_SIERRA_AC710, PCMCIA_CIS_INVALID, &pccard_sierra_a555_func1, &pccard_sierra_a555_func1_cfe0 }, + { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C1, PCMCIA_CIS_INVALID, + &pccard_3c1_func0, &pccard_3c1_func0_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD, &pccard_sveclancard_func0, &pccard_sveclancard_func0_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E, ==== //depot/projects/vimage-commit2/src/sys/dev/usb/uipaq.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.12 2008/08/02 12:15:18 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.15 2008/08/25 02:42:13 imp Exp $"); #include #include @@ -119,16 +119,465 @@ u_int16_t uv_flags; }; +/* + * Much of this list is generated from lists of other drivers that support + * the same hardware. Numeric values are used where no usbdevs entries + * exist. + */ static const struct uipaq_type uipaq_devs[] = { + {{ 0x0104, 0x00be }, 0}, /* Socket USB Sync */ + {{ 0x04ad, 0x0301 }, 0}, /* USB Sync 0301 */ + {{ 0x04ad, 0x0302 }, 0}, /* USB Sync 0302 */ + {{ 0x04ad, 0x0303 }, 0}, /* USB Sync 0303 */ + {{ 0x04ad, 0x0306 }, 0}, /* GPS Pocket PC USB Sync */ + {{ 0x0536, 0x01a0 }, 0}, /* HHP PDT */ + {{ 0x067e, 0x1001 }, 0}, /* Intermec Mobile Computer */ + {{ 0x094b, 0x0001 }, 0}, /* Linkup Systems USB Sync */ + {{ 0x0960, 0x0065 }, 0}, /* BCOM USB Sync 0065 */ + {{ 0x0960, 0x0066 }, 0}, /* BCOM USB Sync 0066 */ + {{ 0x0960, 0x0067 }, 0}, /* BCOM USB Sync 0067 */ + {{ 0x0961, 0x0010 }, 0}, /* Portatec USB Sync */ + {{ 0x099e, 0x0052 }, 0}, /* Trimble GeoExplorer */ + {{ 0x099e, 0x4000 }, 0}, /* TDS Data Collector */ + {{ 0x0c44, 0x03a2 }, 0}, /* Motorola iDEN Smartphone */ + {{ 0x0c8e, 0x6000 }, 0}, /* Cesscom Luxian Series */ + {{ 0x0cad, 0x9001 }, 0}, /* Motorola PowerPad Pocket PCDevice */ + {{ 0x0f4e, 0x0200 }, 0}, /* Freedom Scientific USB Sync */ + {{ 0x0f98, 0x0201 }, 0}, /* Cyberbank USB Sync */ + {{ 0x0fb8, 0x3001 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x3002 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x3003 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x4001 }, 0}, /* Wistron USB Sync */ + {{ 0x1066, 0x00ce }, 0}, /* E-TEN USB Sync */ + {{ 0x1066, 0x0300 }, 0}, /* E-TEN P3XX Pocket PC */ + {{ 0x1066, 0x0500 }, 0}, /* E-TEN P5XX Pocket PC */ + {{ 0x1066, 0x0600 }, 0}, /* E-TEN P6XX Pocket PC */ + {{ 0x1066, 0x0700 }, 0}, /* E-TEN P7XX Pocket PC */ + {{ 0x1114, 0x0001 }, 0}, /* Psion Teklogix Sync 753x */ + {{ 0x1114, 0x0004 }, 0}, /* Psion Teklogix Sync netBookPro */ + {{ 0x1114, 0x0006 }, 0}, /* Psion Teklogix Sync 7525 */ + {{ 0x1182, 0x1388 }, 0}, /* VES USB Sync */ + {{ 0x11d9, 0x1002 }, 0}, /* Rugged Pocket PC 2003 */ + {{ 0x11d9, 0x1003 }, 0}, /* Rugged Pocket PC 2003 */ + {{ 0x1231, 0xce01 }, 0}, /* USB Sync 03 */ + {{ 0x1231, 0xce02 }, 0}, /* USB Sync 03 */ + {{ 0x3340, 0x011c }, 0}, /* Mio DigiWalker PPC StrongARM */ + {{ 0x3340, 0x0326 }, 0}, /* Mio DigiWalker 338 */ + {{ 0x3340, 0x0426 }, 0}, /* Mio DigiWalker 338 */ + {{ 0x3340, 0x043a }, 0}, /* Mio DigiWalker USB Sync */ + {{ 0x3340, 0x051c }, 0}, /* MiTAC USB Sync 528 */ + {{ 0x3340, 0x053a }, 0}, /* Mio DigiWalker SmartPhone USB Sync */ + {{ 0x3340, 0x071c }, 0}, /* MiTAC USB Sync */ + {{ 0x3340, 0x0b1c }, 0}, /* Generic PPC StrongARM */ + {{ 0x3340, 0x0e3a }, 0}, /* Generic PPC USB Sync */ + {{ 0x3340, 0x0f1c }, 0}, /* Itautec USB Sync */ + {{ 0x3340, 0x0f3a }, 0}, /* Generic SmartPhone USB Sync */ + {{ 0x3340, 0x1326 }, 0}, /* Itautec USB Sync */ + {{ 0x3340, 0x191c }, 0}, /* YAKUMO USB Sync */ + {{ 0x3340, 0x2326 }, 0}, /* Vobis USB Sync */ + {{ 0x3340, 0x3326 }, 0}, /* MEDION Winodws Moble USB Sync */ + {{ 0x3708, 0x20ce }, 0}, /* Legend USB Sync */ + {{ 0x3708, 0x21ce }, 0}, /* Lenovo USB Sync */ + {{ 0x4113, 0x0210 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0211 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0400 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0410 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4505, 0x0010 }, 0}, /* Smartphone */ + {{ 0x5e04, 0xce00 }, 0}, /* SAGEM Wireless Assistant */ + {{ USB_VENDOR_ACER, 0x1631 }, 0}, /* c10 Series */ + {{ USB_VENDOR_ACER, 0x1632 }, 0}, /* c20 Series */ + {{ USB_VENDOR_ACER, 0x16e1 }, 0}, /* Acer n10 Handheld USB Sync */ + {{ USB_VENDOR_ACER, 0x16e2 }, 0}, /* Acer n20 Handheld USB Sync */ + {{ USB_VENDOR_ACER, 0x16e3 }, 0}, /* Acer n30 Handheld USB Sync */ + {{ USB_VENDOR_ASUS, 0x4200 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x4201 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x4202 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x9200 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x9202 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_P535 }, 0}, + {{ USB_VENDOR_CASIO, 0x2001 }, 0}, /* CASIO USB Sync 2001 */ + {{ USB_VENDOR_CASIO, 0x2003 }, 0}, /* CASIO USB Sync 2003 */ + {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0}, + {{ USB_VENDOR_COMPAL, 0x0531 }, 0}, /* MyGuide 7000 XL USB Sync */ + {{ USB_VENDOR_COMPAQ, 0x0032 }, 0}, /* Compaq iPAQ USB Sync */ + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0}, + {{ USB_VENDOR_DELL, 0x4001 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4002 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4003 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4004 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4005 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4006 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4007 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4008 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4009 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_FSC, 0x1001 }, 0}, /* Fujitsu Siemens Computers USB Sync */ + {{ USB_VENDOR_FUJITSU, 0x1058 }, 0}, /* FUJITSU USB Sync */ + {{ USB_VENDOR_FUJITSU, 0x1079 }, 0}, /* FUJITSU USB Sync */ + {{ USB_VENDOR_GIGASET, 0x0601 }, 0}, /* Askey USB Sync */ + {{ USB_VENDOR_HITACHI, 0x0014 }, 0}, /* Hitachi USB Sync */ + {{ USB_VENDOR_HP, 0x1216 }, 0}, /* HP USB Sync 1612 */ + {{ USB_VENDOR_HP, 0x2016 }, 0}, /* HP USB Sync 1620 */ + {{ USB_VENDOR_HP, 0x2116 }, 0}, /* HP USB Sync 1621 */ + {{ USB_VENDOR_HP, 0x2216 }, 0}, /* HP USB Sync 1622 */ + {{ USB_VENDOR_HP, 0x3016 }, 0}, /* HP USB Sync 1630 */ + {{ USB_VENDOR_HP, 0x3116 }, 0}, /* HP USB Sync 1631 */ + {{ USB_VENDOR_HP, 0x3216 }, 0}, /* HP USB Sync 1632 */ + {{ USB_VENDOR_HP, 0x4016 }, 0}, /* HP USB Sync 1640 */ + {{ USB_VENDOR_HP, 0x4116 }, 0}, /* HP USB Sync 1641 */ + {{ USB_VENDOR_HP, 0x4216 }, 0}, /* HP USB Sync 1642 */ + {{ USB_VENDOR_HP, 0x5016 }, 0}, /* HP USB Sync 1650 */ + {{ USB_VENDOR_HP, 0x5116 }, 0}, /* HP USB Sync 1651 */ + {{ USB_VENDOR_HP, 0x5216 }, 0}, /* HP USB Sync 1652 */ {{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0}, - {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0}, + {{ USB_VENDOR_HTC, 0x00cf }, 0}, /* HTC USB Modem */ + {{ USB_VENDOR_HTC, 0x0a01 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a02 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a03 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a04 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a05 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a06 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a07 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a08 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a09 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a10 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a11 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a12 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a13 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a14 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a15 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a16 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a17 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a18 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a19 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a20 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a21 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a22 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a23 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a24 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a25 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a26 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a27 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a28 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a29 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a30 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a31 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a32 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a33 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a34 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a35 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a36 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a37 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a38 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a39 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a40 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a41 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a42 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a43 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a44 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a45 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a46 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a47 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a48 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a49 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a50 }, 0}, /* HTC SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a52 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a53 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a54 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a55 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a56 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a57 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a58 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a59 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a60 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a61 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a62 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a63 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a64 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a65 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a66 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a67 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a68 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a69 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a70 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a71 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a72 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a73 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a74 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a75 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a76 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a77 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a78 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a79 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a80 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a81 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a82 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a83 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a84 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a85 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a86 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a87 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a88 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a89 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a90 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a91 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a92 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a93 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a94 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a95 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a96 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a97 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a98 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a99 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0bce }, 0}, /* "High Tech Computer Corp" */ {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_PPC6700MODEM }, 0}, {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_SMARTPHONE }, 0}, - {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0}, - {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0}, + {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0}, + {{ USB_VENDOR_JVC, 0x3011 }, 0}, /* JVC USB Sync */ + {{ USB_VENDOR_JVC, 0x3012 }, 0}, /* JVC USB Sync */ + {{ USB_VENDOR_LG, 0x9c01 }, 0}, /* LGE USB Sync */ + {{ USB_VENDOR_MICROSOFT, 0x00ce }, 0}, /* Microsoft USB Sync */ + {{ USB_VENDOR_MICROSOFT, 0x0400 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0401 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0402 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0403 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0404 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0405 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0406 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0407 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0408 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0409 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040a }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040b }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040c }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040d }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040e }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040f }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0410 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0411 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0412 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0413 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0414 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0415 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0416 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0417 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0432 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0433 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0434 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0435 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0436 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0437 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0438 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0439 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0440 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0441 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0442 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0443 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0444 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0445 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0446 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0447 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0448 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0449 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0450 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0451 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0452 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0453 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0454 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0455 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0456 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0457 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0458 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0459 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0460 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0461 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0462 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0463 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0464 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0465 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0466 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0467 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0468 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0469 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0470 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0471 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0472 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0473 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0474 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0475 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0476 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0477 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0478 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0479 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x047a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x047b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04c8 }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04c9 }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04ca }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04cb }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04cc }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04cd }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04ce }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04d7 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04d8 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04d9 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04da }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04db }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04dc }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04dd }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04de }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04df }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e0 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e1 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e2 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e3 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e4 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e5 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e6 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e7 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e8 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e9 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04ea }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MOTOROLA2, 0x4204 }, 0}, /* Motorola MPx200 Smartphone */ + {{ USB_VENDOR_MOTOROLA2, 0x4214 }, 0}, /* Motorola MPc GSM */ + {{ USB_VENDOR_MOTOROLA2, 0x4224 }, 0}, /* Motorola MPx220 Smartphone */ + {{ USB_VENDOR_MOTOROLA2, 0x4234 }, 0}, /* Motorola MPc CDMA */ + {{ USB_VENDOR_MOTOROLA2, 0x4244 }, 0}, /* Motorola MPx100 Smartphone */ + {{ USB_VENDOR_NEC, 0x00d5 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x00d6 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x00d7 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x8024 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x8025 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_PANASONIC, 0x2500 }, 0}, /* Panasonic USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f00 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f01 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f02 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f03 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f04 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6611 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6613 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6615 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6617 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6619 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x661b }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x662e }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6630 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6632 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SHARP, 0x9102 }, 0}, /* SHARP WS003SH USB Modem */ + {{ USB_VENDOR_SHARP, 0x9121 }, 0}, /* SHARP WS004SH USB Modem */ + {{ USB_VENDOR_SHARP, 0x9151 }, 0}, /* SHARP S01SH USB Modem */ {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ES }, 0}, - {{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_P535 }, 0}, + {{ USB_VENDOR_SYMBOL, 0x2000 }, 0}, /* Symbol USB Sync */ + {{ USB_VENDOR_SYMBOL, 0x2001 }, 0}, /* Symbol USB Sync 0x2001 */ + {{ USB_VENDOR_SYMBOL, 0x2002 }, 0}, /* Symbol USB Sync 0x2002 */ + {{ USB_VENDOR_SYMBOL, 0x2003 }, 0}, /* Symbol USB Sync 0x2003 */ + {{ USB_VENDOR_SYMBOL, 0x2004 }, 0}, /* Symbol USB Sync 0x2004 */ + {{ USB_VENDOR_SYMBOL, 0x2005 }, 0}, /* Symbol USB Sync 0x2005 */ + {{ USB_VENDOR_SYMBOL, 0x2006 }, 0}, /* Symbol USB Sync 0x2006 */ + {{ USB_VENDOR_SYMBOL, 0x2007 }, 0}, /* Symbol USB Sync 0x2007 */ + {{ USB_VENDOR_SYMBOL, 0x2008 }, 0}, /* Symbol USB Sync 0x2008 */ + {{ USB_VENDOR_SYMBOL, 0x2009 }, 0}, /* Symbol USB Sync 0x2009 */ + {{ USB_VENDOR_SYMBOL, 0x200a }, 0}, /* Symbol USB Sync 0x200a */ + {{ USB_VENDOR_TOSHIBA, 0x0700 }, 0}, /* TOSHIBA USB Sync 0700 */ + {{ USB_VENDOR_TOSHIBA, 0x0705 }, 0}, /* TOSHIBA Pocket PC e310 */ + {{ USB_VENDOR_TOSHIBA, 0x0707 }, 0}, /* TOSHIBA Pocket PC e330 Series */ + {{ USB_VENDOR_TOSHIBA, 0x0708 }, 0}, /* TOSHIBA Pocket PC e350Series */ + {{ USB_VENDOR_TOSHIBA, 0x0709 }, 0}, /* TOSHIBA Pocket PC e750 Series */ + {{ USB_VENDOR_TOSHIBA, 0x070a }, 0}, /* TOSHIBA Pocket PC e400 Series */ + {{ USB_VENDOR_TOSHIBA, 0x070b }, 0}, /* TOSHIBA Pocket PC e800 Series */ + {{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740 }, 0}, /* TOSHIBA Pocket PC e740 */ + {{ USB_VENDOR_VIEWSONIC, 0x0ed9 }, 0}, /* ViewSonic Color Pocket PC V35 */ + {{ USB_VENDOR_VIEWSONIC, 0x1527 }, 0}, /* ViewSonic Color Pocket PC V36 */ + {{ USB_VENDOR_VIEWSONIC, 0x1529 }, 0}, /* ViewSonic Color Pocket PC V37 */ + {{ USB_VENDOR_VIEWSONIC, 0x152b }, 0}, /* ViewSonic Color Pocket PC V38 */ + {{ USB_VENDOR_VIEWSONIC, 0x152e }, 0}, /* ViewSonic Pocket PC */ + {{ USB_VENDOR_VIEWSONIC, 0x1921 }, 0}, /* ViewSonic Communicator Pocket PC */ + {{ USB_VENDOR_VIEWSONIC, 0x1922 }, 0}, /* ViewSonic Smartphone */ + {{ USB_VENDOR_VIEWSONIC, 0x1923 }, 0}, /* ViewSonic Pocket PC V30 */ }; #define uipaq_lookup(v, p) ((const struct uipaq_type *)usb_lookup(uipaq_devs, v, p)) @@ -151,6 +600,7 @@ static int uipaq_attach(device_t self) { + usb_device_request_t req; struct uipaq_softc *sc = device_get_softc(self); struct usb_attach_arg *uaa = device_get_ivars(self); usbd_device_handle dev = uaa->device; @@ -212,7 +662,21 @@ ucom->sc_bulkin_no, ucom->sc_bulkout_no); return (ENXIO); } - + /* + * Send magic bytes, cribbed from Linux ipaq driver that claims + * to have sniffed them from Win98. + */ + req.bmRequestType = UT_WRITE_CLASS_INTERFACE; + req.bRequest = UCDC_SET_CONTROL_LINE_STATE; + USETW(req.wValue, UCDC_LINE_DTR); + USETW(req.wIndex, 0x0); + USETW(req.wLength, 0); + for (i = 0; i < 100; i++) { + err = usbd_do_request_flags(ucom->sc_udev, &req, NULL, 0, NULL, 100); + if (!err) + break; + usbd_delay_ms(dev, 1000); + } ucom_attach(&sc->sc_ucom); return (0); bad: ==== //depot/projects/vimage-commit2/src/sys/dev/vx/if_vx_eisa.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.27 2007/02/23 12:18:59 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.28 2008/08/25 05:20:17 imp Exp $"); #include #include @@ -69,13 +69,13 @@ { switch (type) { case EISA_DEVICE_ID_3COM_3C592: - return "3Com 3C592 Network Adapter"; + return "3Com 3C592"; case EISA_DEVICE_ID_3COM_3C597_TX: - return "3Com 3C597-TX Network Adapter"; + return "3Com 3C597-TX"; case EISA_DEVICE_ID_3COM_3C597_T4: - return "3Com 3C597-T4 Network Adapter"; + return "3Com 3C597-T4"; case EISA_DEVICE_ID_3COM_3C597_MII: - return "3Com 3C597-MII Network Adapter"; + return "3Com 3C597-MII"; default: break; } ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.4 2008/05/28 23:20:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.5 2008/08/25 05:20:29 julian Exp $"); #include "opt_ddb.h" #include "opt_wlan.h" @@ -36,8 +36,8 @@ #include #include #include - #include +#include #include #include @@ -193,7 +193,7 @@ break; } - TAILQ_FOREACH(ifp, &ifnet, if_list) + TAILQ_FOREACH(ifp, &V_ifnet, if_list) if (ifp->if_type == IFT_IEEE80211) { const struct ieee80211com *ic = ifp->if_l2com; ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.189 2008/08/20 01:05:56 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.190 2008/08/25 05:38:18 julian Exp $"); #define DEB(x) #define DDB(x) x @@ -3487,7 +3487,7 @@ flush_rule_ptrs(chain); done: V_static_count++; - static_len += l; + V_static_len += l; IPFW_WUNLOCK(chain); DEB(printf("ipfw: installed rule %d, static count now %d\n", rule->rulenum, V_static_count);) @@ -3521,7 +3521,7 @@ else prev->next = n; V_static_count--; - static_len -= l; + V_static_len -= l; rule->next = chain->reap; chain->reap = rule; @@ -4208,7 +4208,7 @@ * change between calculating the size and returning the * data in which case we'll just return what fits. */ - size = static_len; /* size of static rules */ + size = V_static_len; /* size of static rules */ if (V_ipfw_dyn_v) /* add size of dyn.rules */ size += (V_dyn_count * sizeof(ipfw_dyn_rule)); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.341 2008/08/20 01:24:55 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.342 2008/08/25 05:49:16 julian Exp $"); #include "opt_bootp.h" #include "opt_ipfw.h" @@ -265,7 +265,7 @@ NULL, EVENTHANDLER_PRI_ANY); /* Initialize various other remaining things. */ - ip_id = time_second & 0xffff; + V_ip_id = time_second & 0xffff; ipintrq.ifq_maxlen = ipqmaxlen; mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); netisr_register(NETISR_IP, ip_input, &ipintrq, 0); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.103 2008/08/17 23:27:27 bz Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.104 2008/08/25 05:49:16 julian Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -243,7 +243,7 @@ if (V_ip_do_randomid) return ip_randomid(); - return htons(ip_id++); + return htons(V_ip_id++); } #endif /* _KERNEL */ ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.236 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.237 2008/08/25 05:57:56 julian Exp $"); #include "opt_ipfw.h" #include "opt_inet6.h" @@ -168,7 +168,7 @@ INP_INFO_LOCK_INIT(&V_udbinfo, "udp"); LIST_INIT(&V_udb); - V_udbinfo.ipi_listhead = &udb; + V_udbinfo.ipi_listhead = &V_udb; V_udbinfo.ipi_hashbase = hashinit(UDBHASHSIZE, M_PCB, &V_udbinfo.ipi_hashmask); V_udbinfo.ipi_porthashbase = hashinit(UDBHASHSIZE, M_PCB, ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.51 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.52 2008/08/25 06:09:32 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -1167,7 +1167,7 @@ } bzero(dp, sizeof(*dp)); callout_init(&dp->dad_timer_ch, 0); - TAILQ_INSERT_TAIL(&dadq, (struct dadq *)dp, dad_list); + TAILQ_INSERT_TAIL(&V_dadq, (struct dadq *)dp, dad_list); nd6log((LOG_DEBUG, "%s: starting DAD for %s\n", if_name(ifa->ifa_ifp), ip6_sprintf(ip6buf, &ia->ia_addr.sin6_addr))); ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/vimage.h,v 1.2 2008/08/18 13:16:19 bz Exp $ + * $FreeBSD: src/sys/sys/vimage.h,v 1.4 2008/08/25 05:49:16 julian Exp $ */ #ifndef _SYS_VIMAGE_H_ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 06:29:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36AE91065687; Mon, 25 Aug 2008 06:29:07 +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 ED78D1065683 for ; Mon, 25 Aug 2008 06:29:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF3338FC1B for ; Mon, 25 Aug 2008 06:29:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P6T6Zp049267 for ; Mon, 25 Aug 2008 06:29:06 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P6T6gw049265 for perforce@freebsd.org; Mon, 25 Aug 2008 06:29:06 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 06:29:06 GMT Message-Id: <200808250629.m7P6T6gw049265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148353 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, 25 Aug 2008 06:29:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=148353 Change 148353 by julian@julian_trafmon1 on 2008/08/25 06:28:22 merge inthe basic differences between the vimage-commit and vimage-commit2/3 branches. This basically removes any remaining reason for the vimage-commit branch Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#2 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#8 edit .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#8 edit .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#8 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#8 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#15 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#7 edit .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#2 (text+ko) ==== @@ -1855,5 +1855,12 @@ struct pf_os_fingerprint * pf_osfp_validate(void); +/* + * Symbol translation macros + */ +#define INIT_VNET_PF(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_PF, struct vnet_pf, vnet_pf) + +#define VNET_PF(sym) VSYM(vnet_pf, sym) #endif /* _NET_PFVAR_H_ */ ==== //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#8 (text+ko) ==== @@ -207,7 +207,9 @@ SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD, machine_arch, 0, "System architecture"); +#ifndef VIMAGE char hostname[MAXHOSTNAMELEN]; +#endif /* * This mutex is used to protect the hostname and domainname variables, and @@ -346,7 +348,9 @@ 0, 0, sysctl_kern_config, "", "Kernel configuration file"); #endif +#ifndef VIMAGE char domainname[MAXHOSTNAMELEN]; /* Protected by hostname_mtx. */ +#endif static int sysctl_domainname(SYSCTL_HANDLER_ARGS) @@ -355,13 +359,13 @@ int error; mtx_lock(&hostname_mtx); - bcopy(domainname, tmpdomainname, MAXHOSTNAMELEN); + bcopy(V_domainname, tmpdomainname, MAXHOSTNAMELEN); mtx_unlock(&hostname_mtx); error = sysctl_handle_string(oidp, tmpdomainname, sizeof tmpdomainname, req); if (req->newptr != NULL && error == 0) { mtx_lock(&hostname_mtx); - bcopy(tmpdomainname, domainname, MAXHOSTNAMELEN); + bcopy(tmpdomainname, V_domainname, MAXHOSTNAMELEN); mtx_unlock(&hostname_mtx); } return (error); ==== //depot/projects/vimage-commit2/src/sys/kern/tty.c#4 (text+ko) ==== @@ -61,6 +61,7 @@ #undef TTYDEFCHARS #include #include +#include #include @@ -724,6 +725,12 @@ done: tty_unlock(tp); return (error); } +#if 0 + /* in the old code we did this in the ioctl code.. remember this! */ + CURVNET_SET(TD_TO_VNET(curthread)); + /* fumble line discipline */ + CURVNET_RESTORE(); +#endif static struct cdevsw ttyil_cdevsw = { .d_version = D_VERSION, @@ -1501,8 +1508,6 @@ tty_flush(tp, flags); return (0); } - case TIOCDRAIN: - /* Drain TTY output. */ return tty_drain(tp); case TIOCCONS: /* Set terminal as console TTY. */ ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#7 (text+ko) ==== @@ -935,8 +935,8 @@ SYSCTL_DECL(_net_link); SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet"); #if defined(INET) || defined(INET6) -SYSCTL_INT(_net_link_ether, OID_AUTO, ipfw, CTLFLAG_RW, - ðer_ipfw,0,"Pass ether pkts through firewall"); +SYSCTL_V_INT(V_NET, vnet_net, _net_link_ether, OID_AUTO, ipfw, CTLFLAG_RW, + ether_ipfw, 0, "Pass ether pkts through firewall"); #endif #if 0 ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#7 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include + #include #include @@ -123,9 +124,17 @@ */ #define MAX_GIF_NEST 1 #endif -static int max_gif_nesting = MAX_GIF_NEST; -SYSCTL_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW, - &max_gif_nesting, 0, "Max nested tunnels"); +#ifndef VIMAGE +static int max_gif_nesting; +#endif +SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, max_nesting, + CTLFLAG_RW, max_gif_nesting, 0, "Max nested tunnels"); + +#ifdef INET6 +SYSCTL_DECL(_net_inet6_ip6); +SYSCTL_V_INT(V_NET, vnet_gif, _net_inet6_ip6, IPV6CTL_GIF_HLIM, + gifhlim, CTLFLAG_RW, ip6_gif_hlim, 0, ""); +#endif /* * By default, we disallow creation of multiple tunnels between the same @@ -137,8 +146,8 @@ #else static int parallel_tunnels = 0; #endif -SYSCTL_INT(_net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, - ¶llel_tunnels, 0, "Allow parallel tunnels?"); +SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, + CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); /* copy from src/sys/net/if_ethersubr.c */ static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#8 (text+ko) ==== @@ -65,8 +65,10 @@ SYSCTL_DECL(_net_link_generic); SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RW, 0, "Variables global to all interfaces"); -SYSCTL_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD, - &if_index, 0, "Number of configured interfaces"); + +SYSCTL_V_INT(V_NET, vnet_net, _net_link_generic_system, IFMIB_IFCOUNT, + ifcount, CTLFLAG_RD, if_index, 0, + "Number of configured interfaces"); static int sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */ ==== //depot/projects/vimage-commit2/src/sys/net/if_tun.c#3 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -224,6 +225,7 @@ else append_unit = 0; + CURVNET_SET(TD_TO_VNET(curthread)); /* find any existing device, or allocate new unit number */ i = clone_create(&tunclones, &tun_cdevsw, &u, dev, 0); if (i) { @@ -242,6 +244,7 @@ } if_clone_create(name, namelen, NULL); + CURVNET_RESTORE(); } static void @@ -253,6 +256,7 @@ KASSERT((tp->tun_flags & TUN_OPEN) == 0, ("tununits is out of sync - unit %d", TUN2IFP(tp)->if_dunit)); + CURVNET_SET(TUN2IFP(tp)->if_vnet); dev = tp->tun_dev; bpfdetach(TUN2IFP(tp)); if_detach(TUN2IFP(tp)); @@ -261,6 +265,7 @@ knlist_destroy(&tp->tun_rsel.si_note); mtx_destroy(&tp->tun_mtx); free(tp, M_TUN); + CURVNET_RESTORE(); } static void @@ -447,6 +452,7 @@ /* * junk all pending output */ + CURVNET_SET(ifp->if_vnet); s = splimp(); IFQ_PURGE(&ifp->if_snd); splx(s); @@ -476,6 +482,7 @@ ifp->if_drv_flags &= ~IFF_DRV_RUNNING; splx(s); } + CURVNET_RESTORE(); funsetown(&tp->tun_sigio); selwakeuppri(&tp->tun_rsel, PZERO + 1); @@ -924,7 +931,9 @@ random_harvest(m, 16, 3, 0, RANDOM_NET); ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; + CURVNET_SET(ifp->if_vnet); netisr_dispatch(isr, m); + CURVNET_RESTORE(); return (0); } ==== //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#8 (text+ko) ==== @@ -422,6 +422,8 @@ sc = ifp->if_softc; ifp_p = PARENT(sc); + CURVNET_SET_QUIET(ifp_p->if_vnet); + bzero((char *)&sdl, sizeof(sdl)); sdl.sdl_len = sizeof(sdl); sdl.sdl_family = AF_LINK; @@ -456,6 +458,7 @@ return (error); } + CURVNET_RESTORE(); return (0); } ==== //depot/projects/vimage-commit2/src/sys/net/route.c#8 (text+ko) ==== @@ -1316,7 +1316,8 @@ { INIT_VNET_NET(curvnet); /* XXX dst may be overwritten, can we move this to below */ - struct radix_node_head *rnh = V_rt_tables[rt->rt_fibnum][dst->sa_family]; + struct radix_node_head *rnh = + V_rt_tables[rt->rt_fibnum][dst->sa_family]; int dlen = SA_SIZE(dst), glen = SA_SIZE(gate); again: ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#9 (text+ko) ==== @@ -415,7 +415,8 @@ case RTM_GET: case RTM_CHANGE: case RTM_LOCK: - rnh = V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; + rnh = + V_rt_tables[so->so_fibnum][info.rti_info[RTAX_DST]->sa_family]; if (rnh == NULL) senderr(EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK(rnh); ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#10 (text+ko) ==== @@ -103,12 +103,15 @@ static int useloopback = 1; /* use loopback interface for local traffic */ static int arp_proxyall = 0; -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW, - &arp_maxtries, 0, "ARP resolution attempts before returning error"); -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW, - &useloopback, 0, "Use the loopback interface for local traffic"); -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW, - &arp_proxyall, 0, "Enable proxy ARP for all suitable requests"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, maxtries, + CTLFLAG_RW, arp_maxtries, 0, + "ARP resolution attempts before returning error"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, useloopback, + CTLFLAG_RW, useloopback, 0, + "Use the loopback interface for local traffic"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, proxyall, + CTLFLAG_RW, arp_proxyall, 0, + "Enable proxy ARP for all suitable requests"); static void arp_init(void); static void arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *); ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#7 (text+ko) ==== @@ -82,8 +82,8 @@ static struct igmpstat igmpstat; -SYSCTL_STRUCT(_net_inet_igmp, IGMPCTL_STATS, stats, CTLFLAG_RW, &igmpstat, - igmpstat, ""); +SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_igmp, IGMPCTL_STATS, + stats, CTLFLAG_RW, igmpstat, igmpstat, ""); /* * igmp_mtx protects all mutable global variables in igmp.c, as well as the ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#8 (text+ko) ==== @@ -67,11 +67,12 @@ static void in_purgemaddrs(struct ifnet *); static int subnetsarelocal = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, - &subnetsarelocal, 0, "Treat all subnets as directly connected"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, subnets_are_local, + CTLFLAG_RW, subnetsarelocal, 0, + "Treat all subnets as directly connected"); static int sameprefixcarponly = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, same_prefix_carp_only, CTLFLAG_RW, - &sameprefixcarponly, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, same_prefix_carp_only, + CTLFLAG_RW, sameprefixcarponly, 0, "Refuse to create same prefixes on different interfaces"); extern struct inpcbinfo ripcbinfo; ==== //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#7 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include - #include #include @@ -87,8 +86,8 @@ }; static int ip_gif_ttl = GIF_TTL; -SYSCTL_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, - &ip_gif_ttl, 0, ""); +SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl, + CTLFLAG_RW, ip_gif_ttl, 0, ""); int in_gif_output(struct ifnet *ifp, int family, struct mbuf *m) ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#11 (text+ko) ==== @@ -136,30 +136,37 @@ SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0, "IP Ports"); -SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst, CTLTYPE_INT|CTLFLAG_RW, - &ipport_lowfirstauto, 0, &sysctl_net_ipport_check, "I", ""); -SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast, CTLTYPE_INT|CTLFLAG_RW, - &ipport_lowlastauto, 0, &sysctl_net_ipport_check, "I", ""); -SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, first, CTLTYPE_INT|CTLFLAG_RW, - &ipport_firstauto, 0, &sysctl_net_ipport_check, "I", ""); -SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, last, CTLTYPE_INT|CTLFLAG_RW, - &ipport_lastauto, 0, &sysctl_net_ipport_check, "I", ""); -SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst, CTLTYPE_INT|CTLFLAG_RW, - &ipport_hifirstauto, 0, &sysctl_net_ipport_check, "I", ""); -SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hilast, CTLTYPE_INT|CTLFLAG_RW, - &ipport_hilastauto, 0, &sysctl_net_ipport_check, "I", ""); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, reservedhigh, - CTLFLAG_RW|CTLFLAG_SECURE, &ipport_reservedhigh, 0, ""); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, reservedlow, - CTLFLAG_RW|CTLFLAG_SECURE, &ipport_reservedlow, 0, ""); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomized, CTLFLAG_RW, - &ipport_randomized, 0, "Enable random port allocation"); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomcps, CTLFLAG_RW, - &ipport_randomcps, 0, "Maximum number of random port " - "allocations before switching to a sequental one"); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomtime, CTLFLAG_RW, - &ipport_randomtime, 0, "Minimum time to keep sequental port " - "allocation before switching to a random one"); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + lowfirst, CTLTYPE_INT|CTLFLAG_RW, ipport_lowfirstauto, 0, + &sysctl_net_ipport_check, "I", ""); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + lowlast, CTLTYPE_INT|CTLFLAG_RW, ipport_lowlastauto, 0, + &sysctl_net_ipport_check, "I", ""); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + first, CTLTYPE_INT|CTLFLAG_RW, ipport_firstauto, 0, + &sysctl_net_ipport_check, "I", ""); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + last, CTLTYPE_INT|CTLFLAG_RW, ipport_lastauto, 0, + &sysctl_net_ipport_check, "I", ""); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + hifirst, CTLTYPE_INT|CTLFLAG_RW, ipport_hifirstauto, 0, + &sysctl_net_ipport_check, "I", ""); +SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + hilast, CTLTYPE_INT|CTLFLAG_RW, ipport_hilastauto, 0, + &sysctl_net_ipport_check, "I", ""); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, + reservedhigh, CTLFLAG_RW|CTLFLAG_SECURE, ipport_reservedhigh, 0, ""); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, reservedlow, + CTLFLAG_RW|CTLFLAG_SECURE, ipport_reservedlow, 0, ""); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, randomized, + CTLFLAG_RW, ipport_randomized, 0, "Enable random port allocation"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, randomcps, + CTLFLAG_RW, ipport_randomcps, 0, "Maximum number of random port " + "allocations before switching to a sequental one"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_portrange, OID_AUTO, randomtime, + CTLFLAG_RW, ipport_randomtime, 0, + "Minimum time to keep sequental port " + "allocation before switching to a random one"); /* * in_pcb.c: manage the Protocol Control Blocks. ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#8 (text+ko) ==== @@ -152,17 +152,19 @@ } static int rtq_reallyold = 60*60; /* one hour is "really old" */ -SYSCTL_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire, CTLFLAG_RW, - &rtq_reallyold, 0, "Default expiration time on dynamically learned routes"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_RTEXPIRE, rtexpire, + CTLFLAG_RW, rtq_reallyold, 0, + "Default expiration time on dynamically learned routes"); static int rtq_minreallyold = 10; /* never automatically crank down to less */ -SYSCTL_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire, CTLFLAG_RW, - &rtq_minreallyold, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_RTMINEXPIRE, + rtminexpire, CTLFLAG_RW, rtq_minreallyold, 0, "Minimum time to attempt to hold onto dynamically learned routes"); static int rtq_toomany = 128; /* 128 cached routes is "too many" */ -SYSCTL_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache, CTLFLAG_RW, - &rtq_toomany, 0, "Upper limit on dynamically learned routes"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_RTMAXCACHE, + rtmaxcache, CTLFLAG_RW, rtq_toomany, 0, + "Upper limit on dynamically learned routes"); /* * On last reference drop, mark the route as belong to us so that it can be ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#7 (text+ko) ==== @@ -107,8 +107,8 @@ #include static int ipfastforward_active = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, fastforwarding, CTLFLAG_RW, - &ipfastforward_active, 0, "Enable fast IP forwarding"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, fastforwarding, + CTLFLAG_RW, ipfastforward_active, 0, "Enable fast IP forwarding"); static struct sockaddr_in * ip_findroute(struct route *ro, struct in_addr dest, struct mbuf *m) ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#15 (text+ko) ==== @@ -65,6 +65,7 @@ #include #include #include + #include #include #include @@ -164,22 +165,22 @@ #ifdef SYSCTL_NODE SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall"); -SYSCTL_PROC(_net_inet_ip_fw, OID_AUTO, enable, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, &fw_enable, 0, +SYSCTL_V_PROC(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, enable, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, fw_enable, 0, ipfw_chg_hook, "I", "Enable ipfw"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, autoinc_step, CTLFLAG_RW, - &autoinc_step, 0, "Rule number autincrement step"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, one_pass, - CTLFLAG_RW | CTLFLAG_SECURE3, - &fw_one_pass, 0, +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, autoinc_step, + CTLFLAG_RW, autoinc_step, 0, "Rule number autincrement step"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, one_pass, + CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0, "Only do a single pass through ipfw when using dummynet(4)"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, - &fw_debug, 0, "Enable printing of debug ip_fw statements"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose, +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, + fw_debug, 0, "Enable printing of debug ip_fw statements"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose, CTLFLAG_RW | CTLFLAG_SECURE3, - &fw_verbose, 0, "Log matches to ipfw rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, - &verbose_limit, 0, "Set upper limit of matches of ipfw rules logged"); + fw_verbose, 0, "Log matches to ipfw rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose_limit, + CTLFLAG_RW, + verbose_limit, 0, "Set upper limit of matches of ipfw rules logged"); /* * Description of dynamic rules. @@ -256,30 +257,32 @@ static u_int32_t dyn_count; /* # of dynamic rules */ static u_int32_t dyn_max = 4096; /* max # of dynamic rules */ -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_buckets, CTLFLAG_RW, - &dyn_buckets, 0, "Number of dyn. buckets"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, CTLFLAG_RD, - &curr_dyn_buckets, 0, "Current Number of dyn. buckets"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_count, CTLFLAG_RD, - &dyn_count, 0, "Number of dyn. rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_max, CTLFLAG_RW, - &dyn_max, 0, "Max number of dyn. rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, static_count, CTLFLAG_RD, - &static_count, 0, "Number of static rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, CTLFLAG_RW, - &dyn_ack_lifetime, 0, "Lifetime of dyn. rules for acks"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, CTLFLAG_RW, - &dyn_syn_lifetime, 0, "Lifetime of dyn. rules for syn"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, CTLFLAG_RW, - &dyn_fin_lifetime, 0, "Lifetime of dyn. rules for fin"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, CTLFLAG_RW, - &dyn_rst_lifetime, 0, "Lifetime of dyn. rules for rst"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, CTLFLAG_RW, - &dyn_udp_lifetime, 0, "Lifetime of dyn. rules for UDP"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, CTLFLAG_RW, - &dyn_short_lifetime, 0, "Lifetime of dyn. rules for other situations"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW, - &dyn_keepalive, 0, "Enable keepalives for dyn. rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_buckets, + CTLFLAG_RW, dyn_buckets, 0, "Number of dyn. buckets"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, + CTLFLAG_RD, curr_dyn_buckets, 0, "Current Number of dyn. buckets"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_count, + CTLFLAG_RD, dyn_count, 0, "Number of dyn. rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_max, + CTLFLAG_RW, dyn_max, 0, "Max number of dyn. rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, static_count, + CTLFLAG_RD, static_count, 0, "Number of static rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, + CTLFLAG_RW, dyn_ack_lifetime, 0, "Lifetime of dyn. rules for acks"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, + CTLFLAG_RW, dyn_syn_lifetime, 0, "Lifetime of dyn. rules for syn"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, + CTLFLAG_RW, dyn_fin_lifetime, 0, "Lifetime of dyn. rules for fin"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, + CTLFLAG_RW, dyn_rst_lifetime, 0, "Lifetime of dyn. rules for rst"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, + CTLFLAG_RW, dyn_udp_lifetime, 0, "Lifetime of dyn. rules for UDP"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, + CTLFLAG_RW, dyn_short_lifetime, 0, + "Lifetime of dyn. rules for other situations"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_keepalive, + CTLFLAG_RW, dyn_keepalive, 0, "Enable keepalives for dyn. rules"); + #ifdef INET6 /* @@ -4482,7 +4485,7 @@ continue; if ( (q->state & BOTH_SYN) != BOTH_SYN) continue; - if (TIME_LEQ( time_uptime+V_dyn_keepalive_interval, + if (TIME_LEQ( time_uptime + V_dyn_keepalive_interval, q->expire)) continue; /* too early */ if (TIME_LEQ(q->expire, time_uptime)) ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#7 (text+ko) ==== @@ -78,8 +78,8 @@ */ struct icmpstat icmpstat; -SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RW, - &icmpstat, icmpstat, ""); +SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats, + CTLFLAG_RW, icmpstat, icmpstat, ""); static int icmpmaskrepl = 0; SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW, ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#10 (text+ko) ==== @@ -88,31 +88,32 @@ int rsvp_on = 0; int ipforwarding = 0; -SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding, CTLFLAG_RW, - &ipforwarding, 0, "Enable IP forwarding between interfaces"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_FORWARDING, + forwarding, CTLFLAG_RW, ipforwarding, 0, + "Enable IP forwarding between interfaces"); static int ipsendredirects = 1; /* XXX */ -SYSCTL_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_RW, - &ipsendredirects, 0, "Enable sending IP redirects"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_SENDREDIRECTS, + redirect, CTLFLAG_RW, ipsendredirects, 0, + "Enable sending IP redirects"); int ip_defttl = IPDEFTTL; -SYSCTL_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW, - &ip_defttl, 0, "Maximum TTL on IP packets"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_DEFTTL, + ttl, CTLFLAG_RW, ip_defttl, 0, "Maximum TTL on IP packets"); static int ip_keepfaith = 0; -SYSCTL_INT(_net_inet_ip, IPCTL_KEEPFAITH, keepfaith, CTLFLAG_RW, - &ip_keepfaith, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_KEEPFAITH, + keepfaith, CTLFLAG_RW, ip_keepfaith, 0, "Enable packet capture for FAITH IPv4->IPv6 translater daemon"); static int ip_sendsourcequench = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, sendsourcequench, CTLFLAG_RW, - &ip_sendsourcequench, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, + sendsourcequench, CTLFLAG_RW, ip_sendsourcequench, 0, "Enable the transmission of source quench packets"); int ip_do_randomid = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, random_id, CTLFLAG_RW, - &ip_do_randomid, 0, - "Assign random ip_id values"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, random_id, + CTLFLAG_RW, ip_do_randomid, 0, "Assign random ip_id values"); /* * XXX - Setting ip_checkinterface mostly implements the receive side of @@ -128,8 +129,9 @@ * packets for those addresses are received. */ static int ip_checkinterface = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, check_interface, CTLFLAG_RW, - &ip_checkinterface, 0, "Verify packet arrives on correct interface"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, + check_interface, CTLFLAG_RW, ip_checkinterface, 0, + "Verify packet arrives on correct interface"); struct pfil_head inet_pfil_hook; /* Packet filter hooks */ @@ -150,8 +152,8 @@ "Number of packets dropped from the IP input queue"); struct ipstat ipstat; -SYSCTL_STRUCT(_net_inet_ip, IPCTL_STATS, stats, CTLFLAG_RW, - &ipstat, ipstat, "IP statistics (struct ipstat, netinet/ip_var.h)"); +SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_ip, IPCTL_STATS, stats, CTLFLAG_RW, + ipstat, ipstat, "IP statistics (struct ipstat, netinet/ip_var.h)"); /* * IP datagram reassembly. @@ -176,12 +178,13 @@ static int maxnipq; /* Administrative limit on # reass queues. */ static int nipq = 0; /* Total # of reass queues */ -SYSCTL_INT(_net_inet_ip, OID_AUTO, fragpackets, CTLFLAG_RD, - &nipq, 0, "Current number of IPv4 fragment reassembly queue entries"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, fragpackets, + CTLFLAG_RD, nipq, 0, + "Current number of IPv4 fragment reassembly queue entries"); static int maxfragsperpacket; -SYSCTL_INT(_net_inet_ip, OID_AUTO, maxfragsperpacket, CTLFLAG_RW, - &maxfragsperpacket, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, maxfragsperpacket, + CTLFLAG_RW, maxfragsperpacket, 0, "Maximum number of IPv4 fragments allowed per packet"); struct callout ipport_tick_callout; @@ -193,8 +196,8 @@ #ifdef IPSTEALTH int ipstealth = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, stealth, CTLFLAG_RW, - &ipstealth, 0, "IP stealth mode, no TTL decrementation on forwarding"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, stealth, CTLFLAG_RW, + ipstealth, 0, "IP stealth mode, no TTL decrementation on forwarding"); #endif /* ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#9 (text+ko) ==== @@ -155,28 +155,35 @@ static int sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS); static void tcp_hc_purge(void *); -SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0, "TCP Host cache"); +SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0, + "TCP Host cache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, - &tcp_hostcache.cache_limit, 0, "Overall entry limit for hostcache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, cachelimit, + CTLFLAG_RDTUN, tcp_hostcache.cache_limit, 0, + "Overall entry limit for hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, hashsize, CTLFLAG_RDTUN, - &tcp_hostcache.hashsize, 0, "Size of TCP hostcache hashtable"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, hashsize, + CTLFLAG_RDTUN, tcp_hostcache.hashsize, 0, + "Size of TCP hostcache hashtable"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, - &tcp_hostcache.bucket_limit, 0, "Per-bucket hash limit for hostcache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, bucketlimit, + CTLFLAG_RDTUN, tcp_hostcache.bucket_limit, 0, + "Per-bucket hash limit for hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, count, CTLFLAG_RD, - &tcp_hostcache.cache_count, 0, "Current number of entries in hostcache"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, count, + CTLFLAG_RD, tcp_hostcache.cache_count, 0, + "Current number of entries in hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, expire, CTLFLAG_RW, - &tcp_hostcache.expire, 0, "Expire time of TCP hostcache entries"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, expire, + CTLFLAG_RW, tcp_hostcache.expire, 0, + "Expire time of TCP hostcache entries"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, prune, CTLFLAG_RW, - &tcp_hostcache.prune, 0, "Time between purge runs"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, prune, + CTLFLAG_RW, tcp_hostcache.prune, 0, "Time between purge runs"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, purge, CTLFLAG_RW, - &tcp_hostcache.purgeall, 0, "Expire all entires on next purge run"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, purge, + CTLFLAG_RW, tcp_hostcache.purgeall, 0, + "Expire all entires on next purge run"); SYSCTL_PROC(_net_inet_tcp_hostcache, OID_AUTO, list, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP, 0, 0, ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#11 (text+ko) ==== @@ -100,60 +100,65 @@ static const int tcprexmtthresh = 3; struct tcpstat tcpstat; -SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats, CTLFLAG_RW, - &tcpstat , tcpstat, "TCP statistics (struct tcpstat, netinet/tcp_var.h)"); +SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_STATS, stats, + CTLFLAG_RW, tcpstat , tcpstat, + "TCP statistics (struct tcpstat, netinet/tcp_var.h)"); int tcp_log_in_vain = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_in_vain, CTLFLAG_RW, &tcp_log_in_vain, 0, "Log all incoming TCP segments to closed ports"); static int blackhole = 0; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, blackhole, CTLFLAG_RW, - &blackhole, 0, "Do not send RST on segments to closed ports"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, blackhole, CTLFLAG_RW, + blackhole, 0, "Do not send RST on segments to closed ports"); int tcp_delack_enabled = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, delayed_ack, CTLFLAG_RW, - &tcp_delack_enabled, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, delayed_ack, + CTLFLAG_RW, tcp_delack_enabled, 0, "Delay ACK to try and piggyback it onto a data packet"); static int drop_synfin = 0; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, drop_synfin, CTLFLAG_RW, - &drop_synfin, 0, "Drop TCP packets with SYN+FIN set"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, drop_synfin, + CTLFLAG_RW, drop_synfin, 0, "Drop TCP packets with SYN+FIN set"); static int tcp_do_rfc3042 = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc3042, CTLFLAG_RW, - &tcp_do_rfc3042, 0, "Enable RFC 3042 (Limited Transmit)"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, rfc3042, CTLFLAG_RW, + tcp_do_rfc3042, 0, "Enable RFC 3042 (Limited Transmit)"); static int tcp_do_rfc3390 = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc3390, CTLFLAG_RW, - &tcp_do_rfc3390, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, rfc3390, CTLFLAG_RW, + tcp_do_rfc3390, 0, "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)"); -int tcp_do_ecn = 0; -int tcp_ecn_maxretries = 1; SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); -SYSCTL_INT(_net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, - &tcp_do_ecn, 0, "TCP ECN support"); -SYSCTL_INT(_net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW, - &tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); + +int tcp_do_ecn = 0; +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, + CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); + +int tcp_ecn_maxretries = 1; +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries, + CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); static int tcp_insecure_rst = 0; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_rst, CTLFLAG_RW, - &tcp_insecure_rst, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, insecure_rst, + CTLFLAG_RW, tcp_insecure_rst, 0, "Follow the old (insecure) criteria for accepting RST packets"); int tcp_do_autorcvbuf = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_auto, CTLFLAG_RW, - &tcp_do_autorcvbuf, 0, "Enable automatic receive buffer sizing"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, recvbuf_auto, + CTLFLAG_RW, tcp_do_autorcvbuf, 0, + "Enable automatic receive buffer sizing"); int tcp_autorcvbuf_inc = 16*1024; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_inc, CTLFLAG_RW, - &tcp_autorcvbuf_inc, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, recvbuf_inc, + CTLFLAG_RW, tcp_autorcvbuf_inc, 0, "Incrementor step size of automatic receive buffer"); int tcp_autorcvbuf_max = 256*1024; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_max, CTLFLAG_RW, - &tcp_autorcvbuf_max, 0, "Max size of automatic receive buffer"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, recvbuf_max, + CTLFLAG_RW, tcp_autorcvbuf_max, 0, + "Max size of automatic receive buffer"); struct inpcbhead tcb; #define tcb6 tcb /* for KAME src sync over BSD*'s */ ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#11 (text+ko) ==== @@ -88,36 +88,42 @@ #endif int path_mtu_discovery = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, path_mtu_discovery, CTLFLAG_RW, - &path_mtu_discovery, 1, "Enable Path MTU Discovery"); + +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, path_mtu_discovery, + CTLFLAG_RW, path_mtu_discovery, 1, "Enable Path MTU Discovery"); int ss_fltsz = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, slowstart_flightsize, CTLFLAG_RW, - &ss_fltsz, 1, "Slow start flight size"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, + slowstart_flightsize, CTLFLAG_RW, + ss_fltsz, 1, "Slow start flight size"); int ss_fltsz_local = 4; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, local_slowstart_flightsize, CTLFLAG_RW, - &ss_fltsz_local, 1, "Slow start flight size for local networks"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, + local_slowstart_flightsize, CTLFLAG_RW, + ss_fltsz_local, 1, "Slow start flight size for local networks"); int tcp_do_newreno = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, newreno, CTLFLAG_RW, - &tcp_do_newreno, 0, "Enable NewReno Algorithms"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, newreno, CTLFLAG_RW, + tcp_do_newreno, 0, "Enable NewReno Algorithms"); int tcp_do_tso = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tso, CTLFLAG_RW, - &tcp_do_tso, 0, "Enable TCP Segmentation Offload"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, tso, CTLFLAG_RW, + tcp_do_tso, 0, "Enable TCP Segmentation Offload"); int tcp_do_autosndbuf = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, sendbuf_auto, CTLFLAG_RW, - &tcp_do_autosndbuf, 0, "Enable automatic send buffer sizing"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_auto, + CTLFLAG_RW, + tcp_do_autosndbuf, 0, "Enable automatic send buffer sizing"); int tcp_autosndbuf_inc = 8*1024; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, sendbuf_inc, CTLFLAG_RW, - &tcp_autosndbuf_inc, 0, "Incrementor step size of automatic send buffer"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_inc, + CTLFLAG_RW, tcp_autosndbuf_inc, 0, + "Incrementor step size of automatic send buffer"); int tcp_autosndbuf_max = 256*1024; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, sendbuf_max, CTLFLAG_RW, - &tcp_autosndbuf_max, 0, "Max size of automatic send buffer"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, sendbuf_max, + CTLFLAG_RW, tcp_autosndbuf_max, 0, + "Max size of automatic send buffer"); /* ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#7 (text+ko) ==== @@ -78,29 +78,30 @@ "TCP Segment Reassembly Queue"); static int tcp_reass_maxseg = 0; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxsegments, CTLFLAG_RDTUN, - &tcp_reass_maxseg, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, maxsegments, + CTLFLAG_RDTUN, tcp_reass_maxseg, 0, "Global maximum number of TCP Segments in Reassembly Queue"); int tcp_reass_qsize = 0; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, cursegments, CTLFLAG_RD, - &tcp_reass_qsize, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, cursegments, + CTLFLAG_RD, tcp_reass_qsize, 0, "Global number of TCP Segments currently in Reassembly Queue"); static int tcp_reass_maxqlen = 48; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, maxqlen, CTLFLAG_RW, - &tcp_reass_maxqlen, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, maxqlen, + CTLFLAG_RW, tcp_reass_maxqlen, 0, "Maximum number of TCP Segments per individual Reassembly Queue"); static int tcp_reass_overflows = 0; -SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, overflows, CTLFLAG_RD, - &tcp_reass_overflows, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_reass, OID_AUTO, overflows, + CTLFLAG_RD, tcp_reass_overflows, 0, "Global number of TCP Segment Reassembly Queue Overflows"); /* Initialize TCP reassembly queue */ static void tcp_reass_zone_change(void *tag) { + INIT_VNET_INET(curvnet); V_tcp_reass_maxseg = nmbclusters / 16; uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#7 (text+ko) ==== @@ -126,23 +126,23 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, sack, CTLFLAG_RW, 0, "TCP SACK"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 25 06:43:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3D9B1065698; Mon, 25 Aug 2008 06:43: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 640471065691 for ; Mon, 25 Aug 2008 06:43:21 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAFA78FC1D for ; Mon, 25 Aug 2008 06:43:21 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P6hLuv050504 for ; Mon, 25 Aug 2008 06:43:21 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P6hLCl050502 for perforce@freebsd.org; Mon, 25 Aug 2008 06:43:21 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 06:43:21 GMT Message-Id: <200808250643.m7P6hLCl050502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148356 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, 25 Aug 2008 06:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=148356 Change 148356 by julian@julian_trafmon1 on 2008/08/25 06:43:14 fix a typo and kill 2 branches with one stone. Affected files ... .. //depot/doc/obliterate#20 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#17 edit Differences ... ==== //depot/doc/obliterate#20 (text+ko) ==== @@ -7,6 +7,8 @@ //depot/projects/kmacy_sun4v/doc/... //depot/projects/kmacy_sun4v/www/... //depot/projects/peter/pmap/... +//depot/projects/vimage-commit/... +//depot/projects/vimage-commit3/... //depot/projects/pmap/... //depot/projects/opensolaris/... //depot/user/ceri/css/... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -*- +/*- * Copyright (c) 2001 McAfee, Inc. * Copyright (c) 2006 Andre Oppermann, Internet Business Solutions AG * All rights reserved. From owner-p4-projects@FreeBSD.ORG Mon Aug 25 07:03:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51CB1065680; Mon, 25 Aug 2008 07:03: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 7000A1065670 for ; Mon, 25 Aug 2008 07:03:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6F1D88FC0C for ; Mon, 25 Aug 2008 07:03:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P73gWo053157 for ; Mon, 25 Aug 2008 07:03:42 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P73gYc053155 for perforce@freebsd.org; Mon, 25 Aug 2008 07:03:42 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 07:03:42 GMT Message-Id: <200808250703.m7P73gYc053155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148357 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, 25 Aug 2008 07:03:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=148357 Change 148357 by julian@julian_trafmon1 on 2008/08/25 07:03:18 IFC@148354 Affected files ... .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis_quirks.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#7 integrate .. //depot/projects/vimage/src/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#40 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#32 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#18 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#62 integrate Differences ... ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#20 (text+ko) ==== @@ -39,8 +39,10 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.121 2008/08/25 04:55:29 julian Exp $"); #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#12 (text+ko) ==== @@ -26,8 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); #include #include ==== //depot/projects/vimage/src/sys/dev/pccard/pccard_cis_quirks.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.17 2007/10/12 08:26:15 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.18 2008/08/25 04:59:43 imp Exp $"); #define PCCARDDEBUG @@ -137,6 +137,27 @@ 0, /* maxtwins */ }; +static struct pccard_function pccard_3c1_func0 = { + 0, /* function number */ + PCCARD_FUNCTION_NETWORK, + 0x05, /* last cfe number */ + 0x400, /* ccr_base */ + 0x267, /* ccr_mask */ +}; + +static struct pccard_config_entry pccard_3c1_func0_cfe0 = { + 0x05, /* cfe number */ + PCCARD_CFE_IO8 | PCCARD_CFE_IO16 | PCCARD_CFE_IRQLEVEL, + PCCARD_IFTYPE_IO, + 1, /* num_iospace */ + 5, /* iomask */ + { { 0x0010, 0 } }, /* iospace */ + 0xffff, /* irqmask */ + 0, /* num_memspace */ + { }, /* memspace */ + 0, /* maxtwins */ +}; + static struct pccard_function pccard_sveclancard_func0 = { 0, /* function number */ PCCARD_FUNCTION_NETWORK, @@ -228,6 +249,8 @@ { PCMCIA_VENDOR_SIERRA, PCMCIA_PRODUCT_SIERRA_AC710, PCMCIA_CIS_INVALID, &pccard_sierra_a555_func1, &pccard_sierra_a555_func1_cfe0 }, + { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C1, PCMCIA_CIS_INVALID, + &pccard_3c1_func0, &pccard_3c1_func0_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD, &pccard_sveclancard_func0, &pccard_sveclancard_func0_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E, ==== //depot/projects/vimage/src/sys/dev/usb/uipaq.c#7 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.12 2008/08/02 12:15:18 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.15 2008/08/25 02:42:13 imp Exp $"); #include #include @@ -119,16 +119,465 @@ u_int16_t uv_flags; }; +/* + * Much of this list is generated from lists of other drivers that support + * the same hardware. Numeric values are used where no usbdevs entries + * exist. + */ static const struct uipaq_type uipaq_devs[] = { + {{ 0x0104, 0x00be }, 0}, /* Socket USB Sync */ + {{ 0x04ad, 0x0301 }, 0}, /* USB Sync 0301 */ + {{ 0x04ad, 0x0302 }, 0}, /* USB Sync 0302 */ + {{ 0x04ad, 0x0303 }, 0}, /* USB Sync 0303 */ + {{ 0x04ad, 0x0306 }, 0}, /* GPS Pocket PC USB Sync */ + {{ 0x0536, 0x01a0 }, 0}, /* HHP PDT */ + {{ 0x067e, 0x1001 }, 0}, /* Intermec Mobile Computer */ + {{ 0x094b, 0x0001 }, 0}, /* Linkup Systems USB Sync */ + {{ 0x0960, 0x0065 }, 0}, /* BCOM USB Sync 0065 */ + {{ 0x0960, 0x0066 }, 0}, /* BCOM USB Sync 0066 */ + {{ 0x0960, 0x0067 }, 0}, /* BCOM USB Sync 0067 */ + {{ 0x0961, 0x0010 }, 0}, /* Portatec USB Sync */ + {{ 0x099e, 0x0052 }, 0}, /* Trimble GeoExplorer */ + {{ 0x099e, 0x4000 }, 0}, /* TDS Data Collector */ + {{ 0x0c44, 0x03a2 }, 0}, /* Motorola iDEN Smartphone */ + {{ 0x0c8e, 0x6000 }, 0}, /* Cesscom Luxian Series */ + {{ 0x0cad, 0x9001 }, 0}, /* Motorola PowerPad Pocket PCDevice */ + {{ 0x0f4e, 0x0200 }, 0}, /* Freedom Scientific USB Sync */ + {{ 0x0f98, 0x0201 }, 0}, /* Cyberbank USB Sync */ + {{ 0x0fb8, 0x3001 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x3002 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x3003 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x4001 }, 0}, /* Wistron USB Sync */ + {{ 0x1066, 0x00ce }, 0}, /* E-TEN USB Sync */ + {{ 0x1066, 0x0300 }, 0}, /* E-TEN P3XX Pocket PC */ + {{ 0x1066, 0x0500 }, 0}, /* E-TEN P5XX Pocket PC */ + {{ 0x1066, 0x0600 }, 0}, /* E-TEN P6XX Pocket PC */ + {{ 0x1066, 0x0700 }, 0}, /* E-TEN P7XX Pocket PC */ + {{ 0x1114, 0x0001 }, 0}, /* Psion Teklogix Sync 753x */ + {{ 0x1114, 0x0004 }, 0}, /* Psion Teklogix Sync netBookPro */ + {{ 0x1114, 0x0006 }, 0}, /* Psion Teklogix Sync 7525 */ + {{ 0x1182, 0x1388 }, 0}, /* VES USB Sync */ + {{ 0x11d9, 0x1002 }, 0}, /* Rugged Pocket PC 2003 */ + {{ 0x11d9, 0x1003 }, 0}, /* Rugged Pocket PC 2003 */ + {{ 0x1231, 0xce01 }, 0}, /* USB Sync 03 */ + {{ 0x1231, 0xce02 }, 0}, /* USB Sync 03 */ + {{ 0x3340, 0x011c }, 0}, /* Mio DigiWalker PPC StrongARM */ + {{ 0x3340, 0x0326 }, 0}, /* Mio DigiWalker 338 */ + {{ 0x3340, 0x0426 }, 0}, /* Mio DigiWalker 338 */ + {{ 0x3340, 0x043a }, 0}, /* Mio DigiWalker USB Sync */ + {{ 0x3340, 0x051c }, 0}, /* MiTAC USB Sync 528 */ + {{ 0x3340, 0x053a }, 0}, /* Mio DigiWalker SmartPhone USB Sync */ + {{ 0x3340, 0x071c }, 0}, /* MiTAC USB Sync */ + {{ 0x3340, 0x0b1c }, 0}, /* Generic PPC StrongARM */ + {{ 0x3340, 0x0e3a }, 0}, /* Generic PPC USB Sync */ + {{ 0x3340, 0x0f1c }, 0}, /* Itautec USB Sync */ + {{ 0x3340, 0x0f3a }, 0}, /* Generic SmartPhone USB Sync */ + {{ 0x3340, 0x1326 }, 0}, /* Itautec USB Sync */ + {{ 0x3340, 0x191c }, 0}, /* YAKUMO USB Sync */ + {{ 0x3340, 0x2326 }, 0}, /* Vobis USB Sync */ + {{ 0x3340, 0x3326 }, 0}, /* MEDION Winodws Moble USB Sync */ + {{ 0x3708, 0x20ce }, 0}, /* Legend USB Sync */ + {{ 0x3708, 0x21ce }, 0}, /* Lenovo USB Sync */ + {{ 0x4113, 0x0210 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0211 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0400 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0410 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4505, 0x0010 }, 0}, /* Smartphone */ + {{ 0x5e04, 0xce00 }, 0}, /* SAGEM Wireless Assistant */ + {{ USB_VENDOR_ACER, 0x1631 }, 0}, /* c10 Series */ + {{ USB_VENDOR_ACER, 0x1632 }, 0}, /* c20 Series */ + {{ USB_VENDOR_ACER, 0x16e1 }, 0}, /* Acer n10 Handheld USB Sync */ + {{ USB_VENDOR_ACER, 0x16e2 }, 0}, /* Acer n20 Handheld USB Sync */ + {{ USB_VENDOR_ACER, 0x16e3 }, 0}, /* Acer n30 Handheld USB Sync */ + {{ USB_VENDOR_ASUS, 0x4200 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x4201 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x4202 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x9200 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x9202 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_P535 }, 0}, + {{ USB_VENDOR_CASIO, 0x2001 }, 0}, /* CASIO USB Sync 2001 */ + {{ USB_VENDOR_CASIO, 0x2003 }, 0}, /* CASIO USB Sync 2003 */ + {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0}, + {{ USB_VENDOR_COMPAL, 0x0531 }, 0}, /* MyGuide 7000 XL USB Sync */ + {{ USB_VENDOR_COMPAQ, 0x0032 }, 0}, /* Compaq iPAQ USB Sync */ + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0}, + {{ USB_VENDOR_DELL, 0x4001 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4002 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4003 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4004 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4005 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4006 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4007 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4008 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4009 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_FSC, 0x1001 }, 0}, /* Fujitsu Siemens Computers USB Sync */ + {{ USB_VENDOR_FUJITSU, 0x1058 }, 0}, /* FUJITSU USB Sync */ + {{ USB_VENDOR_FUJITSU, 0x1079 }, 0}, /* FUJITSU USB Sync */ + {{ USB_VENDOR_GIGASET, 0x0601 }, 0}, /* Askey USB Sync */ + {{ USB_VENDOR_HITACHI, 0x0014 }, 0}, /* Hitachi USB Sync */ + {{ USB_VENDOR_HP, 0x1216 }, 0}, /* HP USB Sync 1612 */ + {{ USB_VENDOR_HP, 0x2016 }, 0}, /* HP USB Sync 1620 */ + {{ USB_VENDOR_HP, 0x2116 }, 0}, /* HP USB Sync 1621 */ + {{ USB_VENDOR_HP, 0x2216 }, 0}, /* HP USB Sync 1622 */ + {{ USB_VENDOR_HP, 0x3016 }, 0}, /* HP USB Sync 1630 */ + {{ USB_VENDOR_HP, 0x3116 }, 0}, /* HP USB Sync 1631 */ + {{ USB_VENDOR_HP, 0x3216 }, 0}, /* HP USB Sync 1632 */ + {{ USB_VENDOR_HP, 0x4016 }, 0}, /* HP USB Sync 1640 */ + {{ USB_VENDOR_HP, 0x4116 }, 0}, /* HP USB Sync 1641 */ + {{ USB_VENDOR_HP, 0x4216 }, 0}, /* HP USB Sync 1642 */ + {{ USB_VENDOR_HP, 0x5016 }, 0}, /* HP USB Sync 1650 */ + {{ USB_VENDOR_HP, 0x5116 }, 0}, /* HP USB Sync 1651 */ + {{ USB_VENDOR_HP, 0x5216 }, 0}, /* HP USB Sync 1652 */ {{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0}, - {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0}, + {{ USB_VENDOR_HTC, 0x00cf }, 0}, /* HTC USB Modem */ + {{ USB_VENDOR_HTC, 0x0a01 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a02 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a03 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a04 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a05 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a06 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a07 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a08 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a09 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a10 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a11 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a12 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a13 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a14 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a15 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a16 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a17 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a18 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a19 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a1f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a20 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a21 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a22 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a23 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a24 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a25 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a26 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a27 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a28 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a29 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a2f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a30 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a31 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a32 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a33 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a34 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a35 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a36 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a37 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a38 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a39 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a3f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a40 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a41 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a42 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a43 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a44 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a45 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a46 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a47 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a48 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a49 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a4f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a50 }, 0}, /* HTC SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a52 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a53 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a54 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a55 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a56 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a57 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a58 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a59 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a5f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a60 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a61 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a62 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a63 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a64 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a65 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a66 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a67 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a68 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a69 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a6f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a70 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a71 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a72 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a73 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a74 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a75 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a76 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a77 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a78 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a79 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a7f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a80 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a81 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a82 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a83 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a84 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a85 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a86 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a87 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a88 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a89 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a8f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a90 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a91 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a92 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a93 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a94 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a95 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a96 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a97 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a98 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a99 }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9a }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9b }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9c }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9d }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9e }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0a9f }, 0}, /* SmartPhone USB Sync */ + {{ USB_VENDOR_HTC, 0x0bce }, 0}, /* "High Tech Computer Corp" */ {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_PPC6700MODEM }, 0}, {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_SMARTPHONE }, 0}, - {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0}, - {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0}, + {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0}, + {{ USB_VENDOR_JVC, 0x3011 }, 0}, /* JVC USB Sync */ + {{ USB_VENDOR_JVC, 0x3012 }, 0}, /* JVC USB Sync */ + {{ USB_VENDOR_LG, 0x9c01 }, 0}, /* LGE USB Sync */ + {{ USB_VENDOR_MICROSOFT, 0x00ce }, 0}, /* Microsoft USB Sync */ + {{ USB_VENDOR_MICROSOFT, 0x0400 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0401 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0402 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0403 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0404 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0405 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0406 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0407 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0408 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0409 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040a }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040b }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040c }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040d }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040e }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x040f }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0410 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0411 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0412 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0413 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0414 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0415 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0416 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0417 }, 0}, /* Windows Pocket PC 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x0432 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0433 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0434 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0435 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0436 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0437 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0438 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0439 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x043f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0440 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0441 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0442 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0443 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0444 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0445 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0446 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0447 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0448 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0449 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x044f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0450 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0451 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0452 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0453 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0454 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0455 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0456 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0457 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0458 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0459 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x045f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0460 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0461 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0462 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0463 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0464 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0465 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0466 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0467 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0468 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0469 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046c }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046d }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046e }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x046f }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0470 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0471 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0472 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0473 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0474 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0475 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0476 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0477 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0478 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x0479 }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x047a }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x047b }, 0}, /* Windows Pocket PC 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04c8 }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04c9 }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04ca }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04cb }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04cc }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04cd }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04ce }, 0}, /* Windows Smartphone 2002 */ + {{ USB_VENDOR_MICROSOFT, 0x04d7 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04d8 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04d9 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04da }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04db }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04dc }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04dd }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04de }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04df }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e0 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e1 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e2 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e3 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e4 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e5 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e6 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e7 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e8 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04e9 }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MICROSOFT, 0x04ea }, 0}, /* Windows Smartphone 2003 */ + {{ USB_VENDOR_MOTOROLA2, 0x4204 }, 0}, /* Motorola MPx200 Smartphone */ + {{ USB_VENDOR_MOTOROLA2, 0x4214 }, 0}, /* Motorola MPc GSM */ + {{ USB_VENDOR_MOTOROLA2, 0x4224 }, 0}, /* Motorola MPx220 Smartphone */ + {{ USB_VENDOR_MOTOROLA2, 0x4234 }, 0}, /* Motorola MPc CDMA */ + {{ USB_VENDOR_MOTOROLA2, 0x4244 }, 0}, /* Motorola MPx100 Smartphone */ + {{ USB_VENDOR_NEC, 0x00d5 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x00d6 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x00d7 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x8024 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_NEC, 0x8025 }, 0}, /* NEC USB Sync */ + {{ USB_VENDOR_PANASONIC, 0x2500 }, 0}, /* Panasonic USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f00 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f01 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f02 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f03 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x5f04 }, 0}, /* Samsung NEXiO USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6611 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6613 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6615 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6617 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6619 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x661b }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x662e }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6630 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SAMSUNG, 0x6632 }, 0}, /* Samsung MITs USB Sync */ + {{ USB_VENDOR_SHARP, 0x9102 }, 0}, /* SHARP WS003SH USB Modem */ + {{ USB_VENDOR_SHARP, 0x9121 }, 0}, /* SHARP WS004SH USB Modem */ + {{ USB_VENDOR_SHARP, 0x9151 }, 0}, /* SHARP S01SH USB Modem */ {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ES }, 0}, - {{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_P535 }, 0}, + {{ USB_VENDOR_SYMBOL, 0x2000 }, 0}, /* Symbol USB Sync */ + {{ USB_VENDOR_SYMBOL, 0x2001 }, 0}, /* Symbol USB Sync 0x2001 */ + {{ USB_VENDOR_SYMBOL, 0x2002 }, 0}, /* Symbol USB Sync 0x2002 */ + {{ USB_VENDOR_SYMBOL, 0x2003 }, 0}, /* Symbol USB Sync 0x2003 */ + {{ USB_VENDOR_SYMBOL, 0x2004 }, 0}, /* Symbol USB Sync 0x2004 */ + {{ USB_VENDOR_SYMBOL, 0x2005 }, 0}, /* Symbol USB Sync 0x2005 */ + {{ USB_VENDOR_SYMBOL, 0x2006 }, 0}, /* Symbol USB Sync 0x2006 */ + {{ USB_VENDOR_SYMBOL, 0x2007 }, 0}, /* Symbol USB Sync 0x2007 */ + {{ USB_VENDOR_SYMBOL, 0x2008 }, 0}, /* Symbol USB Sync 0x2008 */ + {{ USB_VENDOR_SYMBOL, 0x2009 }, 0}, /* Symbol USB Sync 0x2009 */ + {{ USB_VENDOR_SYMBOL, 0x200a }, 0}, /* Symbol USB Sync 0x200a */ + {{ USB_VENDOR_TOSHIBA, 0x0700 }, 0}, /* TOSHIBA USB Sync 0700 */ + {{ USB_VENDOR_TOSHIBA, 0x0705 }, 0}, /* TOSHIBA Pocket PC e310 */ + {{ USB_VENDOR_TOSHIBA, 0x0707 }, 0}, /* TOSHIBA Pocket PC e330 Series */ + {{ USB_VENDOR_TOSHIBA, 0x0708 }, 0}, /* TOSHIBA Pocket PC e350Series */ + {{ USB_VENDOR_TOSHIBA, 0x0709 }, 0}, /* TOSHIBA Pocket PC e750 Series */ + {{ USB_VENDOR_TOSHIBA, 0x070a }, 0}, /* TOSHIBA Pocket PC e400 Series */ + {{ USB_VENDOR_TOSHIBA, 0x070b }, 0}, /* TOSHIBA Pocket PC e800 Series */ + {{ USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740 }, 0}, /* TOSHIBA Pocket PC e740 */ + {{ USB_VENDOR_VIEWSONIC, 0x0ed9 }, 0}, /* ViewSonic Color Pocket PC V35 */ + {{ USB_VENDOR_VIEWSONIC, 0x1527 }, 0}, /* ViewSonic Color Pocket PC V36 */ + {{ USB_VENDOR_VIEWSONIC, 0x1529 }, 0}, /* ViewSonic Color Pocket PC V37 */ + {{ USB_VENDOR_VIEWSONIC, 0x152b }, 0}, /* ViewSonic Color Pocket PC V38 */ + {{ USB_VENDOR_VIEWSONIC, 0x152e }, 0}, /* ViewSonic Pocket PC */ + {{ USB_VENDOR_VIEWSONIC, 0x1921 }, 0}, /* ViewSonic Communicator Pocket PC */ + {{ USB_VENDOR_VIEWSONIC, 0x1922 }, 0}, /* ViewSonic Smartphone */ + {{ USB_VENDOR_VIEWSONIC, 0x1923 }, 0}, /* ViewSonic Pocket PC V30 */ }; #define uipaq_lookup(v, p) ((const struct uipaq_type *)usb_lookup(uipaq_devs, v, p)) @@ -151,6 +600,7 @@ static int uipaq_attach(device_t self) { + usb_device_request_t req; struct uipaq_softc *sc = device_get_softc(self); struct usb_attach_arg *uaa = device_get_ivars(self); usbd_device_handle dev = uaa->device; @@ -212,7 +662,21 @@ ucom->sc_bulkin_no, ucom->sc_bulkout_no); return (ENXIO); } - + /* + * Send magic bytes, cribbed from Linux ipaq driver that claims + * to have sniffed them from Win98. + */ + req.bmRequestType = UT_WRITE_CLASS_INTERFACE; + req.bRequest = UCDC_SET_CONTROL_LINE_STATE; + USETW(req.wValue, UCDC_LINE_DTR); + USETW(req.wIndex, 0x0); + USETW(req.wLength, 0); + for (i = 0; i < 100; i++) { + err = usbd_do_request_flags(ucom->sc_udev, &req, NULL, 0, NULL, 100); + if (!err) + break; + usbd_delay_ms(dev, 1000); + } ucom_attach(&sc->sc_ucom); return (0); bad: ==== //depot/projects/vimage/src/sys/dev/vx/if_vx_eisa.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.27 2007/02/23 12:18:59 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.28 2008/08/25 05:20:17 imp Exp $"); #include #include @@ -69,13 +69,13 @@ { switch (type) { case EISA_DEVICE_ID_3COM_3C592: - return "3Com 3C592 Network Adapter"; + return "3Com 3C592"; case EISA_DEVICE_ID_3COM_3C597_TX: - return "3Com 3C597-TX Network Adapter"; + return "3Com 3C597-TX"; case EISA_DEVICE_ID_3COM_3C597_T4: - return "3Com 3C597-T4 Network Adapter"; + return "3Com 3C597-T4"; case EISA_DEVICE_ID_3COM_3C597_MII: - return "3Com 3C597-MII Network Adapter"; + return "3Com 3C597-MII"; default: break; } ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.4 2008/05/28 23:20:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ddb.c,v 1.5 2008/08/25 05:20:29 julian Exp $"); #include "opt_ddb.h" #include "opt_wlan.h" @@ -36,9 +36,8 @@ #include #include #include +#include #include - -#include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#40 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.189 2008/08/20 01:05:56 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.190 2008/08/25 05:38:18 julian Exp $"); #define DEB(x) #define DDB(x) x ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#31 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.341 2008/08/20 01:24:55 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.342 2008/08/25 05:49:16 julian Exp $"); #include "opt_bootp.h" #include "opt_ipfw.h" ==== //depot/projects/vimage/src/sys/netinet/ip_var.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.103 2008/08/17 23:27:27 bz Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.104 2008/08/25 05:49:16 julian Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -247,7 +247,7 @@ if (V_ip_do_randomid) return ip_randomid(); - return htons(ip_id++); + return htons(V_ip_id++); } #else #define ip_newid() (V_ip_do_randomid ? ip_randomid() : V_ip_id++) ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#32 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.236 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.237 2008/08/25 05:57:56 julian Exp $"); #include "opt_ipfw.h" #include "opt_inet6.h" ==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.51 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.52 2008/08/25 06:09:32 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/vimage/src/sys/sys/vimage.h#62 (text+ko) ==== @@ -26,7 +26,7 @@ * LIABILITY, OR TORT (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/vimage.h,v 1.2 2008/08/18 13:16:19 bz Exp $ + * $FreeBSD: src/sys/sys/vimage.h,v 1.4 2008/08/25 05:49:16 julian Exp $ */ #ifndef _SYS_VIMAGE_H_ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 07:29:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEE411065677; Mon, 25 Aug 2008 07:29:08 +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 A23DB1065672 for ; Mon, 25 Aug 2008 07:29:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A27778FC0C for ; Mon, 25 Aug 2008 07:29:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P7T8ZM055251 for ; Mon, 25 Aug 2008 07:29:08 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P7T8BJ055249 for perforce@freebsd.org; Mon, 25 Aug 2008 07:29:08 GMT (envelope-from julian@freebsd.org) Date: Mon, 25 Aug 2008 07:29:08 GMT Message-Id: <200808250729.m7P7T8BJ055249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148358 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, 25 Aug 2008 07:29:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=148358 Change 148358 by julian@julian_trafmon1 on 2008/08/25 07:28:52 Geez, diff the right branches.. Affected files ... .. //depot/projects/vimage-commit2/makemeat.pl#2 edit Differences ... ==== //depot/projects/vimage-commit2/makemeat.pl#2 (text+ko) ==== @@ -2,11 +2,11 @@ use POSIX (strftime); -$src_base = '//depot/projects/vimage-commit/src/sys'; +$src_base = '//depot/projects/vimage-commit2/src/sys'; $dst_base = '//depot/projects/vimage/src/sys'; -$dst_label = ''; +$dst_label = '#head'; -$cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; +$cmd = "p4 diff2 -du $src_base/... $dst_base/..."; open(P, "$cmd |") || die $!; $time = localtime(); From owner-p4-projects@FreeBSD.ORG Mon Aug 25 09:03:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05F381065681; Mon, 25 Aug 2008 09:03: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 BCF3D1065671 for ; Mon, 25 Aug 2008 09:03:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B783E8FC17 for ; Mon, 25 Aug 2008 09:03:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P93nU1080460 for ; Mon, 25 Aug 2008 09:03:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P93nLI080458 for perforce@freebsd.org; Mon, 25 Aug 2008 09:03:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 09:03:49 GMT Message-Id: <200808250903.m7P93nLI080458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148363 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, 25 Aug 2008 09:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=148363 Change 148363 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 09:03:33 Remove a todo item to add a privilege to escape from capability mode: that's not desired. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#8 (text+ko) ==== @@ -38,8 +38,6 @@ diverse set of rights. Should we do something more fine-grained and request a specific capability based on arguments and other context? -- Should there be a priv(9) privilege to expand capability rights? (no) - - Refine access control on sysctl infrastructure sysctls, such as name lookup, etc. From owner-p4-projects@FreeBSD.ORG Mon Aug 25 09:14:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E9311065676; Mon, 25 Aug 2008 09:14: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 2A7EB1065674 for ; Mon, 25 Aug 2008 09:14:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 264C18FC0C for ; Mon, 25 Aug 2008 09:14:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P9DxIR081265 for ; Mon, 25 Aug 2008 09:13:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P9DxGp081263 for perforce@freebsd.org; Mon, 25 Aug 2008 09:13:59 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 Aug 2008 09:13:59 GMT Message-Id: <200808250913.m7P9DxGp081263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148364 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, 25 Aug 2008 09:14:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=148364 Change 148364 by trasz@trasz_traszkan on 2008/08/25 09:13:08 Improve acl_is_trivial_np(3) API. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#23 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#3 (text+ko) ==== @@ -355,7 +355,7 @@ { acl_t acl; acl_type_t source_type, dest_type; - int source_acl_supported = 0, dest_acl_supported = 0; + int source_acl_supported = 0, dest_acl_supported = 0, trivial; if (fpathconf(source_fd, _PC_ACL_EXTENDED) == 1) { source_acl_supported = 1; @@ -386,7 +386,12 @@ return (1); } - if (acl_is_trivial_np(acl)) + if (acl_is_trivial_np(acl, &trivial)) { + warn("acl_is_trivial() failed"); + return (1); + } + + if (trivial) return (0); if (source_type != dest_type) { ==== //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#4 (text+ko) ==== @@ -616,7 +616,7 @@ aclmode(char *buf, const FTSENT *p, int *haveacls) { char name[MAXPATHLEN + 1]; - int type = ACL_TYPE_ACCESS, ret; + int type = ACL_TYPE_ACCESS, ret, trivial; acl_t facl; /* @@ -662,7 +662,12 @@ return; if ((facl = acl_get_file(name, type)) != NULL) { - if (!acl_is_trivial_np(facl)) + if (acl_is_trivial_np(facl, &trivial)) { + warn("%s", name); + return; + } + + if (!trivial) buf[10] = '+'; acl_free(facl); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#5 (text+ko) ==== @@ -440,7 +440,7 @@ { acl_t acl; acl_type_t source_type, dest_type; - int source_acl_supported = 0, dest_acl_supported = 0; + int source_acl_supported = 0, dest_acl_supported = 0, trivial; if (fpathconf(source_fd, _PC_ACL_EXTENDED) == 1) { source_acl_supported = 1; @@ -471,7 +471,12 @@ return (1); } - if (acl_is_trivial_np(acl)) + if (acl_is_trivial_np(acl, &trivial)) { + warn("acl_is_trivial() failed"); + return (1); + } + + if (trivial) return (0); if (source_type != dest_type) { ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#3 (text+ko) ==== @@ -39,13 +39,18 @@ .In sys/types.h .In sys/acl.h .Ft int -.Fn acl_is_trivial_np "const acl_t acl" +.Fn acl_is_trivial_np "const acl_t aclp" "int *trivialp" .Sh DESCRIPTION The .Fn acl_is_trivial function determines whether the ACL pointed to by the argument .Va acl is trivial. +Upon successful completion, the location referred to by the argument +.Fa trivialp +will be set to 1, if the ACL +.Fa aclp +points to is trivial, or 0 if it's not. .Pp ACL is trivial if it can be fully expressed as a file mode without loosing any access rules. @@ -55,9 +60,7 @@ File having non-trivial ACL have a plus sign appended after mode bits in "ls -al" output. .Sh RETURN VALUES -The -.Fn acl_is_trivial -function returns 0 if the ACL is not trivial, non-zero otherwise. +.Rv -std acl_get_tag_type .Sh SEE ALSO .Xr acl 3 , .Xr posix1e 3 ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#3 (text+ko) ==== @@ -155,15 +155,22 @@ * of the mode bits in "ls -l" output ;-) */ int -acl_is_trivial_np(acl_t aclp) +acl_is_trivial_np(const acl_t aclp, int *trivialp) { acl_t tmpacl; int differs; + if (aclp == NULL || trivialp == NULL) { + errno = EINVAL; + return (-1); + } + switch (_acl_brand(aclp)) { case ACL_BRAND_POSIX: if (aclp->ats_acl.acl_cnt == 3) - return (1); + *trivialp = 1; + else + *trivialp = 0; return (0); @@ -173,21 +180,22 @@ * with the original. */ tmpacl = acl_strip_np(aclp, 0); - /* XXX: This sucks. Can this happen at all? */ if (tmpacl == NULL) - return (0); + return (-1); differs = _acl_differs(aclp, tmpacl); acl_free(tmpacl); if (differs) - return (0); + *trivialp = 0; + else + *trivialp = 1; - return (1); + return (0); default: errno = EINVAL; - return (0); + return (-1); } } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#23 (text+ko) ==== @@ -375,7 +375,7 @@ int acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl); int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl); int acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl); -int acl_is_trivial_np(const acl_t _acl); +int acl_is_trivial_np(const acl_t _acl, int *_trivialp); acl_t acl_strip_np(const acl_t _acl, int recalculate_mask); __END_DECLS From owner-p4-projects@FreeBSD.ORG Mon Aug 25 09:22:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2173C106567A; Mon, 25 Aug 2008 09:22: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 D92CC1065679 for ; Mon, 25 Aug 2008 09:22:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D51258FC1E for ; Mon, 25 Aug 2008 09:22:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P9M8ON081987 for ; Mon, 25 Aug 2008 09:22:08 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P9M80G081985 for perforce@freebsd.org; Mon, 25 Aug 2008 09:22:08 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 Aug 2008 09:22:08 GMT Message-Id: <200808250922.m7P9M80G081985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148365 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, 25 Aug 2008 09:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=148365 Change 148365 by trasz@trasz_traszkan on 2008/08/25 09:22:03 Make mac_biba, mac_lomac and mac_mls granularity-compliant. NOTE: I have no idea if this works. I didn't test it. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#5 (text+ko) ==== @@ -2830,11 +2830,11 @@ obj = SLOT(vplabel); /* XXX privilege override for admin? */ - if (acc_mode & (VREAD | VEXEC | VSTAT)) { + if (acc_mode & (VREAD | VEXEC | VSTAT_PERMS)) { if (!biba_dominate_effective(obj, subj)) return (EACCES); } - if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { + if (acc_mode & VMODIFY_PERMS) { if (!biba_dominate_effective(subj, obj)) return (EACCES); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#4 (text+ko) ==== @@ -2378,7 +2378,7 @@ obj = SLOT(vplabel); /* XXX privilege override for admin? */ - if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { + if (acc_mode & VMODIFY_PERMS) { if (!lomac_subject_dominate(subj, obj)) return (EACCES); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#5 (text+ko) ==== @@ -2453,11 +2453,11 @@ obj = SLOT(vplabel); /* XXX privilege override for admin? */ - if (acc_mode & (VREAD | VEXEC | VSTAT)) { + if (acc_mode & (VREAD | VEXEC | VSTAT_PERMS)) { if (!mls_dominate_effective(subj, obj)) return (EACCES); } - if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { + if (acc_mode & VMODIFY_PERMS) { if (!mls_dominate_effective(obj, subj)) return (EACCES); } From owner-p4-projects@FreeBSD.ORG Mon Aug 25 09:41:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C74871065674; Mon, 25 Aug 2008 09:41: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 72FCF106568D for ; Mon, 25 Aug 2008 09:41:28 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EADF8FC32 for ; Mon, 25 Aug 2008 09:41:28 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P9fSpE083577 for ; Mon, 25 Aug 2008 09:41:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P9fSLl083575 for perforce@freebsd.org; Mon, 25 Aug 2008 09:41:28 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 Aug 2008 09:41:28 GMT Message-Id: <200808250941.m7P9fSLl083575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148368 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, 25 Aug 2008 09:41:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=148368 Change 148368 by trasz@trasz_traszkan on 2008/08/25 09:40:54 Tests for passing multiple file names to setfacl(1). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#45 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#4 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#45 (text+ko) ==== @@ -2,9 +2,6 @@ - Add support for NFS4 ACLs to tar(1). -- Add unit test to verify correct operation if several file names - are given to getfacl(1) and setfacl(1). - - Clean up #defines. For example, make VREAD_NAMED_ATTRS equal to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#7 (text+ko) ==== @@ -150,8 +150,6 @@ $ rm yyy -# XXX: Test mv. Need more than one filesystem for that. - # Test removing entries by... by example? $ setfacl -x everyone@::deny xxx $ getfacl -n xxx @@ -177,8 +175,67 @@ > everyone@:-wxp---A-W-Co-:------:deny > everyone@:r-----a-R-c--s:------:allow +$ ls -l xxx | cut -d' ' -f1 +> -rw-r--r-- + +# Check setfacl(1) and getfacl(1) with multiple files. +$ touch xxx yyy zzz + +$ ls -l xxx yyy zzz | cut -d' ' -f1 +> -rw-r--r-- +> -rw-r--r-- +> -rw-r--r-- + +$ setfacl -m u:42:x:allow,g:43:w:allow nnn xxx yyy zzz +> setfacl: nnn: acl_get_file() failed: No such file or directory + +$ ls -l nnn xxx yyy zzz | cut -d' ' -f1 +> ls: nnn: No such file or directory +> -rw-r--r--+ +> -rw-r--r--+ +> -rw-r--r--+ + +$ getfacl -nq nnn xxx yyy zzz +> getfacl: nnn: stat() failed: No such file or directory +> user:42:--x-----------:------:allow +> group:43:-w------------:------:allow +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> group@:-wxp----------:------:deny +> group@:r-------------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow +> +> user:42:--x-----------:------:allow +> group:43:-w------------:------:allow +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> group@:-wxp----------:------:deny +> group@:r-------------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow +> +> user:42:--x-----------:------:allow +> group:43:-w------------:------:allow +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> group@:-wxp----------:------:deny +> group@:r-------------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow + +$ setfacl -b nnn xxx yyy zzz +> setfacl: nnn: acl_get_file() failed: No such file or directory + +$ ls -l nnn xxx yyy zzz | cut -d' ' -f1 +> ls: nnn: No such file or directory +> -rw-r--r-- +> -rw-r--r-- +> -rw-r--r-- + +$ rm xxx yyy zzz + # Test applying mode to an ACL. -$ rm xxx $ touch xxx $ setfacl -a0 user:42:r:allow,user:43:w:deny,user:43:w:allow,user:44:x:allow -x everyone@::allow xxx $ chmod 600 xxx ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#4 (text+ko) ==== @@ -83,8 +83,6 @@ $ rm yyy -# XXX: Test mv. Need more than one filesystem for that. - # Test removing entries by... by example? $ setfacl -m u:42:r,g:43:w xxx $ setfacl -x u:42: xxx @@ -124,7 +122,59 @@ $ ls -l xxx | cut -d' ' -f1 > -rw-r--r-- +# Check setfacl(1) and getfacl(1) with multiple files. +$ touch xxx yyy zzz + +$ ls -l xxx yyy zzz | cut -d' ' -f1 +> -rw-r--r-- +> -rw-r--r-- +> -rw-r--r-- + +$ setfacl -m u:42:x,g:43:w nnn xxx yyy zzz +> setfacl: nnn: acl_get_file() failed: No such file or directory + +$ ls -l nnn xxx yyy zzz | cut -d' ' -f1 +> ls: nnn: No such file or directory +> -rw-rwxr--+ +> -rw-rwxr--+ +> -rw-rwxr--+ + +$ getfacl -nq nnn xxx yyy zzz +> getfacl: nnn: stat() failed: No such file or directory +> user::rw- +> user:42:--x +> group::r-- +> group:43:-w- +> mask::rwx +> other::r-- +> +> user::rw- +> user:42:--x +> group::r-- +> group:43:-w- +> mask::rwx +> other::r-- +> +> user::rw- +> user:42:--x +> group::r-- +> group:43:-w- +> mask::rwx +> other::r-- + +$ setfacl -b nnn xxx yyy zzz +> setfacl: nnn: acl_get_file() failed: No such file or directory + +$ ls -l nnn xxx yyy zzz | cut -d' ' -f1 +> ls: nnn: No such file or directory +> -rw-r--r--+ +> -rw-r--r--+ +> -rw-r--r--+ + +$ rm xxx yyy zzz + # Check whether chmod actually does what it should do. +$ touch xxx $ setfacl -m u:42:rwx,g:43:rwx xxx $ chmod 600 xxx $ getfacl -n xxx From owner-p4-projects@FreeBSD.ORG Mon Aug 25 10:36:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74EFD106567A; Mon, 25 Aug 2008 10:36: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 1F2101065675 for ; Mon, 25 Aug 2008 10:36:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 197938FC14 for ; Mon, 25 Aug 2008 10:36:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PAaNwK089125 for ; Mon, 25 Aug 2008 10:36:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PAaNEH089123 for perforce@freebsd.org; Mon, 25 Aug 2008 10:36:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 10:36:23 GMT Message-Id: <200808251036.m7PAaNEH089123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148370 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, 25 Aug 2008 10:36:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=148370 Change 148370 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 10:36:00 Review, annotate, and in some cases revise the list of system calls permitted in capability mode. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#19 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#11 (text+ko) ==== @@ -1,66 +1,93 @@ -# -# Copyright (c) 2008 Robert N. M. Watson -# All rights reserved. -# -# WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED -# ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND -# UNEXPECTED WAYS. -# -# This software was developed at the University of Cambridge Computer -# Laboratory with support from a grant from Google, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (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$ -# -# List of system calls enabled in capability mode, one name per line. -# -# Notes: -# - sys_exit() and close() are very important. -# - Sorted alphabetically, please keep it that way. -# -# $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#10 $ -# +## +## Copyright (c) 2008 Robert N. M. Watson +## All rights reserved. +## +## WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED +## ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND +## UNEXPECTED WAYS. +## +## This software was developed at the University of Cambridge Computer +## Laboratory with support from a grant from Google, Inc. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions +## are met: +## 1. Redistributions of source code must retain the above copyright +## notice, this list of conditions and the following disclaimer. +## 2. Redistributions in binary form must reproduce the above copyright +## notice, this list of conditions and the following disclaimer in the +## documentation and/or other materials provided with the distribution. +## +## THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +## ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +## OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +## LIABILITY, OR TORT (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$ +## +## List of system calls enabled in capability mode, one name per line. +## +## Notes: +## - sys_exit(2), abort2(2) and close(2) are very important. +## - Sorted alphabetically, please keep it that way. +## +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#11 $ +## + +## +## Allow ACL and MAC label operations by file descriptor, subject to +## capability rights. Allow MAC label operations on the current process but +## we will need to scope __mac_get_pid(2). +## __acl_aclcheck_fd __acl_delete_fd __acl_get_fd __acl_set_fd __mac_get_fd -# -# __mac_get_pid need scoping -# -__mac_get_pid +#__mac_get_pid __mac_get_proc __mac_set_fd __mac_set_proc -# -# Certain sysctls need more scoping -# + +## +## Allow sysctl(2) as we scope internal to the call; this is a global +## namespace, but there are several critical sysctls required for almost +## anything to run, such as hw.pagesize. For now that policy lives in the +## kernel for performance and simplicity, but perhaps it could move to a +## proxying daemon in userspace. +## __sysctl + +## +## Allow umtx operations as these are scoped by address space. +## +## XXRW: Need to check this very carefully. +## _umtx_lock _umtx_op _umtx_unlock + +## +## Allow process termination using abort2(2). +## abort2 + +## +## Allow accept(2) since it doesn't manipulate namespaces directly, rather +## relies on existing bindings on a socket, subject to capability rights. +## accept + +## +## Allow AIO operations by file descriptor, subject to capability rights. +## aio_cancel aio_error aio_fsync @@ -69,168 +96,423 @@ aio_suspend aio_waitcomplete aio_write -# -# What to do about audit()? -# + +## +## audit(2) is a global operation, submitting to the global trail, but it is +## controlled by privilege, and it might be useful to be able to submit +## records from sandboxes. For now, disallow, but we may want to think about +## providing some sort of proxy service for this. +## #audit + +## +## Allow bind(2) for now, even though it operates on global name spaces, as +## we support CAP_BIND. +## +## XXXRW: Revisit this. +## bind + +## +## Allow capability mode and capability system calls. +## cap_enter cap_getmode cap_getrights cap_new + +## +## Allow read-only clock operations. +## clock_gettime clock_getres + +## +## Always allow file descriptor close(2). +## close + +## +## Allow connect(2) for now, ven though it supports global namespaces, we +## we support CAP_CONNECT. +## +## XXXRW: Revisit this. +## connect -# -# cpuset(2) and related calls require scoping. -# + +## +## cpuset(2) and related calls require scoping by process, but should +## eventually be allowed, at least in the current process case. +## #cpuset #cpuset_getaffinity #cpuset_getid #cpuset_setaffinity #cpuset_setid + +## +## Always allow dup(2) and dup2(2) manipulation of the file descriptor table. +## dup dup2 -eaccess + +## +## Allow extended attribute operations by file descriptor, subject to +## capability rights. +## extattr_delete_fd extattr_get_fd extattr_list_fd extattr_set_fd + +## +## Allow changing file flags, mode, and owner by file descriptor, subject to +## capability rights. +## fchflags fchmod fchown -# -# Need to review fcntl operations for global affects that might need to be -# scoped. -# + +## +## For now, allow fcntly(2), subject to capability rights, but this probably +## needs additional scoping. +## fcntl + +## +## Allow fexecve(2), subject to capability rights. We perform some scoping, +## such as disallowing privilege escalation. +## fexecve + +## +## Allow flock(2), subject to capability rights. +## flock + +## +## Allow fork(2). +## fork + +## +## Allow fpathconf(2), subject to capability rights. +## fpathconf + +## +## Allow various file descriptor-based I/O operations, subject to capability +## rights. mmap(2) requires further attention. +## freebsd6_ftruncate freebsd6_lseek freebsd6_mmap freebsd6_pread freebsd6_pwrite + +## +## Allow querying file and file system state with fstat(2) and fstatfs(2), +## subject to capability rights. +## fstat fstatfs + +## +## Allow further file descriptor-based I/O operations, subject to capability +## rights. +## fsync ftruncate + +## +## Allow futimes(2), subject to capability rights. +## futimes + +## +## Allow querying process audit state, subject to normal access control. +## getaudit getaudit_addr getauid + +## +## Allow thread context management with getcontext(2). +## getcontext + +## +## Allow directory I/O on a file descriptor, subject to capability rights. +## Originally we had separate capabilities for directory-specific read +## operations, but on BSD we allow reading the raw directory data, so we just +## rely on CAP_READ (etc) now. +## +## XXXRW: Possibly these should also use CAP_SEEK. +## getdents getdirentries + +## +## Allow querying certain trivial global state. +## getdomainname + +## +## Allow querying current process credential state. +## getegid geteuid + +## +## Allow querying certain trivial global state. +## gethostid gethostname + +## +## Allow querying per-process timer. +## getitimer + +## +## Allow querying current process credential state. +## getgid getgroups -# -# Should we allow getlogin? -# -#getlogin +getlogin + +## +## Allow querying certain trivial global state. +## getpagesize getpeername -# -# getpgid needs scoping. -# + +## +## Allow querying certain per-process scheduling, resource limit, and +## credential state. +## +## XXXRW: getpgid(2) needs scoping. It's not clear if it's worth scoping +## getppid(2). getpriority(2) needs scoping. getrusage(2) needs scoping. +## getsid(2) needs scoping. +## getpgid getpgrp getpid -# -# getppid might or might not need scoping. -# getppid getpriority getresgid getresuid getrlimit -# -# getrusage needs scoping. -# getrusage -# -# getsid needs scoping. -# getsid + +## +## Allow querying socket state, subject to capability rights. +## +## XXXRW: getsockopt(2) may need more attention. +## getsockname getsockopt + +## +## Allow querying the global clock. +## gettimeofday + +## +## Allow querying current process credential state. +## getuid -# -# ioctl is dangerous. -# -ioctl + +## +## Disallow ioctl(2) for now, as frequently ioctl(2) operations have global +## scope, but this is a tricky one as it is also required for tty control. +## We do have a capability right for this operation. +## +## XXXRW: This needs to be revisited. +## +#ioctl + +## +## Allow querying current process credential state. +## issetugid + +## +## Allow kevent(2), as we will authorize based on capability rights on the +## target descriptor. +## +## XXXRW: Do we do this? +## kevent + +## +## Allow message queue operations on file descriptors, subject to capability +## rights. +## kmq_notify kmq_setattr kmq_timedreceive kmq_timedsend -# -# kill needs scoping -# + +## +## For now, don't allow kill(2) and friends, but in the future we will need +## something here to allow inter-process signalling and control. +## +## XXXRW: Revisit. +## #kill #killpg + +## +## Allow kqueue(2), we will control use. +## kqueue + +## +## Allow threading-related system calls. +## +## XXXRW: These are obsolete, remove? +## kse_create kse_exit kse_release kse_switchin kse_thr_interrupt kse_wakeup + +## +## Allow managing per-process timers. +## ktimer_create ktimer_delete ktimer_getoverrun ktimer_gettime ktimer_settime -# -# ktrace needs scoping -# + +## +## We can't allow ktrace(2) because it relies on a global namespace, but we +## might want to introduce an fktrace(2) of some sort. +## #ktrace + +## +## Allow AIO operations by file descriptor, subject to capability rights. +## lio_listio + +## +## Allow listen(2), subject to capability rights. +## +## XXXRW: One might argue this manipulates a global namespace. +## listen + +## +## Allow I/O-related file descriptors, subject to capability rights. +## lseek + +## +## Allow MAC label operations by file descriptor, subject to capability +## rights. +## mac_get_fd mac_set_fd + +## +## Allow simple VM operations on the current process. +## madvise mincore minherit mlock mlockall -# -# mmap needs scoping -# + +## +## Allow memory mapping a file descriptor, and updating protections, subject +## to capability rights. +## +## XXXRW: We currently don't properly mask VM protections using capability +## rights. +## mmap mprotect + +## +## Allow simple VM operations on the current process. +## msync munlock munlockall munmap + +## +## Allow the current process to sleep. +## nanosleep + +## +## Allow querying the global clock. +## ntp_gettime + +## +## Allow AIO operations by file descriptor, subject to capability rights. +## oaio_read oaio_write + +## +## Allow simple VM operations on the current process. +## obreak + +## +## Allow AIO operations by file descriptor, subject to capability rights. +## olio_listio + +## +## Allow poll(2), which will be scoped by capability rights. +## +## XXXRW: Perhaps we don't need the OpenBSD version? +## XXXRW: We don't yet do that scoping. +## openbsd_poll + +## +## Allow pipe(2). +## pipe + +## +## Allow poll(2), which will be scoped by capability rights. +## XXXRW: We don't yet do that scoping. +## poll + +## +## Allow I/O-related file descriptors, subject to capability rights. +## pread preadv + +## +## Allow access to profiling state on the current process. +## profil -# -# ptrace needs scoping. -# + +## +## Disallow ptrace(2) for now, but we do need debugging facilities in +## capability mode, so we will want to revisit this, possibly by scoping its +## operation. +## #ptrace + +## +## Allow I/O-related file descriptors, subject to capability rights. +## pwrite pwritev read @@ -238,66 +520,146 @@ recv recvfrom recvmsg + +## +## Allow rfork(2). +## rfork -# -# rtprio needs scoping. -# + +## +## Allow real-time scheduling primitives to be used. +## +## XXXRW: These require scoping. +## rtprio rtprio_thread + +## +## Allow simple VM operations on the current process. +## sbrk + +## +## Allow querying trivial global scheduler state. +## sched_get_priority_max -sched_get_priority_mind -# -# sched_{get,set}* need scoping. -# +sched_get_priority_min + +## +## Allow various thread/process scheduler operations. +## +## XXXRW: Some of these require further scoping. +## sched_getparam sched_getscheduler sched_rr_getinterval sched_setparam sched_setscheduler sched_yield + +## +## Allow I/O-related file descriptors, subject to capability rights. +## sctp_generic_recvmsg sctp_generic_sendmsg sctp_generic_sendmsg_iov sctp_peeloff + +## +## Allow select(2), which will be scoped by capability rights. +## +## XXXRW: But is it? +## select + +## +## Allow I/O-related file descriptors, subject to capability rights. +## send sendfile sendmsg sendto + +## +## Allow setting per-process audit state, which is controlled separately by +## privileges. +## setaudit setaudit_addr setauid + +## +## Allow setting thread context. +## setcontext + +## +## Allow setting current process credential state, which is controlled +## separately by privilege. +## setegid seteuid setgid + +## +## Allow use of the process interval timer. +## setitimer -# -# Need to think about setpriority and capabilities. -# + +## +## Allow setpriority(2). +## +## XXXRW: Requires scoping. +## setpriority + +## +## Allow setting current process credential state, which is controlled +## separately by privilege. +## setregid setresgid setresuid setreuid + +## +## Allow setting process resource limits with setrlimit(2). +## setrlimit + +## +## Allow creating a new session with setsid(2). +## setsid -# -# Need to review socket options and decide what to do about ones that manage -# globally visible stack properties. -# + +## +## Allow setting socket options with setsockopt(2), subject to capability +## rights. +## +## XXXRW: Might require scoping. +## setsockopt -# -# Need to think hard about the safety of credential manipulation calls where -# the capability model and UNIX model intersect. -# + +## +## Allow setting current process credential state, which is controlled +## separately by privilege. +## setuid -# -# We allow shm_open(2), but only when used with anonymous objects. -# + +## +## Allow shm_open(2), which is scoped so as to allow only access to new +## anonymous objects. +## shm_open + +## +## Allow I/O-related file descriptors, subject to capability rights. +## shutdown + +## +## Allow signal control on current process. +## sigaction sigaltstack sigblock @@ -311,34 +673,87 @@ sigtimedwait sigvec sigwaitinfo + +## +## Allow creating new socket pairs with socketpair(2). +## socketpair + +## +## Allow simple VM operations on the current process. +## +## XXXRW: Kernel doesn't implement this, so drop? +## sstk -# -# sync isn't all that harmful, but is global. -# + +## +## Do allow sync(2) for now, but possibly shouldn't. +## sync + +## +## Always allow process termination with sys_exit(2). +## sys_exit + +## +## Allow thread operations operating only on current process. +## thr_create thr_exit thr_kill -# -# thr_kill2 needs scoping. -# + +## +## Disallow thr_kill2(2), as it may operate beyond the current process. +## +## XXXRW: Requires scoping. +## #thr_kill2 + +## +## Allow thread operations operating only on current process. +## thr_new thr_self thr_set_name thr_suspend thr_wake + +## +## Allow manipulation of the current process umask with umask(2). +## umask + +## +## Allow submitting of process trace entries with utrace(2). +## utrace + +## +## Allow generating UUIDs with uuidgen(2). +## uuidgen + +## +## Allow vfork(2). +## vfork -# -# wait and wait4 needs process scoping work -# + +## +## For now, allow wait(2), wait4(2), etc. +## +## XXXRW: These require scoping. +## wait wait4 + +## +## Allow I/O-related file descriptors, subject to capability rights. +## write writev + +## +## Allow processes to yield(2). +## yield ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#19 (text+ko) ==== @@ -77,12 +77,12 @@ { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 46 = old sigaction */ { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 47 = getgid */ { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 48 = old sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, 0 }, /* 49 = getlogin */ + { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED }, /* 49 = getlogin */ { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0, 0 }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 54 = ioctl */ + { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ @@ -361,7 +361,7 @@ { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 330 = sched_getscheduler */ { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 331 = sched_yield */ { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 332 = sched_get_priority_max */ - { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, 0 }, /* 333 = sched_get_priority_min */ + { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 333 = sched_get_priority_min */ { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0 }, /* 334 = sched_rr_get_interval */ { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 335 = utrace */ { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 336 = old sendfile */ @@ -404,7 +404,7 @@ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 373 = extattr_delete_fd */ { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0, 0 }, /* 374 = __setugid */ { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, SYF_CAPENABLED }, /* 376 = eaccess */ + { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, 0 }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 377 = afs_syscall */ { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0, 0 }, /* 378 = nmount */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 379 = kse_exit */ @@ -437,7 +437,7 @@ { AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 406 = ksem_unlink */ { AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 407 = ksem_getvalue */ { AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 408 = ksem_destroy */ - { AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 409 = __mac_get_pid */ + { AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL, NULL, 0, 0, 0 }, /* 409 = __mac_get_pid */ { AS(__mac_get_link_args), (sy_call_t *)__mac_get_link, AUE_NULL, NULL, 0, 0, 0 }, /* 410 = __mac_get_link */ { AS(__mac_set_link_args), (sy_call_t *)__mac_set_link, AUE_NULL, NULL, 0, 0, 0 }, /* 411 = __mac_set_link */ { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_EXTATTR_SET_LINK, NULL, 0, 0, 0 }, /* 412 = extattr_set_link */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#19 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#19 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#19 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#19 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#19 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 25 10:47:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA111106568B; Mon, 25 Aug 2008 10:47: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 8DA361065676 for ; Mon, 25 Aug 2008 10:47:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 886318FC60 for ; Mon, 25 Aug 2008 10:47:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PAlZgL090000 for ; Mon, 25 Aug 2008 10:47:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PAlZ6O089998 for perforce@freebsd.org; Mon, 25 Aug 2008 10:47:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 10:47:35 GMT Message-Id: <200808251047.m7PAlZ6O089998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148371 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, 25 Aug 2008 10:47:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=148371 Change 148371 by rwatson@rwatson_freebsd_capabilities on 2008/08/25 10:46:43 Add a new right, CAP_KEVENT, which controls use of a kqueue, to be disinguished from CAP_EVENT, which control use of a kqueue/select/ poll to monitor another descriptor. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_event.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#17 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_event.c#5 (text+ko) ==== @@ -702,7 +702,7 @@ struct file *fp; int i, n, nerrors, error; - if ((error = fget(td, fd, CAP_EVENT, &fp)) != 0) + if ((error = fget(td, fd, CAP_KEVENT, &fp)) != 0) return (error); if ((error = kqueue_acquire(fp, &kq)) != 0) goto done_norel; @@ -2016,7 +2016,7 @@ struct file *fp; int error; - if ((error = fget(td, fd, CAP_EVENT, &fp)) != 0) + if ((error = fget(td, fd, CAP_KEVENT, &fp)) != 0) return (error); if ((error = kqueue_acquire(fp, &kq)) != 0) goto noacquire; ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#17 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#16 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#17 $ */ /* @@ -87,7 +87,8 @@ #define CAP_SEM_POST 0x0000010000000000ULL /* ksem_post */ #define CAP_SEM_WAIT 0x0000020000000000ULL /* ksem_wait */ #define CAP_SEM_GETVALUE 0x0000040000000000ULL /* ksem_getvalue */ -#define CAP_MASK_VALID 0x000007ffffffffffULL +#define CAP_KEVENT 0x0000080000000000ULL /* kevent(2) */ +#define CAP_MASK_VALID 0x00000fffffffffffULL /* * Notes: @@ -100,7 +101,8 @@ * * pread and pwrite will not use CAP_SEEK. * - * CAP_EVENT covers select, poll, and kqueue registration for a capability. + * CAP_EVENT covers select, poll, and kqueue registration for a capability; + * CAP_KEVENT controls the use of a kqueue(2) description. * * sendfile is authorized using CAP_READ on the file and CAP_WRITE on the * socket. From owner-p4-projects@FreeBSD.ORG Mon Aug 25 13:45:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C1171065691; Mon, 25 Aug 2008 13:45: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 2F4B41065682 for ; Mon, 25 Aug 2008 13:45:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B0B18FC18 for ; Mon, 25 Aug 2008 13:45:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PDjZhv018670 for ; Mon, 25 Aug 2008 13:45:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PDjZr2018668 for perforce@freebsd.org; Mon, 25 Aug 2008 13:45:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 13:45:35 GMT Message-Id: <200808251345.m7PDjZr2018668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148377 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, 25 Aug 2008 13:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=148377 Change 148377 by rwatson@rwatson_fledge on 2008/08/25 13:44:46 cap.page is now privileges.page. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#8 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#8 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#7 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#8 $ STYLESHEET= page.xsl @@ -45,7 +45,7 @@ SRCS+= sebsd.page SRCS+= sedarwin.page SRCS+= audit.page -SRCS+= cap.page +SRCS+= privileges.page SRCS+= acls.page SRCS+= bsmtrace.page From owner-p4-projects@FreeBSD.ORG Mon Aug 25 13:47:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC2C71065677; Mon, 25 Aug 2008 13:47: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 77D2E1065674 for ; Mon, 25 Aug 2008 13:47:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 517FB8FC0A for ; Mon, 25 Aug 2008 13:47:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PDlccF018818 for ; Mon, 25 Aug 2008 13:47:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PDlcUw018816 for perforce@freebsd.org; Mon, 25 Aug 2008 13:47:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 13:47:38 GMT Message-Id: <200808251347.m7PDlcUw018816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148378 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, 25 Aug 2008 13:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=148378 Change 148378 by rwatson@rwatson_fledge on 2008/08/25 13:47:16 Continue general rename of capabilities -> privileges to prepare to put up pages on both the 8.x privileges project and the new capabilities project. Affected files ... .. //depot/projects/trustedbsd/www/components.page#10 edit .. //depot/projects/trustedbsd/www/developers.dev#3 edit .. //depot/projects/trustedbsd/www/mailinglists.page#4 edit .. //depot/projects/trustedbsd/www/privileges.page#2 edit .. //depot/projects/trustedbsd/www/sidebar.xml#11 edit Differences ... ==== //depot/projects/trustedbsd/www/components.page#10 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#9 $ + $P4: //depot/projects/trustedbsd/www/components.page#10 $ @@ -71,7 +71,7 @@ instructions on the mailing lists page. This provides access to CVS and Perforce commit messages associated with development occuring in the TrustedBSD development trees, including the - Base (vendor) branch, Capabilities branch, Audit branch, MAC + Base (vendor) branch, Privileges branch, Audit branch, MAC branch, SEBSD branch, and SEDarwin branch.

There are seven main branches of TrustedBSD development:

@@ -133,7 +133,7 @@ processes to tag files with arbitrary named data. This provides a location to store the extensive security data required for the various TrustedBSD security extensions, - including ACLs, capabilities and MAC labels. Extended + including ACLs, privileges and MAC labels. Extended attribute support has been developed for FreeBSD's UFS1 file system and integrated with the FreeBSD development tree, and was included in FreeBSD 5.0. UFS2 was @@ -144,29 +144,6 @@ functionality.

- -

Fine-Grained Capabilities

- -
-

- Collection: - - p4-cvs-trustedbsd-cap -

- -

Capabilities provide support for fine-grained process - capabilities to authorize non-root processes to access - privileged system resources, reducing requirements for a - superuser account, and reducing risk in the event of - compromise. The capabilities development branch is - largely complete, but is based on an older FreeBSD - 5.0-CURRENT snapshot. Elements of this implementation - are being updated for FreeBSD 5.2 and are available as - part of the SEBSD version of the TrustedBSD MAC Framework. - For more information, see the Capability - Page.

-
-

GEOM

@@ -216,6 +193,37 @@ Project.

+ +

Fine-Grained Privileges

+ +
+

+ Collection: + + p4-cvs-trustedbsd-cap +

+ +

NB: Historically this project was referred to as fine-grained + capabilities, but due to a vocabulary conflict, it has been + renamed to fine-grained privileges. Information in this + section and on the privileges page currently refers to a + FreeBSD 5.x-era project to support fine-grained privileges, + and will shortly be superseded by a similar project for + FreeBSD 8.x.

+ +

Privileges provide support for fine-grained process + privileges to authorize non-root processes to access + privileged system resources, reducing requirements for a + superuser account, and reducing risk in the event of + compromise. The privileges development branch is + largely complete, but is based on an older FreeBSD + 5.0-CURRENT snapshot. Elements of this implementation + are being updated for FreeBSD 5.2 and are available as + part of the SEBSD version of the TrustedBSD MAC Framework. + For more information, see the + Privileges Page.

+
+

Security-Enhanced BSD (SEBSD)

==== //depot/projects/trustedbsd/www/developers.dev#3 (text+ko) ==== @@ -33,7 +33,7 @@ - $P4: //depot/projects/trustedbsd/www/developers.dev#2 $ + $P4: //depot/projects/trustedbsd/www/developers.dev#3 $ @@ -61,13 +61,13 @@ Ilmar Habibulin ilmar@watson.org http://www.watson.org/~ilmar/ - Capabilities, Mandatory Access Control + Privileges, Mandatory Access Control Thomas Moestl tmm@FreeBSD.org - Capabilities + Privileges @@ -86,7 +86,7 @@ Andrew Reisse Andrew.Reisse@sparta.com - SEDarwin, Capabilities + SEDarwin, Privileges ==== //depot/projects/trustedbsd/www/mailinglists.page#4 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/mailinglists.page#3 $ + $P4: //depot/projects/trustedbsd/www/mailinglists.page#4 $ @@ -115,7 +115,7 @@

POSIX.1e, the now-withdrawn POSIX draft defining interfaces for operating system security extensions, continues to play an important - role in offering standard interfaces for ACLs, Capabilities, and to + role in offering standard interfaces for ACLs, Privileges, and to a limited extent other services. The POSIX.1e mailing list provides a cross-platform forum for the discussion of the draft, as well as practical implementation and portability issues. More information on ==== //depot/projects/trustedbsd/www/privileges.page#2 (text+ko) ==== @@ -25,16 +25,16 @@ --> - TrustedBSD POSIX.1e Capabilities + TrustedBSD POSIX.1e Privileges - $P4: //depot/projects/trustedbsd/www/privileges.page#1 $ + $P4: //depot/projects/trustedbsd/www/privileges.page#2 $

- TrustedBSD POSIX.1e Capabilities + TrustedBSD POSIX.1e Privileges

@@ -46,15 +46,16 @@ p4-cvs-trustedbsd-cap

-

POSIX.1e breaks root privilege into a set of capabilities, or - more strictly, privileges, which allow the granting of specific - privilege requirements for POSIX calls, such as setuid(). +

POSIX.1e breaks root privilege into a set of privileges + (historically referred to as "Capabilities"), which allow the + granting of specific privilege requirements for POSIX calls, such + as setuid(). POSIX.1e defines extension to process and file state to allow privileges to be granted to processes, either by inheritence or a file privilege model similar to setuid/setgid.

-

The TrustedBSD capability project is currently inactive, but an - implementation of POSIX.1e capabilities for an older FreeBSD release +

The TrustedBSD privileges project is currently inactive, but an + implementation of POSIX.1e privileges for an older FreeBSD release is available and functional, and may be found in Perforce/cvsup. Certain key files are provided in a tarball for download on this page.

@@ -70,17 +71,17 @@ sufficient future growth in privileges, or further fine-graining.

Up-to-date versions of the kernel API changes to perform - fine-grained privilege checking, without the capability model + fine-grained privilege checking, without the privilege model itself, may be found in the SEBSD branch, and include modifications to the TrustedBSD MAC Framework to allow MAC modules to deny privilege based on the POSIX.1e privilege categories.

-

2006-03-26 FreeBSD 5.0 POSIX.1e capability reference files +

2006-03-26 FreeBSD 5.0 POSIX.1e privileges reference files snapshot. These are reference BSD-licensed POSIX.1e privilege files derived from an early TrustedBSD implementation, and do - not represent a complete or supported implementation. - Download.

+ not represent a complete or supported implementation. Download + 20060326-cap.tgz (60K).

==== //depot/projects/trustedbsd/www/sidebar.xml#11 (text+ko) ==== @@ -7,11 +7,11 @@
  • Audit
  • BSMtrace
  • Extended Attributes and UFS2
    • -
  • Capabilities
  • GEOM
  • MAC
  • OpenBSM
  • OpenPAM
    • +
  • Privileges
  • SEBSD
  • SEDarwin
    • @@ -24,11 +24,11 @@
  • Audit
  • BSMtrace
  • Extended Attributes and UFS2
    • -
  • Capabilities
  • GEOM
  • MAC
  • OpenBSM
  • OpenPAM
    • +
  • Privileges
  • SEBSD
  • SEDarwin
    • From owner-p4-projects@FreeBSD.ORG Mon Aug 25 14:00:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 539311065696; Mon, 25 Aug 2008 14:00:52 +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 176251065685 for ; Mon, 25 Aug 2008 14:00:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E374A8FC1E for ; Mon, 25 Aug 2008 14:00:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PE0pDD019985 for ; Mon, 25 Aug 2008 14:00:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PE0pWm019983 for perforce@freebsd.org; Mon, 25 Aug 2008 14:00:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 14:00:51 GMT Message-Id: <200808251400.m7PE0pWm019983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148380 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, 25 Aug 2008 14:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148380 Change 148380 by rwatson@rwatson_fledge on 2008/08/25 14:00:41 XSL tweaks. Submitted by: bz Affected files ... .. //depot/projects/trustedbsd/www/page.xsl#5 edit Differences ... ==== //depot/projects/trustedbsd/www/page.xsl#5 (text+ko) ==== @@ -2,7 +2,9 @@ xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> - + + + From owner-p4-projects@FreeBSD.ORG Mon Aug 25 14:02:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9695106568C; Mon, 25 Aug 2008 14:02: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 60BF71065673 for ; Mon, 25 Aug 2008 14:02:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1E0178FC1E for ; Mon, 25 Aug 2008 14:02:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PE2suE020127 for ; Mon, 25 Aug 2008 14:02:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PE2s9T020125 for perforce@freebsd.org; Mon, 25 Aug 2008 14:02:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 14:02:54 GMT Message-Id: <200808251402.m7PE2s9T020125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148381 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, 25 Aug 2008 14:02:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=148381 Change 148381 by rwatson@rwatson_fledge on 2008/08/25 14:02:14 Fix transcription error. Affected files ... .. //depot/projects/trustedbsd/www/page.xsl#6 edit Differences ... ==== //depot/projects/trustedbsd/www/page.xsl#6 (text+ko) ==== @@ -4,7 +4,7 @@ - + From owner-p4-projects@FreeBSD.ORG Mon Aug 25 15:08:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E85A106567A; Mon, 25 Aug 2008 15:08: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 E457A1065674 for ; Mon, 25 Aug 2008 15:08:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94F998FC19 for ; Mon, 25 Aug 2008 15:08:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PF80gp028241 for ; Mon, 25 Aug 2008 15:08:00 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PF80ot028239 for perforce@freebsd.org; Mon, 25 Aug 2008 15:08:00 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 Aug 2008 15:08:00 GMT Message-Id: <200808251508.m7PF80ot028239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148385 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, 25 Aug 2008 15:08:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=148385 Change 148385 by trasz@trasz_traszkan on 2008/08/25 15:07:12 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#46 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#46 (text+ko) ==== @@ -6,6 +6,9 @@ to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. +- Do not store trivial ACLs. That should fix a massive (~4x) + slowdown observed when untarring ports tree. + - Make 'struct acl' variable size. - Benchmark things. From owner-p4-projects@FreeBSD.ORG Mon Aug 25 16:13:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F01DB1065674; Mon, 25 Aug 2008 16:13:08 +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 B138A106566C for ; Mon, 25 Aug 2008 16:13:08 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 996018FC19 for ; Mon, 25 Aug 2008 16:13:08 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PGD8Cn037280 for ; Mon, 25 Aug 2008 16:13:08 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PGD8FU037278 for perforce@freebsd.org; Mon, 25 Aug 2008 16:13:08 GMT (envelope-from sson@FreeBSD.org) Date: Mon, 25 Aug 2008 16:13:08 GMT Message-Id: <200808251613.m7PGD8FU037278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 148394 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, 25 Aug 2008 16:13:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=148394 Change 148394 by sson@sson_amd64 on 2008/08/25 16:12:46 Bug fix for darwin: missing notify_post(). Typo in comment. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#37 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#37 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#37 $ */ #include @@ -301,6 +301,14 @@ close(fd); } else { /* Success. */ +#ifdef USE_MACH_IPC + /* + * auditctl() potentially changes the audit + * state so post that the audit config (may + * have) changed. + */ + notify_post(__BSM_INTERNAL_NOTIFY_KEY); +#endif close_lastfile(TS); lastfile = fn; close(fd); @@ -338,11 +346,6 @@ free_dir_q(); endac(); -#ifdef USE_MACH_IPC - /* Post that the audit config changed. */ - notify_post(__BSM_INTERNAL_NOTIFY_KEY); -#endif - /* * Read the list of directories into a local linked list. * @@ -440,6 +443,12 @@ strerror(errno)); err_ret = 1; } +#ifdef USE_MACH_IPC + /* + * Post a notification that the audit config changed. + */ + notify_post(__BSM_INTERNAL_NOTIFY_KEY); +#endif if (getTSstr(TS, TIMESTAMP_LEN) == 0) close_lastfile(TS); if (lastfile != NULL) @@ -1060,7 +1069,7 @@ #endif /* - * To provide event feedback cycles and avoid auditd becoming + * To prevent event feedback cycles and avoid auditd becoming * stalled if auditing is suspended, auditd and its children run * without their events being audited. We allow the uid, tid, and * mask fields to be implicitly set to zero, but do set the pid. We From owner-p4-projects@FreeBSD.ORG Mon Aug 25 16:34:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA20F1065683; Mon, 25 Aug 2008 16:34: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 AB7031065670 for ; Mon, 25 Aug 2008 16:34:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 916078FC08 for ; Mon, 25 Aug 2008 16:34:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PGYWuZ039091 for ; Mon, 25 Aug 2008 16:34:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PGYU15039085 for perforce@freebsd.org; Mon, 25 Aug 2008 16:34:30 GMT (envelope-from jhb@freebsd.org) Date: Mon, 25 Aug 2008 16:34:30 GMT Message-Id: <200808251634.m7PGYU15039085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 148398 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, 25 Aug 2008 16:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148398 Change 148398 by jhb@jhb_mutex on 2008/08/25 16:33:41 IFC @148397 Affected files ... .. //depot/projects/smpng/sys/Makefile#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#34 integrate .. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#85 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#21 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#66 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#45 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#14 integrate .. //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#9 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#15 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#13 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#6 integrate .. //depot/projects/smpng/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pmc.c#7 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#15 integrate .. //depot/projects/smpng/sys/arm/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#53 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#35 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#8 integrate .. //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#17 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#14 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/locore.S#4 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#24 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#26 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#43 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#43 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#43 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#43 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#47 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#64 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#51 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#89 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#40 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#40 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#19 integrate .. //depot/projects/smpng/sys/conf/NOTES#153 integrate .. //depot/projects/smpng/sys/conf/files#218 integrate .. //depot/projects/smpng/sys/conf/files.amd64#55 integrate .. //depot/projects/smpng/sys/conf/files.i386#111 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#66 integrate .. //depot/projects/smpng/sys/conf/options#151 integrate .. //depot/projects/smpng/sys/conf/options.i386#62 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#15 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#24 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#29 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#25 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/smpng/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#11 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#22 integrate .. //depot/projects/smpng/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#107 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#2 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#2 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#91 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#57 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#85 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#31 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#11 integrate .. //depot/projects/smpng/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/smpng/sys/dev/cpufreq/ichss.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_lro.c#4 delete .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#18 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#7 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#18 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sarea.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drm.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_mem.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/smpng/sys/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drm.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_state.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drm.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/mga_state.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/mga_warp.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drm.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/r300_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#17 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#14 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#16 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_mem.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#17 integrate .. //depot/projects/smpng/sys/dev/drm/savage_bci.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/savage_state.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#10 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#40 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#42 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#22 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/ex/if_exvar.h#7 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#44 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#37 integrate .. //depot/projects/smpng/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/smpng/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/smpng/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#10 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/smpng/sys/dev/iicbus/ad7418.c#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/ds1339.c#3 delete .. //depot/projects/smpng/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/iiconf.c#8 integrate .. //depot/projects/smpng/sys/dev/io/iodev.c#3 integrate .. //depot/projects/smpng/sys/dev/led/led.c#15 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#18 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#23 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#47 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#18 integrate .. //depot/projects/smpng/sys/dev/mii/mlphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#11 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#33 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#46 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis_quirks.c#11 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#61 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#27 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#67 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#100 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#37 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#14 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#26 integrate .. //depot/projects/smpng/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/smpng/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#20 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#7 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#18 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#42 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#63 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/smpng/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#30 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#33 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#20 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/smpng/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#33 integrate .. //depot/projects/smpng/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/schistory.c#8 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#16 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-sc.c#9 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#9 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#13 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#65 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#20 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#16 integrate .. //depot/projects/smpng/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/smpng/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/smpng/sys/dev/uart/uart.h#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#19 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#15 integrate .. //depot/projects/smpng/sys/dev/usb/hid.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/if_rum.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/smpng/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/ubsa.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/uipaq.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#66 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#114 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#21 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#12 integrate .. //depot/projects/smpng/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/smpng/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/smpng/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/smpng/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/smpng/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/smpng/sys/dev/xen/console/console.c#1 branch .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/smpng/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/smpng/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/smpng/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/smpng/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/smpng/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/smpng/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#69 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#17 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#52 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#37 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#54 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#9 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#19 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#20 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#11 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#97 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#134 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#10 integrate .. //depot/projects/smpng/sys/i386/conf/XEN#1 branch .. //depot/projects/smpng/sys/i386/cpufreq/est.c#11 integrate .. //depot/projects/smpng/sys/i386/cpufreq/p4tcc.c#5 integrate .. //depot/projects/smpng/sys/i386/cpufreq/powernow.c#4 integrate .. //depot/projects/smpng/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/db_disasm.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#38 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#55 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#133 integrate .. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#26 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#31 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#52 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#112 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#86 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#14 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#15 integrate .. //depot/projects/smpng/sys/i386/include/asmacros.h#9 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#36 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#10 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#20 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#41 integrate .. //depot/projects/smpng/sys/i386/include/segments.h#11 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#18 integrate .. //depot/projects/smpng/sys/i386/include/trap.h#4 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#14 integrate .. //depot/projects/smpng/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/features.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/smpng/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/smpng/sys/i386/isa/dpms.c#1 branch .. //depot/projects/smpng/sys/i386/isa/npx.c#61 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#35 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#13 integrate .. //depot/projects/smpng/sys/i386/xen/clock.c#1 branch .. //depot/projects/smpng/sys/i386/xen/exception.s#1 branch .. //depot/projects/smpng/sys/i386/xen/locore.s#1 branch .. //depot/projects/smpng/sys/i386/xen/pmap.c#1 branch .. //depot/projects/smpng/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/smpng/sys/ia64/conf/GENERIC#62 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#24 integrate .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#20 integrate .. //depot/projects/smpng/sys/ia64/include/pcpu.h#9 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#21 integrate .. //depot/projects/smpng/sys/isa/isavar.h#10 integrate .. //depot/projects/smpng/sys/kern/init_main.c#73 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#115 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#131 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#95 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#95 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#124 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#52 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#169 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#85 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#91 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#12 integrate .. //depot/projects/smpng/sys/kern/tty.c#74 integrate .. //depot/projects/smpng/sys/kern/tty_compat.c#10 integrate .. //depot/projects/smpng/sys/kern/tty_conf.c#7 delete .. //depot/projects/smpng/sys/kern/tty_cons.c#42 integrate .. //depot/projects/smpng/sys/kern/tty_info.c#2 integrate .. //depot/projects/smpng/sys/kern/tty_inq.c#1 branch .. //depot/projects/smpng/sys/kern/tty_outq.c#1 branch .. //depot/projects/smpng/sys/kern/tty_pts.c#10 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#54 integrate .. //depot/projects/smpng/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/smpng/sys/kern/vfs_bio.c#112 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#81 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#153 integrate .. //depot/projects/smpng/sys/libkern/strcspn.c#1 branch .. //depot/projects/smpng/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#147 integrate .. //depot/projects/smpng/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/dpms/Makefile#1 branch .. //depot/projects/smpng/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nmdm/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/pcn/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/rc/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/sis/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/snc/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ste/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/tl/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/upgt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wb/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/xl/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.c#78 integrate .. //depot/projects/smpng/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/smpng/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#22 integrate .. //depot/projects/smpng/sys/net/if.c#101 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#49 integrate .. //depot/projects/smpng/sys/net/if_ef.c#25 integrate .. //depot/projects/smpng/sys/net/if_enc.c#10 integrate .. //depot/projects/smpng/sys/net/if_enc.h#1 branch .. //depot/projects/smpng/sys/net/if_ethersubr.c#88 integrate .. //depot/projects/smpng/sys/net/if_faith.c#34 integrate .. //depot/projects/smpng/sys/net/if_gif.c#43 integrate .. //depot/projects/smpng/sys/net/if_loop.c#47 integrate .. //depot/projects/smpng/sys/net/if_mib.c#10 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#34 integrate .. //depot/projects/smpng/sys/net/if_stf.c#42 integrate .. //depot/projects/smpng/sys/net/if_var.h#54 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#59 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#17 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#25 integrate .. //depot/projects/smpng/sys/net/route.c#37 integrate .. //depot/projects/smpng/sys/net/rtsock.c#61 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#35 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#56 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#35 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#29 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#17 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#59 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#21 integrate .. //depot/projects/smpng/sys/netinet/in.c#42 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#23 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#83 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#52 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#18 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#20 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#8 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#58 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#93 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#20 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#44 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#88 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#60 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#97 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#36 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#70 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#19 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#12 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#113 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#56 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#24 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#99 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#64 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#41 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#69 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#83 integrate .. //depot/projects/smpng/sys/netinet6/dest6.c#6 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#17 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#45 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#44 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#17 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#24 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#53 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#24 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#14 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#34 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#23 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#52 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#33 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#55 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#23 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#23 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#44 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#12 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#29 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#22 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#51 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#11 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#10 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#48 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#26 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#14 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#16 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#12 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#15 integrate .. //depot/projects/smpng/sys/netipsec/key.c#24 integrate .. //depot/projects/smpng/sys/netipsec/key_debug.h#3 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#17 integrate .. //depot/projects/smpng/sys/netipsec/xform_ah.c#12 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#14 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipcomp.c#11 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#37 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#18 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#65 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#73 integrate .. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/smpng/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/smpng/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#77 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#16 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#63 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#45 delete .. //depot/projects/smpng/sys/pci/if_pcnreg.h#10 delete .. //depot/projects/smpng/sys/pci/if_sis.c#66 delete .. //depot/projects/smpng/sys/pci/if_sisreg.h#20 delete .. //depot/projects/smpng/sys/pci/if_ste.c#49 delete .. //depot/projects/smpng/sys/pci/if_stereg.h#13 delete .. //depot/projects/smpng/sys/pci/if_tl.c#37 delete .. //depot/projects/smpng/sys/pci/if_tlreg.h#9 delete .. //depot/projects/smpng/sys/pci/if_wb.c#43 delete .. //depot/projects/smpng/sys/pci/if_wbreg.h#9 delete .. //depot/projects/smpng/sys/pci/if_xl.c#75 delete .. //depot/projects/smpng/sys/pci/if_xlreg.h#23 delete .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#50 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#11 integrate .. //depot/projects/smpng/sys/rpc/authunix_prot.c#3 integrate .. //depot/projects/smpng/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/smpng/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/smpng/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#17 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#15 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#11 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#11 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#16 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#16 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#21 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#16 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#20 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#52 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#28 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#13 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#40 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#46 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#18 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#16 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#15 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#15 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#26 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#42 integrate .. //depot/projects/smpng/sys/sparc64/central/central.c#9 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#84 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#26 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#24 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#12 integrate .. //depot/projects/smpng/sys/sparc64/include/asi.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/cache.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#27 integrate .. //depot/projects/smpng/sys/sparc64/include/pcpu.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/tte.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#17 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#46 integrate .. //depot/projects/smpng/sys/sparc64/sbus/dma_sbus.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/clock.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_disasm.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#20 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#90 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#33 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#75 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/prof_machdep.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/spitfire.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#20 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#80 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#11 integrate .. //depot/projects/smpng/sys/sun4v/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/dump_machdep.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#8 integrate .. //depot/projects/smpng/sys/sys/conf.h#52 integrate .. //depot/projects/smpng/sys/sys/copyright.h#12 integrate .. //depot/projects/smpng/sys/sys/cpuctl.h#1 branch .. //depot/projects/smpng/sys/sys/file.h#29 integrate .. //depot/projects/smpng/sys/sys/kernel.h#41 integrate .. //depot/projects/smpng/sys/sys/libkern.h#26 integrate .. //depot/projects/smpng/sys/sys/linedisc.h#3 delete .. //depot/projects/smpng/sys/sys/lock.h#50 integrate .. //depot/projects/smpng/sys/sys/param.h#126 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#22 integrate .. //depot/projects/smpng/sys/sys/priv.h#12 integrate .. //depot/projects/smpng/sys/sys/proc.h#188 integrate .. //depot/projects/smpng/sys/sys/resource.h#18 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#29 integrate .. //depot/projects/smpng/sys/sys/sbuf.h#9 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#16 integrate .. //depot/projects/smpng/sys/sys/socket.h#35 integrate .. //depot/projects/smpng/sys/sys/sx.h#31 integrate .. //depot/projects/smpng/sys/sys/syscall.h#84 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#84 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#49 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#88 integrate .. //depot/projects/smpng/sys/sys/termios.h#6 integrate .. //depot/projects/smpng/sys/sys/tty.h#23 integrate .. //depot/projects/smpng/sys/sys/ttycom.h#10 integrate .. //depot/projects/smpng/sys/sys/ttydefaults.h#8 integrate .. //depot/projects/smpng/sys/sys/ttydevsw.h#1 branch .. //depot/projects/smpng/sys/sys/ttydisc.h#1 branch .. //depot/projects/smpng/sys/sys/ttyqueue.h#1 branch .. //depot/projects/smpng/sys/sys/types.h#35 integrate .. //depot/projects/smpng/sys/sys/user.h#32 integrate .. //depot/projects/smpng/sys/sys/vimage.h#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#102 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#68 integrate .. //depot/projects/smpng/sys/vm/redzone.c#3 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#74 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#99 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/smpng/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/smpng/sys/xen/features.c#1 branch .. //depot/projects/smpng/sys/xen/gnttab.c#1 branch .. //depot/projects/smpng/sys/xen/gnttab.h#1 branch .. //depot/projects/smpng/sys/xen/interface/COPYING#1 branch .. //depot/projects/smpng/sys/xen/interface/acm.h#1 branch .. //depot/projects/smpng/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/smpng/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/smpng/sys/xen/interface/callback.h#1 branch .. //depot/projects/smpng/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/smpng/sys/xen/interface/domctl.h#1 branch .. //depot/projects/smpng/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/smpng/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/smpng/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/smpng/sys/xen/interface/features.h#1 branch .. //depot/projects/smpng/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/smpng/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/smpng/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/smpng/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/smpng/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/smpng/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/smpng/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/console.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/smpng/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/smpng/sys/xen/interface/kexec.h#1 branch .. //depot/projects/smpng/sys/xen/interface/libelf.h#1 branch .. //depot/projects/smpng/sys/xen/interface/memory.h#1 branch .. //depot/projects/smpng/sys/xen/interface/nmi.h#1 branch .. //depot/projects/smpng/sys/xen/interface/physdev.h#1 branch .. //depot/projects/smpng/sys/xen/interface/platform.h#1 branch .. //depot/projects/smpng/sys/xen/interface/sched.h#1 branch .. //depot/projects/smpng/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/smpng/sys/xen/interface/trace.h#1 branch .. //depot/projects/smpng/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/smpng/sys/xen/interface/version.h#1 branch .. //depot/projects/smpng/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/smpng/sys/xen/interface/xen.h#1 branch .. //depot/projects/smpng/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/smpng/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/smpng/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_xs.c#1 branch Differences ... ==== //depot/projects/smpng/sys/Makefile#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,18 +30,22 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +#ifdef _KERNEL #include "opt_bpf.h" - #include #include #include -#include #include #include +#include +#else +#include +#endif -#include +#include + #include #include @@ -53,7 +57,7 @@ * emit routine to update the jump table */ static void -emit_length(bpf_bin_stream *stream, u_int value, u_int len) +emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len) { (stream->refs)[stream->bpf_pc] += len; @@ -105,13 +109,17 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ +#ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); +#else + stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int)); +#endif if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,124 +139,146 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; +#ifdef _KERNEL + return (NULL); +#else + abort(); +#endif case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: - MOVid(ins->k, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; case BPF_LD|BPF_H|BPF_ABS: ZEROrd(EAX); - MOVid(ins->k, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); - MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); - MOVobb(RBX, RCX, AL); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(4); + MOVrq3(R8, RBX); + RET(); + MOVobb(RBX, RSI, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; case BPF_LD|BPF_H|BPF_IND: ZEROrd(EAX); - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; case BPF_LD|BPF_B|BPF_IND: ZEROrd(EAX); - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 25 16:38:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 516621065674; Mon, 25 Aug 2008 16:38: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 151631065672 for ; Mon, 25 Aug 2008 16:38:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFC198FC1A for ; Mon, 25 Aug 2008 16:38:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PGcaLR039649 for ; Mon, 25 Aug 2008 16:38:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PGcaTR039647 for perforce@freebsd.org; Mon, 25 Aug 2008 16:38:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 16:38:36 GMT Message-Id: <200808251638.m7PGcaTR039647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148400 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, 25 Aug 2008 16:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=148400 Change 148400 by rwatson@rwatson_fledge on 2008/08/25 16:37:46 Clarify status of privileges project on privileges page. Affected files ... .. //depot/projects/trustedbsd/www/privileges.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/privileges.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/privileges.page#2 $ + $P4: //depot/projects/trustedbsd/www/privileges.page#3 $ @@ -46,6 +46,12 @@ p4-cvs-trustedbsd-cap

    +

    NB: Historically this project was referred to as fine-grained + capabilities, but due to a vocabulary conflict, it has been renamed + to fine-grained privileges. Information in this page currently refers + to a FreeBSD 5.x-era project to support fine-grained privileges, and + will shortly be superseded by a similar project for FreeBSD 8.x.

    +

    POSIX.1e breaks root privilege into a set of privileges (historically referred to as "Capabilities"), which allow the granting of specific privilege requirements for POSIX calls, such From owner-p4-projects@FreeBSD.ORG Mon Aug 25 17:54:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDA531065675; Mon, 25 Aug 2008 17:54: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 99E4D1065761 for ; Mon, 25 Aug 2008 17:54:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4C9E8FC12 for ; Mon, 25 Aug 2008 17:54:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PHs3QM060256 for ; Mon, 25 Aug 2008 17:54:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PHs3je060254 for perforce@freebsd.org; Mon, 25 Aug 2008 17:54:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 17:54:03 GMT Message-Id: <200808251754.m7PHs3je060254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148407 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, 25 Aug 2008 17:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=148407 Change 148407 by rwatson@rwatson_fledge on 2008/08/25 17:53:42 Revise header, buttons, etc. Not the final version yet. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#9 edit .. //depot/projects/trustedbsd/www/components-selected.png#1 add .. //depot/projects/trustedbsd/www/components.png#1 add .. //depot/projects/trustedbsd/www/componentsgray.gif#2 delete .. //depot/projects/trustedbsd/www/developers-selected.png#1 add .. //depot/projects/trustedbsd/www/developers.png#1 add .. //depot/projects/trustedbsd/www/developersgray.gif#2 delete .. //depot/projects/trustedbsd/www/docs-selected.png#1 add .. //depot/projects/trustedbsd/www/docs.png#1 add .. //depot/projects/trustedbsd/www/docsgray.gif#2 delete .. //depot/projects/trustedbsd/www/heading.xsl#2 edit .. //depot/projects/trustedbsd/www/home-selected.png#1 add .. //depot/projects/trustedbsd/www/home.png#1 add .. //depot/projects/trustedbsd/www/homegray.gif#2 delete .. //depot/projects/trustedbsd/www/mailinglists-selected.png#1 add .. //depot/projects/trustedbsd/www/mailinglists.png#1 add .. //depot/projects/trustedbsd/www/mailinglistsgray.gif#2 delete .. //depot/projects/trustedbsd/www/trustyheader.png#1 add Differences ... ==== //depot/projects/trustedbsd/www/Makefile#9 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#8 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#9 $ STYLESHEET= page.xsl @@ -49,13 +49,14 @@ SRCS+= acls.page SRCS+= bsmtrace.page -IMGS= components.gif componentsgray.gif -IMGS+= developers.gif developersgray.gif docs.gif -IMGS+= docsgray.gif home.gif homegray.gif -IMGS+= horizontalbar1.gif mailinglists.gif mailinglistsgray.gif +IMGS= components.png components-selected.png +IMGS+= developers.png developers-selected.png docs.png +IMGS+= docs-selected.png home.png home-selected.png +IMGS+= horizontalbar1.gif mailinglists.png mailinglists-selected.png IMGS+= minipemaquidlight.jpg pemaquidlight.jpg powerlogo.gif IMGS+= resources.gif trustydibmed2.jpg trustyshadow.gif IMGS+= trustyteenie.gif verticalbar1.gif wwwheader.gif +IMGS+= trustyheader.png DATA= trustedbsd-supfile trustedbsd-bsdcon-2000.pdf DATA+= trustedbsd-freenix-2001.pdf ==== //depot/projects/trustedbsd/www/heading.xsl#2 (text+ko) ==== @@ -11,11 +11,11 @@ - {$description} - {$description} @@ -25,11 +25,11 @@ - +
    - @@ -78,13 +78,15 @@ - + +
    - www.TrustedBSD.org + + www.TrustedBSD.org
    +
    - +     From owner-p4-projects@FreeBSD.ORG Mon Aug 25 18:12:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9E02106568D; Mon, 25 Aug 2008 18:12: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 9D7171065680 for ; Mon, 25 Aug 2008 18:12:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 82C628FC18 for ; Mon, 25 Aug 2008 18:12:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PICMbe063000 for ; Mon, 25 Aug 2008 18:12:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PICMo4062998 for perforce@freebsd.org; Mon, 25 Aug 2008 18:12:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 18:12:22 GMT Message-Id: <200808251812.m7PICMo4062998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148409 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, 25 Aug 2008 18:12:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=148409 Change 148409 by rwatson@rwatson_fledge on 2008/08/25 18:11:22 More minor tweaks. Affected files ... .. //depot/projects/trustedbsd/www/heading.xsl#3 edit Differences ... ==== //depot/projects/trustedbsd/www/heading.xsl#3 (text+ko) ==== @@ -29,7 +29,7 @@ - www.TrustedBSD.org + www.TrustedBSD.org @@ -82,7 +82,7 @@ - + From owner-p4-projects@FreeBSD.ORG Mon Aug 25 18:14:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FDD71065681; Mon, 25 Aug 2008 18:14: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 E628C1065673 for ; Mon, 25 Aug 2008 18:14:24 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB4BC8FC17 for ; Mon, 25 Aug 2008 18:14:24 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PIEO62064471 for ; Mon, 25 Aug 2008 18:14:24 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PIEOOt064469 for perforce@freebsd.org; Mon, 25 Aug 2008 18:14:24 GMT (envelope-from marius@freebsd.org) Date: Mon, 25 Aug 2008 18:14:24 GMT Message-Id: <200808251814.m7PIEOOt064469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 148410 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, 25 Aug 2008 18:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=148410 Change 148410 by marius@flak on 2008/08/25 18:13:40 - Announce the speed of the PCI bus for informational purpose. - Schizo revision >= 2.3 also require manual DMA sync. - Rename macros in order to take the XMITS PCI-X host-PCI-bridges, which should be also handled by this driver, into account. Due to lack of such hardware that's it for now though. Affected files ... .. //depot/projects/usiii/sparc64/pci/schizo.c#10 edit .. //depot/projects/usiii/sparc64/pci/schizoreg.h#4 edit .. //depot/projects/usiii/sparc64/pci/schizovar.h#4 edit Differences ... ==== //depot/projects/usiii/sparc64/pci/schizo.c#10 (text+ko) ==== @@ -35,7 +35,8 @@ __FBSDID("$FreeBSD$"); /* - * Support for `Schizo' Safari to PCI and `Tomatillo' JBus to PCI bridges + * Driver for `Schizo' Fireplane/Safari to PCI 2.1 and `Tomatillo' JBus to + * PCI 2.2 bridges */ #include "opt_ofw_pci.h" @@ -174,32 +175,33 @@ driver_filter_t *sds_handler; void *sds_arg; void *sds_cookie; + uint64_t sds_syncreg; u_int sds_ino; }; -#define SCZTOM_PERF_CNT_QLTY 100 +#define SCHIZO_PERF_CNT_QLTY 100 -#define SCZTOM_SPC_READ_8(spc, sc, offs) \ +#define SCHIZO_SPC_READ_8(spc, sc, offs) \ bus_read_8((sc)->sc_mem_res[(spc)], (offs)) -#define SCZTOM_SPC_WRITE_8(spc, sc, offs, v) \ +#define SCHIZO_SPC_WRITE_8(spc, sc, offs, v) \ bus_write_8((sc)->sc_mem_res[(spc)], (offs), (v)) -#define SCZTOM_PCI_READ_8(sc, offs) \ - SCZTOM_SPC_READ_8(SCZTOM_PCI, (sc), (offs)) -#define SCZTOM_PCI_WRITE_8(sc, offs, v) \ - SCZTOM_SPC_WRITE_8(SCZTOM_PCI, (sc), (offs), (v)) -#define SCZTOM_CTRL_READ_8(sc, offs) \ - SCZTOM_SPC_READ_8(SCZTOM_CTRL, (sc), (offs)) -#define SCZTOM_CTRL_WRITE_8(sc, offs, v) \ - SCZTOM_SPC_WRITE_8(SCZTOM_CTRL, (sc), (offs), (v)) -#define SCZTOM_PCICFG_READ_8(sc, offs) \ - SCZTOM_SPC_READ_8(SCZTOM_PCICFG, (sc), (offs)) -#define SCZTOM_PCICFG_WRITE_8(sc, offs, v) \ - SCZTOM_SPC_WRITE_8(SCZTOM_PCICFG, (sc), (offs), (v)) -#define SCZTOM_ICON_READ_8(sc, offs) \ - SCZTOM_SPC_READ_8(SCZTOM_ICON, (sc), (offs)) -#define SCZTOM_ICON_WRITE_8(sc, offs, v) \ - SCZTOM_SPC_WRITE_8(SCZTOM_ICON, (sc), (offs), (v)) +#define SCHIZO_PCI_READ_8(sc, offs) \ + SCHIZO_SPC_READ_8(STX_PCI, (sc), (offs)) +#define SCHIZO_PCI_WRITE_8(sc, offs, v) \ + SCHIZO_SPC_WRITE_8(STX_PCI, (sc), (offs), (v)) +#define SCHIZO_CTRL_READ_8(sc, offs) \ + SCHIZO_SPC_READ_8(STX_CTRL, (sc), (offs)) +#define SCHIZO_CTRL_WRITE_8(sc, offs, v) \ + SCHIZO_SPC_WRITE_8(STX_CTRL, (sc), (offs), (v)) +#define SCHIZO_PCICFG_READ_8(sc, offs) \ + SCHIZO_SPC_READ_8(STX_PCICFG, (sc), (offs)) +#define SCHIZO_PCICFG_WRITE_8(sc, offs, v) \ + SCHIZO_SPC_WRITE_8(STX_PCICFG, (sc), (offs), (v)) +#define SCHIZO_ICON_READ_8(sc, offs) \ + SCHIZO_SPC_READ_8(STX_ICON, (sc), (offs)) +#define SCHIZO_ICON_WRITE_8(sc, offs, v) \ + SCHIZO_SPC_WRITE_8(STX_ICON, (sc), (offs), (v)) #define OFW_PCI_TYPE "pci" @@ -282,17 +284,17 @@ * (2) per-PBM PCI configuration space * (3) per-PBM interrupt concentrator registers */ - sc->sc_half = (bus_get_resource_start(dev, SYS_RES_MEMORY, - SCZTOM_PCI) >> 20) & 1; + sc->sc_half = (bus_get_resource_start(dev, SYS_RES_MEMORY, STX_PCI) >> + 20) & 1; for (n = 0; n < (mode == SCHIZO_MODE_SCZ ? SCZ_NREG : TOM_NREG); n++) { rid = n; sc->sc_mem_res[n] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, (((mode == SCHIZO_MODE_SCZ && ((sc->sc_half == 1 && - n == SCZTOM_PCI) || n == SCZTOM_CTRL)) || + n == STX_PCI) || n == STX_CTRL)) || (mode == SCHIZO_MODE_TOM && sc->sc_half == 0 && - n == SCZTOM_CTRL)) ? RF_SHAREABLE : 0) | RF_ACTIVE); + n == STX_CTRL)) ? RF_SHAREABLE : 0) | RF_ACTIVE); if (sc->sc_mem_res[n] == NULL) panic("%s: could not allocate register bank %d", __func__, n); @@ -305,8 +307,8 @@ */ osc = NULL; SLIST_FOREACH(asc, &schizo_softcs, sc_link) { - if (rman_get_start(asc->sc_mem_res[SCZTOM_CTRL]) == - rman_get_start(sc->sc_mem_res[SCZTOM_CTRL])) { + if (rman_get_start(asc->sc_mem_res[STX_CTRL]) == + rman_get_start(sc->sc_mem_res[STX_CTRL])) { /* Found partner. */ osc = asc; break; @@ -328,59 +330,62 @@ panic("%s: could not determine IGN", __func__); if (OF_getprop(node, "version#", &sc->sc_ver, sizeof(sc->sc_ver)) == -1) panic("%s: could not determine version", __func__); + if (OF_getprop(node, "clock-frequency", &prop, sizeof(prop)) == -1) + prop = 33000000; - device_printf(dev, "%s, version %d, IGN %#x, bus %c\n", - desc->sd_name, sc->sc_ver, sc->sc_ign, 'A' + sc->sc_half); + device_printf(dev, "%s, version %d, IGN %#x, bus %c, %dMHz\n", + desc->sd_name, sc->sc_ver, sc->sc_ign, 'A' + sc->sc_half, + prop / 1000 / 1000); /* Set up the PCI interrupt retry timer. */ #ifdef SCHIZO_DEBUG device_printf(dev, "PCI IRT 0x%016llx\n", (unsigned long long) - SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_INTR_RETRY_TIM)); + SCHIZO_PCI_READ_8(sc, STX_PCI_INTR_RETRY_TIM)); #endif - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_INTR_RETRY_TIM, 5); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_INTR_RETRY_TIM, 5); /* Set up the PCI control register. */ - reg = SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_CTRL); - reg |= SCZTOM_PCI_CTRL_MMU_IEN | SCZTOM_PCI_CTRL_SBH_IEN | - SCZTOM_PCI_CTRL_ERR_IEN | SCZTOM_PCI_CTRL_ARB_MASK; - reg &= ~(TOM_PCI_CTRL_DTO_IEN | SCZTOM_PCI_CTRL_SERR | - SCZTOM_PCI_CTRL_ARB_PARK); + reg = SCHIZO_PCI_READ_8(sc, STX_PCI_CTRL); + reg |= STX_PCI_CTRL_MMU_IEN | STX_PCI_CTRL_SBH_IEN | + STX_PCI_CTRL_ERR_IEN | STX_PCI_CTRL_ARB_MASK; + reg &= ~(TOM_PCI_CTRL_DTO_IEN | STX_PCI_CTRL_SERR | + STX_PCI_CTRL_ARB_PARK); if (OF_getproplen(node, "no-bus-parking") < 0) - reg |= SCZTOM_PCI_CTRL_ARB_PARK; + reg |= STX_PCI_CTRL_ARB_PARK; if (mode == SCHIZO_MODE_TOM) { reg |= TOM_PCI_CTRL_PRM | TOM_PCI_CTRL_PRO | TOM_PCI_CTRL_PRL; if (sc->sc_ver <= 1) reg |= TOM_PCI_CTRL_DTO_IEN; else - reg |= SCZTOM_PCI_CTRL_PTO; + reg |= STX_PCI_CTRL_PTO; } #ifdef SCHIZO_DEBUG device_printf(dev, "PCI CSR 0x%016llx -> 0x%016llx\n", - (unsigned long long)SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_CTRL), + (unsigned long long)SCHIZO_PCI_READ_8(sc, STX_PCI_CTRL), (unsigned long long)reg); #endif - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_CTRL, reg); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_CTRL, reg); /* Clear PCI AFSR. */ - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_AFSR, SCZTOM_PCI_AFSR_ERRMASK); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_AFSR, STX_PCI_AFSR_ERRMASK); /* Set up the PCI diagnostic register. */ - reg = SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_DIAG); - reg &= ~(SCZ_PCI_DIAG_RTRYARB_DIS | SCZTOM_PCI_DIAG_RETRY_DIS | - SCZTOM_PCI_DIAG_INTRSYNC_DIS); + reg = SCHIZO_PCI_READ_8(sc, STX_PCI_DIAG); + reg &= ~(SCZ_PCI_DIAG_RTRYARB_DIS | STX_PCI_DIAG_RETRY_DIS | + STX_PCI_DIAG_INTRSYNC_DIS); #ifdef SCHIZO_DEBUG device_printf(dev, "PCI DR 0x%016llx -> 0x%016llx\n", - (unsigned long long)SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_DIAG), + (unsigned long long)SCHIZO_PCI_READ_8(sc, STX_PCI_DIAG), (unsigned long long)reg); #endif - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_DIAG, reg); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_DIAG, reg); /* * On Tomatillo clear the I/O prefetch lengths (workaround for a * Jalapeno bug). */ if (mode == SCHIZO_MODE_TOM) - SCZTOM_PCI_WRITE_8(sc, TOM_PCI_IOC_CSR, TOM_PCI_IOC_PW | + SCHIZO_PCI_WRITE_8(sc, TOM_PCI_IOC_CSR, TOM_PCI_IOC_PW | (1 << TOM_PCI_IOC_PREF_OFF_SHIFT) | TOM_PCI_IOC_CPRM | TOM_PCI_IOC_CPRO | TOM_PCI_IOC_CPRL); @@ -395,10 +400,10 @@ if (n == -1) panic("%s: could not get ino-bitmap", __func__); reg = ((uint64_t)prop_array[1] << 32) | prop_array[0]; - for (n = 0; n <= SCZTOM_MAX_INO; n++) { + for (n = 0; n <= STX_MAX_INO; n++) { if ((reg & (1ULL << n)) == 0) continue; - if (n == SCZTOM_FB0_INO || n == SCZTOM_FB1_INO) + if (n == STX_FB0_INO || n == STX_FB1_INO) /* Leave for upa(4). */ continue; if (schizo_get_intrmap(sc, n, &intrmap, &intrclr) == 0) @@ -412,7 +417,7 @@ sica->sica_clr = intrclr; #ifdef SCHIZO_DEBUG device_printf(dev, "intr map (INO %d) %#lx: %#lx, clr: %#lx\n", - n, (u_long)intrmap, (u_long)SCZTOM_PCI_READ_8(sc, intrmap), + n, (u_long)intrmap, (u_long)SCHIZO_PCI_READ_8(sc, intrmap), (u_long)intrclr); #endif if (intr_controller_register(INTMAP_VEC(sc->sc_ign, n), @@ -429,9 +434,9 @@ * the latter as the argument for the interrupt controller. */ if (sc->sc_half == 0) { - if ((reg & (1ULL << SCZTOM_PCIERR_A_INO)) != 0 || + if ((reg & (1ULL << STX_PCIERR_A_INO)) != 0 || (osc != NULL && ((struct schizo_icarg *)intr_vectors[ - INTMAP_VEC(sc->sc_ign, SCZTOM_PCIERR_A_INO)].iv_icarg)-> + INTMAP_VEC(sc->sc_ign, STX_PCIERR_A_INO)].iv_icarg)-> sica_sc == osc)) /* * We are the driver for PBM A and either also @@ -439,21 +444,21 @@ * the driver for PBM B has probed first and * registered it for us. */ - schizo_set_intr(sc, 0, SCZTOM_PCIERR_A_INO, + schizo_set_intr(sc, 0, STX_PCIERR_A_INO, schizo_pci_bus); - if ((reg & (1ULL << SCZTOM_PCIERR_B_INO)) != 0 && osc != NULL) + if ((reg & (1ULL << STX_PCIERR_B_INO)) != 0 && osc != NULL) /* * We are the driver for PBM A but registered * the interrupt controller for PBM B, i.e. the * driver for PBM B attached first but couldn't * set up a handler for PBM B. */ - schizo_set_intr(osc, 0, SCZTOM_PCIERR_B_INO, + schizo_set_intr(osc, 0, STX_PCIERR_B_INO, schizo_pci_bus); } else { - if ((reg & (1ULL << SCZTOM_PCIERR_B_INO)) != 0 || + if ((reg & (1ULL << STX_PCIERR_B_INO)) != 0 || (osc != NULL && ((struct schizo_icarg *)intr_vectors[ - INTMAP_VEC(sc->sc_ign, SCZTOM_PCIERR_B_INO)].iv_icarg)-> + INTMAP_VEC(sc->sc_ign, STX_PCIERR_B_INO)].iv_icarg)-> sica_sc == osc)) /* * We are the driver for PBM B and either also @@ -461,24 +466,24 @@ * the driver for PBM A has probed first and * registered it for us. */ - schizo_set_intr(sc, 0, SCZTOM_PCIERR_B_INO, + schizo_set_intr(sc, 0, STX_PCIERR_B_INO, schizo_pci_bus); - if ((reg & (1ULL << SCZTOM_PCIERR_A_INO)) != 0 && osc != NULL) + if ((reg & (1ULL << STX_PCIERR_A_INO)) != 0 && osc != NULL) /* * We are the driver for PBM B but registered * the interrupt controller for PBM A, i.e. the * driver for PBM A attached first but couldn't * set up a handler for PBM A. */ - schizo_set_intr(osc, 0, SCZTOM_PCIERR_A_INO, + schizo_set_intr(osc, 0, STX_PCIERR_A_INO, schizo_pci_bus); } - if ((reg & (1ULL << SCZTOM_UE_INO)) != 0) - schizo_set_intr(sc, 1, SCZTOM_UE_INO, schizo_ue); - if ((reg & (1ULL << SCZTOM_CE_INO)) != 0) - schizo_set_intr(sc, 2, SCZTOM_CE_INO, schizo_ce); - if ((reg & (1ULL << SCZTOM_BUS_INO)) != 0) - schizo_set_intr(sc, 3, SCZTOM_BUS_INO, schizo_host_bus); + if ((reg & (1ULL << STX_UE_INO)) != 0) + schizo_set_intr(sc, 1, STX_UE_INO, schizo_ue); + if ((reg & (1ULL << STX_CE_INO)) != 0) + schizo_set_intr(sc, 2, STX_CE_INO, schizo_ce); + if ((reg & (1ULL << STX_BUS_INO)) != 0) + schizo_set_intr(sc, 3, STX_BUS_INO, schizo_host_bus); /* * Setup Safari/JBus performance counter 0 in bus cycle counting @@ -490,15 +495,15 @@ * "pair" of Tomatillos, too. */ if (sc->sc_half == 0) { - SCZTOM_CTRL_WRITE_8(sc, SCZTOM_CTRL_PERF, - (SCZTOM_CTRL_PERF_DIS << SCZTOM_CTRL_PERF_CNT1_SHIFT) | - (SCZTOM_CTRL_PERF_BUSCYC << SCZTOM_CTRL_PERF_CNT0_SHIFT)); + SCHIZO_CTRL_WRITE_8(sc, STX_CTRL_PERF, + (STX_CTRL_PERF_DIS << STX_CTRL_PERF_CNT1_SHIFT) | + (STX_CTRL_PERF_BUSCYC << STX_CTRL_PERF_CNT0_SHIFT)); tc = malloc(sizeof(*tc), M_DEVBUF, M_NOWAIT | M_ZERO); if (tc == NULL) panic("%s: could not malloc timecounter", __func__); tc->tc_get_timecount = schizo_get_timecount; tc->tc_poll_pps = NULL; - tc->tc_counter_mask = SCZTOM_CTRL_PERF_CNT_MASK; + tc->tc_counter_mask = STX_CTRL_PERF_CNT_MASK; if (OF_getprop(OF_peer(0), "clock-frequency", &prop, sizeof(prop)) == -1) panic("%s: could not determine clock frequency", @@ -506,19 +511,19 @@ tc->tc_frequency = prop; tc->tc_name = strdup(device_get_nameunit(dev), M_DEVBUF); if (mode == SCHIZO_MODE_SCZ) - tc->tc_quality = SCZTOM_PERF_CNT_QLTY; + tc->tc_quality = SCHIZO_PERF_CNT_QLTY; else - tc->tc_quality = -SCZTOM_PERF_CNT_QLTY; + tc->tc_quality = -SCHIZO_PERF_CNT_QLTY; tc->tc_priv = sc; tc_init(tc); } /* Set up the IOMMU. Both Schizo and Tomatillo have one per PBM. */ - sc->sc_is.is_pmaxaddr = IOMMU_MAXADDR(SCZTOM_IOMMU_BITS); + sc->sc_is.is_pmaxaddr = IOMMU_MAXADDR(STX_IOMMU_BITS); sc->sc_is.is_sb[0] = 0; sc->sc_is.is_sb[1] = 0; if (OF_getproplen(node, "no-streaming-cache") < 0) - sc->sc_is.is_sb[0] = SCZTOM_PCI_STRBUF; + sc->sc_is.is_sb[0] = STX_PCI_STRBUF; #define TSBCASE(x) \ case (IOTSB_BASESZ << (x)) << (IO_PAGE_SHIFT - IOTTE_SHIFT): \ @@ -552,12 +557,12 @@ sc->sc_pci_io_rman.rm_type = RMAN_ARRAY; sc->sc_pci_io_rman.rm_descr = "Schizo PCI I/O Ports"; if (rman_init(&sc->sc_pci_io_rman) != 0 || - rman_manage_region(&sc->sc_pci_io_rman, 0, SCZTOM_IO_SIZE) != 0) + rman_manage_region(&sc->sc_pci_io_rman, 0, STX_IO_SIZE) != 0) panic("%s: failed to set up I/O rman", __func__); sc->sc_pci_mem_rman.rm_type = RMAN_ARRAY; sc->sc_pci_mem_rman.rm_descr = "Schizo PCI Memory"; if (rman_init(&sc->sc_pci_mem_rman) != 0 || - rman_manage_region(&sc->sc_pci_mem_rman, 0, SCZTOM_MEM_SIZE) != 0) + rman_manage_region(&sc->sc_pci_mem_rman, 0, STX_MEM_SIZE) != 0) panic("%s: failed to set up memory rman", __func__); nrange = OF_getprop_alloc(node, "ranges", sizeof(*range), @@ -566,7 +571,7 @@ * Make sure that the expected ranges are present. The * OFW_PCI_CS_MEM64 one is not currently used though. */ - if (nrange != SCZTOM_NRANGE) + if (nrange != STX_NRANGE) panic("%s: unsupported number of ranges", __func__); /* * Find the addresses of the various bus spaces. @@ -574,7 +579,7 @@ * The physical start addresses of the ranges are the configuration, * memory and I/O handles. */ - for (n = 0; n < SCZTOM_NRANGE; n++) { + for (n = 0; n < STX_NRANGE; n++) { i = OFW_PCI_RANGE_CS(&range[n]); if (sc->sc_pci_bh[i] != 0) panic("%s: duplicate range for space %d", __func__, i); @@ -613,17 +618,17 @@ sc->sc_pci_secbus = prop_array[0]; /* Clear PCI status error bits. */ - PCIB_WRITE_CONFIG(dev, sc->sc_pci_secbus, SCZTOM_CS_DEVICE, - SCZTOM_CS_FUNC, PCIR_STATUS, PCIM_STATUS_PERR | - PCIM_STATUS_RMABORT | PCIM_STATUS_RTABORT | PCIM_STATUS_STABORT | + PCIB_WRITE_CONFIG(dev, sc->sc_pci_secbus, STX_CS_DEVICE, STX_CS_FUNC, + PCIR_STATUS, PCIM_STATUS_PERR | PCIM_STATUS_RMABORT | + PCIM_STATUS_RTABORT | PCIM_STATUS_STABORT | PCIM_STATUS_PERRREPORT, 2); /* * Set the latency timer register as this isn't always done by the * firmware. */ - PCIB_WRITE_CONFIG(dev, sc->sc_pci_secbus, SCZTOM_CS_DEVICE, - SCZTOM_CS_FUNC, PCIR_LATTIMER, OFW_PCI_LATENCY, 1); + PCIB_WRITE_CONFIG(dev, sc->sc_pci_secbus, STX_CS_DEVICE, STX_CS_FUNC, + PCIR_LATTIMER, OFW_PCI_LATENCY, 1); ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(ofw_pci_intr_t)); @@ -663,15 +668,15 @@ * on that PCI controller. */ - if (ino > SCZTOM_MAX_INO) { + if (ino > STX_MAX_INO) { device_printf(sc->sc_dev, "out of range INO %d requested\n", ino); return (0); } - intrmap = SCZTOM_PCI_IMAP_BASE + (ino << 3); - intrclr = SCZTOM_PCI_ICLR_BASE + (ino << 3); - mr = SCZTOM_PCI_READ_8(sc, intrmap); + intrmap = STX_PCI_IMAP_BASE + (ino << 3); + intrclr = STX_PCI_ICLR_BASE + (ino << 3); + mr = SCHIZO_PCI_READ_8(sc, intrmap); if (INTINO(mr) != ino) { device_printf(sc->sc_dev, "interrupt map entry does not match INO (%d != %d)\n", @@ -696,13 +701,13 @@ uint64_t afar, afsr, csr, iommu; uint32_t status; - afar = SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_AFAR); - afsr = SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_AFSR); - csr = SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_CTRL); - iommu = SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_IOMMU); + afar = SCHIZO_PCI_READ_8(sc, STX_PCI_AFAR); + afsr = SCHIZO_PCI_READ_8(sc, STX_PCI_AFSR); + csr = SCHIZO_PCI_READ_8(sc, STX_PCI_CTRL); + iommu = SCHIZO_PCI_READ_8(sc, STX_PCI_IOMMU); status = PCIB_READ_CONFIG(sc->sc_dev, sc->sc_pci_secbus, - SCZTOM_CS_DEVICE, SCZTOM_CS_FUNC, PCIR_STATUS, 2); - if ((csr & SCZTOM_PCI_CTRL_MMU_ERR) != 0) { + STX_CS_DEVICE, STX_CS_FUNC, PCIR_STATUS, 2); + if ((csr & STX_PCI_CTRL_MMU_ERR) != 0) { if ((iommu & TOM_PCI_IOMMU_ERR) == 0) goto clear_error; @@ -712,7 +717,7 @@ TOM_PCI_IOMMU_INVALID_ERR || (iommu & TOM_PCI_IOMMU_ERR_ILLTSBTBW) != 0 || (iommu & TOM_PCI_IOMMU_ERR_BAD_VA) != 0)) { - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_IOMMU, iommu); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_IOMMU, iommu); goto clear_error; } } @@ -731,10 +736,10 @@ (unsigned long long)afar, (unsigned long long)afsr, (unsigned long long)csr, (unsigned long long)status); /* Clear the error bits that we caught. */ - PCIB_WRITE_CONFIG(sc->sc_dev, sc->sc_pci_secbus, SCZTOM_CS_DEVICE, - SCZTOM_CS_FUNC, PCIR_STATUS, status, 2); - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_CTRL, csr); - SCZTOM_PCI_WRITE_8(sc, SCZTOM_PCI_AFSR, afsr); + PCIB_WRITE_CONFIG(sc->sc_dev, sc->sc_pci_secbus, STX_CS_DEVICE, + STX_CS_FUNC, PCIR_STATUS, status, 2); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_CTRL, csr); + SCHIZO_PCI_WRITE_8(sc, STX_PCI_AFSR, afsr); return (FILTER_HANDLED); } @@ -746,10 +751,10 @@ int i; mtx_lock_spin(sc->sc_mtx); - afar = SCZTOM_CTRL_READ_8(sc, SCZTOM_CTRL_UE_AFAR); + afar = SCHIZO_CTRL_READ_8(sc, STX_CTRL_UE_AFAR); for (i = 0; i < 1000; i++) - if (((afsr = SCZTOM_CTRL_READ_8(sc, SCZTOM_CTRL_UE_AFSR)) & - SCZTOM_CTRL_CE_AFSR_ERRPNDG) == 0) + if (((afsr = SCHIZO_CTRL_READ_8(sc, STX_CTRL_UE_AFSR)) & + STX_CTRL_CE_AFSR_ERRPNDG) == 0) break; mtx_unlock_spin(sc->sc_mtx); panic("%s: uncorrectable DMA error AFAR %#llx AFSR %#llx", @@ -766,17 +771,17 @@ int i; mtx_lock_spin(sc->sc_mtx); - afar = SCZTOM_CTRL_READ_8(sc, SCZTOM_CTRL_CE_AFAR); + afar = SCHIZO_CTRL_READ_8(sc, STX_CTRL_CE_AFAR); for (i = 0; i < 1000; i++) - if (((afsr = SCZTOM_CTRL_READ_8(sc, SCZTOM_CTRL_UE_AFSR)) & - SCZTOM_CTRL_CE_AFSR_ERRPNDG) == 0) + if (((afsr = SCHIZO_CTRL_READ_8(sc, STX_CTRL_UE_AFSR)) & + STX_CTRL_CE_AFSR_ERRPNDG) == 0) break; device_printf(sc->sc_dev, "correctable DMA error AFAR %#llx AFSR %#llx\n", (unsigned long long)afar, (unsigned long long)afsr); /* Clear the error bits that we caught. */ - SCZTOM_CTRL_WRITE_8(sc, SCZTOM_CTRL_UE_AFSR, - afsr & SCZTOM_CTRL_CE_AFSR_ERRMASK); + SCHIZO_CTRL_WRITE_8(sc, STX_CTRL_UE_AFSR, + afsr & STX_CTRL_CE_AFSR_ERRMASK); mtx_unlock_spin(sc->sc_mtx); return (FILTER_HANDLED); } @@ -787,7 +792,7 @@ struct schizo_softc *sc = arg; uint64_t errlog; - errlog = SCZTOM_CTRL_READ_8(sc, SCZTOM_CTRL_BUS_ERRLOG); + errlog = SCHIZO_CTRL_READ_8(sc, STX_CTRL_BUS_ERRLOG); panic("%s: %s error %#llx", device_get_name(sc->sc_dev), sc->sc_mode == SCHIZO_MODE_TOM ? "JBus" : "Safari", (unsigned long long)errlog); @@ -799,14 +804,14 @@ { /* Punch in our copies. */ - sc->sc_is.is_bustag = rman_get_bustag(sc->sc_mem_res[SCZTOM_PCI]); - sc->sc_is.is_bushandle = rman_get_bushandle(sc->sc_mem_res[SCZTOM_PCI]); - sc->sc_is.is_iommu = SCZTOM_PCI_IOMMU; - sc->sc_is.is_dtag = SCZTOM_PCI_IOMMU_TLB_TAG_DIAG; - sc->sc_is.is_ddram = SCZTOM_PCI_IOMMU_TLB_DATA_DIAG; - sc->sc_is.is_dqueue = SCZTOM_PCI_IOMMU_QUEUE_DIAG; - sc->sc_is.is_dva = SCZTOM_PCI_IOMMU_SVADIAG; - sc->sc_is.is_dtcmp = SCZTOM_PCI_IOMMU_TLB_CMP_DIAG; + sc->sc_is.is_bustag = rman_get_bustag(sc->sc_mem_res[STX_PCI]); + sc->sc_is.is_bushandle = rman_get_bushandle(sc->sc_mem_res[STX_PCI]); + sc->sc_is.is_iommu = STX_PCI_IOMMU; + sc->sc_is.is_dtag = STX_PCI_IOMMU_TLB_TAG_DIAG; + sc->sc_is.is_ddram = STX_PCI_IOMMU_TLB_DATA_DIAG; + sc->sc_is.is_dqueue = STX_PCI_IOMMU_QUEUE_DIAG; + sc->sc_is.is_dva = STX_PCI_IOMMU_SVADIAG; + sc->sc_is.is_dtcmp = STX_PCI_IOMMU_TLB_CMP_DIAG; iommu_init(device_get_nameunit(sc->sc_dev), &sc->sc_is, tsbsize, dvmabase, 0); @@ -843,11 +848,11 @@ * The Schizo bridges contain a dupe of their header at 0x80. */ if (sc->sc_mode == SCHIZO_MODE_SCZ && bus == sc->sc_pci_secbus && - slot == SCZTOM_CS_DEVICE && func == SCZTOM_CS_FUNC && + slot == STX_CS_DEVICE && func == STX_CS_FUNC && reg + width > 0x80) return (0); - offset = SCZTOM_CONF_OFF(bus, slot, func, reg); + offset = STX_CONF_OFF(bus, slot, func, reg); bh = sc->sc_pci_bh[OFW_PCI_CS_CONFIG]; switch (width) { case 1: @@ -886,7 +891,7 @@ u_long offset = 0; sc = device_get_softc(dev); - offset = SCZTOM_CONF_OFF(bus, slot, func, reg); + offset = STX_CONF_OFF(bus, slot, func, reg); bh = sc->sc_pci_bh[OFW_PCI_CS_CONFIG]; switch (width) { case 1: @@ -952,16 +957,17 @@ int timeout; reg = 1ULL << sds->sds_ino; - SCZTOM_PCI_WRITE_8(sc, TOM_PCI_DMA_SYNC_PEND, reg); + SCHIZO_PCI_WRITE_8(sc, sds->sds_syncreg, reg); timeout = 1000000; - for (; SCZTOM_PCI_READ_8(sc, TOM_PCI_DMA_SYNC_PEND) & reg;) + for (; SCHIZO_PCI_READ_8(sc, sds->sds_syncreg) & reg;) if (--timeout < 0) panic("%s: DMA does not sync", __func__); + /* - * Version <= 4 bridges additionally need a block store as a - * workaround for a hardware bug. + * Tomatillo version <= 4 bridges additionally need a block + * store as a workaround for a hardware bug. */ - if (sc->sc_ver <= 4) { + if (sc->sc_mode == SCHIZO_MODE_TOM && sc->sc_ver <= 4) { critical_enter(); reg = rd(fprs); wr(fprs, reg | FPRS_FEF, 0); @@ -980,7 +986,7 @@ struct intr_vector *iv = arg; struct schizo_icarg *sica = iv->iv_icarg; - SCZTOM_PCI_WRITE_8(sica->sica_sc, sica->sica_map, + SCHIZO_PCI_WRITE_8(sica->sica_sc, sica->sica_map, INTMAP_ENABLE(iv->iv_vec, iv->iv_mid)); } @@ -990,7 +996,7 @@ struct intr_vector *iv = arg; struct schizo_icarg *sica = iv->iv_icarg; - SCZTOM_PCI_WRITE_8(sica->sica_sc, sica->sica_map, iv->iv_vec); + SCHIZO_PCI_WRITE_8(sica->sica_sc, sica->sica_map, iv->iv_vec); } static void @@ -999,8 +1005,8 @@ struct intr_vector *iv = arg; struct schizo_icarg *sica = iv->iv_icarg; - SCZTOM_PCI_WRITE_8(sica->sica_sc, sica->sica_map, INTMAP_TID( - SCZTOM_PCI_READ_8(sica->sica_sc, sica->sica_map), iv->iv_mid)); + SCHIZO_PCI_WRITE_8(sica->sica_sc, sica->sica_map, INTMAP_TID( + SCHIZO_PCI_READ_8(sica->sica_sc, sica->sica_map), iv->iv_mid)); } static void @@ -1009,7 +1015,7 @@ struct intr_vector *iv = arg; struct schizo_icarg *sica = iv->iv_icarg; - SCZTOM_PCI_WRITE_8(sica->sica_sc, sica->sica_clr, 0); + SCHIZO_PCI_WRITE_8(sica->sica_sc, sica->sica_clr, 0); } static int @@ -1035,19 +1041,23 @@ } /* - * Tomatillo bridges need to be manually told to sync DMA writes. + * Schizo revision >= 2.3 (i.e. version >= 5) and Tomatillo bridges + * need to be manually told to sync DMA writes. * XXX setup of the wrapper and the contents of schizo_dmasync() * should be moved to schizo(4)-specific bus_dma_tag_create() and * bus_dmamap_sync() methods, respectively, once DMA tag creation * is newbus'ified, so the wrapper isn't only applied for interrupt * handlers but also for polling(4) callbacks. */ - if (sc->sc_mode == SCHIZO_MODE_TOM) { + if ((sc->sc_mode == SCHIZO_MODE_SCZ && sc->sc_ver >= 5) || + sc->sc_mode == SCHIZO_MODE_TOM) { sds = malloc(sizeof(*sds), M_DEVBUF, M_NOWAIT | M_ZERO); if (sds == NULL) return (ENOMEM); sds->sds_sc = sc; sds->sds_arg = arg; + sds->sds_syncreg = sc->sc_mode == SCHIZO_MODE_SCZ ? + SCZ_PCI_DMA_SYNC : TOMXMS_PCI_DMA_SYNC_PEND; sds->sds_ino = INTINO(vec); if (intr == NULL) { sds->sds_handler = filt; @@ -1238,7 +1248,7 @@ panic("%s: out of memory", __func__); bt->bst_cookie = sc; - bt->bst_parent = rman_get_bustag(sc->sc_mem_res[SCZTOM_PCI]); + bt->bst_parent = rman_get_bustag(sc->sc_mem_res[STX_PCI]); bt->bst_type = type; return (bt); } @@ -1249,6 +1259,6 @@ struct schizo_softc *sc; sc = tc->tc_priv; - return (SCZTOM_CTRL_READ_8(sc, SCZTOM_CTRL_PERF_CNT) & - (SCZTOM_CTRL_PERF_CNT_MASK << SCZTOM_CTRL_PERF_CNT_CNT0_SHIFT)); + return (SCHIZO_CTRL_READ_8(sc, STX_CTRL_PERF_CNT) & + (STX_CTRL_PERF_CNT_MASK << STX_CTRL_PERF_CNT_CNT0_SHIFT)); } ==== //depot/projects/usiii/sparc64/pci/schizoreg.h#4 (text+ko) ==== @@ -31,41 +31,41 @@ #ifndef _SPARC64_PCI_SCHIZOREG_H_ #define _SPARC64_PCI_SCHIZOREG_H_ -#define SCZTOM_NINTR 4 -#define SCZTOM_NRANGE 4 +#define STX_NINTR 4 +#define STX_NRANGE 4 #define SCZ_NREG 3 #define TOM_NREG 4 -#define SCZTOM_PCI 0 -#define SCZTOM_CTRL 1 -#define SCZTOM_PCICFG 2 -#define SCZTOM_ICON 3 +#define STX_PCI 0 +#define STX_CTRL 1 +#define STX_PCICFG 2 +#define STX_ICON 3 /* PCI configuration and status registers */ -#define SCZTOM_PCI_IOMMU 0x00200 -#define SCZTOM_PCI_IOMMU_CTXFLUSH 0x00218 -#define SCZTOM_PCI_IMAP_BASE 0x01000 -#define SCZTOM_PCI_ICLR_BASE 0x01400 -#define SCZTOM_PCI_INTR_RETRY_TIM 0x01a00 +#define STX_PCI_IOMMU 0x00200 +#define STX_PCI_IOMMU_CTXFLUSH 0x00218 +#define STX_PCI_IMAP_BASE 0x01000 +#define STX_PCI_ICLR_BASE 0x01400 +#define STX_PCI_INTR_RETRY_TIM 0x01a00 #define SCZ_PCI_DMA_SYNC 0x01a08 #define TOM_PCI_DMA_SYNC_COMP 0x01a10 -#define TOM_PCI_DMA_SYNC_PEND 0x01a18 -#define SCZTOM_PCI_CTRL 0x02000 -#define SCZTOM_PCI_AFSR 0x02010 -#define SCZTOM_PCI_AFAR 0x02018 -#define SCZTOM_PCI_DIAG 0x02020 +#define TOMXMS_PCI_DMA_SYNC_PEND 0x01a18 +#define STX_PCI_CTRL 0x02000 +#define STX_PCI_AFSR 0x02010 +#define STX_PCI_AFAR 0x02018 +#define STX_PCI_DIAG 0x02020 #define TOM_PCI_IOC_CSR 0x02248 #define TOM_PCI_IOC_TAG 0x02290 #define TOM_PCI_IOC_DATA 0x02290 -#define SCZTOM_PCI_STRBUF 0x02800 -#define SCZTOM_PCI_STRBUF_CTXFLUSH 0x02818 -#define SCZTOM_PCI_IOMMU_SVADIAG 0x0a400 -#define SCZTOM_PCI_IOMMU_TLB_CMP_DIAG 0x0a408 -#define SCZTOM_PCI_IOMMU_QUEUE_DIAG 0x0a500 -#define SCZTOM_PCI_IOMMU_TLB_TAG_DIAG 0x0a580 -#define SCZTOM_PCI_IOMMU_TLB_DATA_DIAG 0x0a600 -#define SCZTOM_PCI_IOBIO_DIAG 0x0a808 -#define SCZTOM_PCI_STRBUF_CTXMATCH 0x10000 +#define STX_PCI_STRBUF 0x02800 +#define STX_PCI_STRBUF_CTXFLUSH 0x02818 +#define STX_PCI_IOMMU_SVADIAG 0x0a400 +#define STX_PCI_IOMMU_TLB_CMP_DIAG 0x0a408 +#define STX_PCI_IOMMU_QUEUE_DIAG 0x0a500 +#define STX_PCI_IOMMU_TLB_TAG_DIAG 0x0a580 +#define STX_PCI_IOMMU_TLB_DATA_DIAG 0x0a600 +#define STX_PCI_IOBIO_DIAG 0x0a808 +#define STX_PCI_STRBUF_CTXMATCH 0x10000 /* PCI IOMMU control registers */ #define TOM_PCI_IOMMU_ERR_BAD_VA 0x0000000010000000ULL @@ -75,8 +75,8 @@ #define TOM_PCI_IOMMU_INVALID_ERR 0x0000000002000000ULL #define TOM_PCI_IOMMU_PROTECTION_ERR 0x0000000000000000ULL #define TOM_PCI_IOMMU_ERRMASK \ - (TOM_PCI_IOMMU_PROTECTION_ERR | TOM_PCI_IOMMU_INVALID_ERR | \ - TOM_PCI_IOMMU_TIMEOUT_ERR | TOM_PCI_IOMMU_ECC_ERR) + (TOM_PCI_IOMMU_PROTECTION_ERR | TOM_PCI_IOMMU_INVALID_ERR | \ + TOM_PCI_IOMMU_TIMEOUT_ERR | TOM_PCI_IOMMU_ECC_ERR) #define TOM_PCI_IOMMU_ERR 0x0000000001000000ULL /* PCI control/status register */ @@ -85,59 +85,58 @@ #define TOM_PCI_CTRL_DTO_IEN 0x2000000000000000ULL #define SCZ_PCI_CTRL_ESLCK 0x0008000000000000ULL #define SCZ_PCI_CTRL_ERRSLOT 0x0007000000000000ULL -#define SCZTOM_PCI_CTRL_TTO_ERR 0x0000004000000000ULL -#define SCZTOM_PCI_CTRL_RTRY_ERR 0x0000002000000000ULL -#define SCZTOM_PCI_CTRL_MMU_ERR 0x0000001000000000ULL +#define STX_PCI_CTRL_TTO_ERR 0x0000004000000000ULL +#define STX_PCI_CTRL_RTRY_ERR 0x0000002000000000ULL +#define STX_PCI_CTRL_MMU_ERR 0x0000001000000000ULL #define SCZ_PCI_CTRL_SBH_ERR 0x0000000800000000ULL -#define SCZTOM_PCI_CTRL_SERR 0x0000000400000000ULL +#define STX_PCI_CTRL_SERR 0x0000000400000000ULL #define SCZ_PCI_CTRL_PCISPD 0x0000000200000000ULL #define TOM_PCI_CTRL_PRM 0x0000000040000000ULL #define TOM_PCI_CTRL_PRO 0x0000000020000000ULL #define TOM_PCI_CTRL_PRL 0x0000000010000000ULL -#define SCZTOM_PCI_CTRL_PTO 0x0000000003000000ULL -#define SCZTOM_PCI_CTRL_MMU_IEN 0x0000000000080000ULL -#define SCZTOM_PCI_CTRL_SBH_IEN 0x0000000000040000ULL -#define SCZTOM_PCI_CTRL_ERR_IEN 0x0000000000020000ULL -#define SCZTOM_PCI_CTRL_ARB_PARK 0x0000000000010000ULL +#define STX_PCI_CTRL_PTO 0x0000000003000000ULL +#define STX_PCI_CTRL_MMU_IEN 0x0000000000080000ULL +#define STX_PCI_CTRL_SBH_IEN 0x0000000000040000ULL +#define STX_PCI_CTRL_ERR_IEN 0x0000000000020000ULL +#define STX_PCI_CTRL_ARB_PARK 0x0000000000010000ULL #define SCZ_PCI_CTRL_PCIRST 0x0000000000000100ULL -#define SCZTOM_PCI_CTRL_ARB_MASK 0x00000000000000ffULL +#define STX_PCI_CTRL_ARB_MASK 0x00000000000000ffULL /* PCI asynchronous fault status register */ -#define SCZTOM_PCI_AFSR_P_MA 0x8000000000000000ULL -#define SCZTOM_PCI_AFSR_P_TA 0x4000000000000000ULL -#define SCZTOM_PCI_AFSR_P_RTRY 0x2000000000000000ULL -#define SCZTOM_PCI_AFSR_P_PERR 0x1000000000000000ULL -#define SCZTOM_PCI_AFSR_P_TTO 0x0800000000000000ULL -#define SCZTOM_PCI_AFSR_P_UNUS 0x0400000000000000ULL -#define SCZTOM_PCI_AFSR_S_MA 0x0200000000000000ULL -#define SCZTOM_PCI_AFSR_S_TA 0x0100000000000000ULL -#define SCZTOM_PCI_AFSR_S_RTRY 0x0080000000000000ULL -#define SCZTOM_PCI_AFSR_S_PERR 0x0040000000000000ULL -#define SCZTOM_PCI_AFSR_S_TTO 0x0020000000000000ULL -#define SCZTOM_PCI_AFSR_S_UNUS 0x0010000000000000ULL -#define SCZTOM_PCI_AFSR_DWMASK 0x0000030000000000ULL -#define SCZTOM_PCI_AFSR_BMASK 0x000000ff00000000ULL -#define SCZTOM_PCI_AFSR_BLK 0x0000000080000000ULL -#define SCZTOM_PCI_AFSR_CFG 0x0000000040000000ULL -#define SCZTOM_PCI_AFSR_MEM 0x0000000020000000ULL -#define SCZTOM_PCI_AFSR_IO 0x0000000010000000ULL +#define STX_PCI_AFSR_P_MA 0x8000000000000000ULL +#define STX_PCI_AFSR_P_TA 0x4000000000000000ULL +#define STX_PCI_AFSR_P_RTRY 0x2000000000000000ULL +#define STX_PCI_AFSR_P_PERR 0x1000000000000000ULL +#define STX_PCI_AFSR_P_TTO 0x0800000000000000ULL +#define STX_PCI_AFSR_P_UNUS 0x0400000000000000ULL +#define STX_PCI_AFSR_S_MA 0x0200000000000000ULL +#define STX_PCI_AFSR_S_TA 0x0100000000000000ULL +#define STX_PCI_AFSR_S_RTRY 0x0080000000000000ULL +#define STX_PCI_AFSR_S_PERR 0x0040000000000000ULL +#define STX_PCI_AFSR_S_TTO 0x0020000000000000ULL +#define STX_PCI_AFSR_S_UNUS 0x0010000000000000ULL +#define STX_PCI_AFSR_DWMASK 0x0000030000000000ULL +#define STX_PCI_AFSR_BMASK 0x000000ff00000000ULL +#define STX_PCI_AFSR_BLK 0x0000000080000000ULL +#define STX_PCI_AFSR_CFG 0x0000000040000000ULL +#define STX_PCI_AFSR_MEM 0x0000000020000000ULL +#define STX_PCI_AFSR_IO 0x0000000010000000ULL -#define SCZTOM_PCI_AFSR_ERRMASK \ - (SCZTOM_PCI_AFSR_P_MA | SCZTOM_PCI_AFSR_P_TA | \ - SCZTOM_PCI_AFSR_P_RTRY | SCZTOM_PCI_AFSR_P_PERR | \ - SCZTOM_PCI_AFSR_S_MA | SCZTOM_PCI_AFSR_S_TA | \ - SCZTOM_PCI_AFSR_S_RTRY | SCZTOM_PCI_AFSR_S_PERR) +#define STX_PCI_AFSR_ERRMASK \ + (STX_PCI_AFSR_P_MA | STX_PCI_AFSR_P_TA | STX_PCI_AFSR_P_RTRY | \ + STX_PCI_AFSR_P_PERR | STX_PCI_AFSR_S_MA | STX_PCI_AFSR_S_TA | \ + STX_PCI_AFSR_S_RTRY | STX_PCI_AFSR_S_PERR) /* PCI diagnostic register */ #define SCZ_PCI_DIAG_BADECC_DIS 0x0000000000000400ULL -#define SCZTOM_PCI_DIAG_BYPASS_DIS 0x0000000000000200ULL -#define SCZTOM_PCI_DIAG_TTO_DIS 0x0000000000000100ULL +#define STX_PCI_DIAG_BYPASS_DIS 0x0000000000000200ULL +#define STX_PCI_DIAG_TTO_DIS 0x0000000000000100ULL #define SCZ_PCI_DIAG_RTRYARB_DIS 0x0000000000000080ULL -#define SCZTOM_PCI_DIAG_RETRY_DIS 0x0000000000000040ULL -#define SCZTOM_PCI_DIAG_INTRSYNC_DIS 0x0000000000000020ULL -#define SCZTOM_PCI_DIAG_DMAPARITY_INV 0x0000000000000008ULL -#define SCZTOM_PCI_DIAG_PIODPARITY_INV 0x0000000000000004ULL -#define SCZTOM_PCI_DIAG_PIOAPARITY_INV 0x0000000000000002ULL +#define STX_PCI_DIAG_RETRY_DIS 0x0000000000000040ULL +#define STX_PCI_DIAG_INTRSYNC_DIS 0x0000000000000020ULL +#define STX_PCI_DIAG_DMAPARITY_INV 0x0000000000000008ULL +#define STX_PCI_DIAG_PIODPARITY_INV 0x0000000000000004ULL +#define STX_PCI_DIAG_PIOAPARITY_INV 0x0000000000000002ULL /* Tomatillo I/O cache register */ #define TOM_PCI_IOC_PW 0x0000000000080000ULL @@ -158,17 +157,17 @@ /* Controller configuration and status registers */ /* Note that these are shared on Schizo but per-PBM on Tomatillo. */ -#define SCZTOM_CTRL_BUS_ERRLOG 0x00018 -#define SCZTOM_CTRL_ECCCTRL 0x00020 -#define SCZTOM_CTRL_UE_AFSR 0x00030 -#define SCZTOM_CTRL_UE_AFAR 0x00038 -#define SCZTOM_CTRL_CE_AFSR 0x00040 -#define SCZTOM_CTRL_CE_AFAR 0x00048 -#define SCZTOM_CTRL_PERF 0x07000 -#define SCZTOM_CTRL_PERF_CNT 0x07008 +#define STX_CTRL_BUS_ERRLOG 0x00018 +#define STX_CTRL_ECCCTRL 0x00020 +#define STX_CTRL_UE_AFSR 0x00030 +#define STX_CTRL_UE_AFAR 0x00038 +#define STX_CTRL_CE_AFSR 0x00040 +#define STX_CTRL_CE_AFAR 0x00048 +#define STX_CTRL_PERF 0x07000 +#define STX_CTRL_PERF_CNT 0x07008 /* Safari/JBus error log register */ -#define SCZTOM_CTRL_BUS_ERRLOG_BADCMD 0x4000000000000000ULL +#define STX_CTRL_BUS_ERRLOG_BADCMD 0x4000000000000000ULL #define SCZ_CTRL_BUS_ERRLOG_SSMDIS 0x2000000000000000ULL #define SCZ_CTRL_BUS_ERRLOG_BADMA 0x1000000000000000ULL #define SCZ_CTRL_BUS_ERRLOG_BADMB 0x0800000000000000ULL @@ -194,55 +193,55 @@ #define SCZ_CTRL_BUS_ERRLOG_SFPQTO 0x0000000000000080ULL #define SCZ_CTRL_BUS_ERRLOG_UFPQTO 0x0000000000000040ULL #define TOM_CTRL_BUS_ERRLOG_RD_PERR 0x0000000000000040ULL -#define SCZTOM_CTRL_BUS_ERRLOG_APERR 0x0000000000000020ULL -#define SCZTOM_CTRL_BUS_ERRLOG_UNMAP 0x0000000000000010ULL -#define SCZTOM_CTRL_BUS_ERRLOG_BUSERR 0x0000000000000004ULL -#define SCZTOM_CTRL_BUS_ERRLOG_TIMEOUT 0x0000000000000002ULL +#define STX_CTRL_BUS_ERRLOG_APERR 0x0000000000000020ULL +#define STX_CTRL_BUS_ERRLOG_UNMAP 0x0000000000000010ULL +#define STX_CTRL_BUS_ERRLOG_BUSERR 0x0000000000000004ULL +#define STX_CTRL_BUS_ERRLOG_TIMEOUT 0x0000000000000002ULL #define SCZ_CTRL_BUS_ERRLOG_ILL 0x0000000000000001ULL /* ECC control register */ -#define SCZTOM_CTRL_ECCCTRL_EE 0x8000000000000000ULL -#define SCZTOM_CTRL_ECCCTRL_UE 0x4000000000000000ULL -#define SCZTOM_CTRL_ECCCTRL_CE 0x2000000000000000ULL +#define STX_CTRL_ECCCTRL_EE 0x8000000000000000ULL +#define STX_CTRL_ECCCTRL_UE 0x4000000000000000ULL +#define STX_CTRL_ECCCTRL_CE 0x2000000000000000ULL /* Uncorrectable error asynchronous fault status register */ -#define SCZTOM_CTRL_UE_AFSR_P_PIO 0x8000000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_P_DRD 0x4000000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_P_DWR 0x2000000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_S_PIO 0x1000000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_S_DRD 0x0800000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_S_DWR 0x0400000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_ERRPNDG 0x0300000000000000ULL -#define SCZTOM_CTRL_UE_AFSR_BMASK 0x000003ff00000000ULL -#define SCZTOM_CTRL_UE_AFSR_QOFF 0x00000000c0000000ULL -#define SCZTOM_CTRL_UE_AFSR_AID 0x000000001f000000ULL -#define SCZTOM_CTRL_UE_AFSR_PARTIAL 0x0000000000800000ULL -#define SCZTOM_CTRL_UE_AFSR_OWNEDIN 0x0000000000400000ULL -#define SCZTOM_CTRL_UE_AFSR_MTAGSYND 0x00000000000f0000ULL -#define SCZTOM_CTRL_UE_AFSR_MTAG 0x000000000000e000ULL -#define SCZTOM_CTRL_UE_AFSR_ECCSYND 0x00000000000001ffULL +#define STX_CTRL_UE_AFSR_P_PIO 0x8000000000000000ULL +#define STX_CTRL_UE_AFSR_P_DRD 0x4000000000000000ULL +#define STX_CTRL_UE_AFSR_P_DWR 0x2000000000000000ULL +#define STX_CTRL_UE_AFSR_S_PIO 0x1000000000000000ULL +#define STX_CTRL_UE_AFSR_S_DRD 0x0800000000000000ULL +#define STX_CTRL_UE_AFSR_S_DWR 0x0400000000000000ULL +#define STX_CTRL_UE_AFSR_ERRPNDG 0x0300000000000000ULL +#define STX_CTRL_UE_AFSR_BMASK 0x000003ff00000000ULL +#define STX_CTRL_UE_AFSR_QOFF 0x00000000c0000000ULL +#define STX_CTRL_UE_AFSR_AID 0x000000001f000000ULL +#define STX_CTRL_UE_AFSR_PARTIAL 0x0000000000800000ULL +#define STX_CTRL_UE_AFSR_OWNEDIN 0x0000000000400000ULL +#define STX_CTRL_UE_AFSR_MTAGSYND 0x00000000000f0000ULL +#define STX_CTRL_UE_AFSR_MTAG 0x000000000000e000ULL +#define STX_CTRL_UE_AFSR_ECCSYND 0x00000000000001ffULL /* Correctable error asynchronous fault status register */ -#define SCZTOM_CTRL_CE_AFSR_P_PIO 0x8000000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_P_DRD 0x4000000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_P_DWR 0x2000000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_S_PIO 0x1000000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_S_DRD 0x0800000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_S_DWR 0x0400000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_ERRPNDG 0x0300000000000000ULL -#define SCZTOM_CTRL_CE_AFSR_BMASK 0x000003ff00000000ULL -#define SCZTOM_CTRL_CE_AFSR_QOFF 0x00000000c0000000ULL -#define SCZTOM_CTRL_CE_AFSR_AID 0x000000001f000000ULL -#define SCZTOM_CTRL_CE_AFSR_PARTIAL 0x0000000000800000ULL -#define SCZTOM_CTRL_CE_AFSR_OWNEDIN 0x0000000000400000ULL -#define SCZTOM_CTRL_CE_AFSR_MTAGSYND 0x00000000000f0000ULL -#define SCZTOM_CTRL_CE_AFSR_MTAG 0x000000000000e000ULL -#define SCZTOM_CTRL_CE_AFSR_ECCSYND 0x00000000000001ffULL +#define STX_CTRL_CE_AFSR_P_PIO 0x8000000000000000ULL +#define STX_CTRL_CE_AFSR_P_DRD 0x4000000000000000ULL +#define STX_CTRL_CE_AFSR_P_DWR 0x2000000000000000ULL +#define STX_CTRL_CE_AFSR_S_PIO 0x1000000000000000ULL +#define STX_CTRL_CE_AFSR_S_DRD 0x0800000000000000ULL +#define STX_CTRL_CE_AFSR_S_DWR 0x0400000000000000ULL +#define STX_CTRL_CE_AFSR_ERRPNDG 0x0300000000000000ULL +#define STX_CTRL_CE_AFSR_BMASK 0x000003ff00000000ULL +#define STX_CTRL_CE_AFSR_QOFF 0x00000000c0000000ULL +#define STX_CTRL_CE_AFSR_AID 0x000000001f000000ULL +#define STX_CTRL_CE_AFSR_PARTIAL 0x0000000000800000ULL +#define STX_CTRL_CE_AFSR_OWNEDIN 0x0000000000400000ULL +#define STX_CTRL_CE_AFSR_MTAGSYND 0x00000000000f0000ULL +#define STX_CTRL_CE_AFSR_MTAG 0x000000000000e000ULL +#define STX_CTRL_CE_AFSR_ECCSYND 0x00000000000001ffULL -#define SCZTOM_CTRL_CE_AFSR_ERRMASK \ - (SCZTOM_CTRL_CE_AFSR_P_PIO | SCZTOM_CTRL_CE_AFSR_P_DRD | \ - SCZTOM_CTRL_CE_AFSR_P_DWR | SCZTOM_CTRL_CE_AFSR_S_PIO | \ - SCZTOM_CTRL_CE_AFSR_S_DRD | SCZTOM_CTRL_CE_AFSR_S_DWR) +#define STX_CTRL_CE_AFSR_ERRMASK \ + (STX_CTRL_CE_AFSR_P_PIO | STX_CTRL_CE_AFSR_P_DRD | \ + STX_CTRL_CE_AFSR_P_DWR | STX_CTRL_CE_AFSR_S_PIO | \ + STX_CTRL_CE_AFSR_S_DRD | STX_CTRL_CE_AFSR_S_DWR) /* * Safari/JBus performance control register @@ -255,58 +254,58 @@ #define SCZ_CTRL_PERF_DVMA_WR 0x0000000000000013ULL #define SCZ_CTRL_PERF_DVMA_RD 0x0000000000000012ULL #define SCZ_CTRL_PERF_CYCPSESYS 0x0000000000000011ULL -#define SCZTOM_CTRL_PERF_PCI_B 0x000000000000000fULL -#define SCZTOM_CTRL_PERF_PCI_A 0x000000000000000eULL -#define SCZTOM_CTRL_PERF_UPA 0x000000000000000dULL -#define SCZTOM_CTRL_PERF_PIOINTRNL 0x000000000000000cULL +#define STX_CTRL_PERF_PCI_B 0x000000000000000fULL +#define STX_CTRL_PERF_PCI_A 0x000000000000000eULL +#define STX_CTRL_PERF_UPA 0x000000000000000dULL +#define STX_CTRL_PERF_PIOINTRNL 0x000000000000000cULL #define TOM_CTRL_PERF_WRI_WRIS 0x000000000000000bULL -#define SCZTOM_CTRL_PERF_INTRS 0x000000000000000aULL -#define SCZTOM_CTRL_PERF_PRTLWRMRGBUF 0x0000000000000009ULL -#define SCZTOM_CTRL_PERF_FGN_IO_HITS 0x0000000000000008ULL -#define SCZTOM_CTRL_PERF_FGN_IO_TRNS 0x0000000000000007ULL -#define SCZTOM_CTRL_PERF_OWN_CHRNT_HITS 0x0000000000000006ULL -#define SCZTOM_CTRL_PERF_OWN_CHRNT_TRNS 0x0000000000000005ULL +#define STX_CTRL_PERF_INTRS 0x000000000000000aULL +#define STX_CTRL_PERF_PRTLWRMRGBUF 0x0000000000000009ULL +#define STX_CTRL_PERF_FGN_IO_HITS 0x0000000000000008ULL +#define STX_CTRL_PERF_FGN_IO_TRNS 0x0000000000000007ULL +#define STX_CTRL_PERF_OWN_CHRNT_HITS 0x0000000000000006ULL +#define STX_CTRL_PERF_OWN_CHRNT_TRNS 0x0000000000000005ULL #define SCZ_CTRL_PERF_FGN_CHRNT_HITS 0x0000000000000004ULL -#define SCZTOM_CTRL_PERF_FGN_CHRNT_TRNS 0x0000000000000003ULL -#define SCZTOM_CTRL_PERF_CYCLES_PAUSE 0x0000000000000002ULL -#define SCZTOM_CTRL_PERF_BUSCYC 0x0000000000000001ULL -#define SCZTOM_CTRL_PERF_DIS 0x0000000000000000ULL -#define SCZTOM_CTRL_PERF_CNT1_SHIFT 11 -#define SCZTOM_CTRL_PERF_CNT0_SHIFT 4 +#define STX_CTRL_PERF_FGN_CHRNT_TRNS 0x0000000000000003ULL +#define STX_CTRL_PERF_CYCLES_PAUSE 0x0000000000000002ULL +#define STX_CTRL_PERF_BUSCYC 0x0000000000000001ULL +#define STX_CTRL_PERF_DIS 0x0000000000000000ULL +#define STX_CTRL_PERF_CNT1_SHIFT 11 +#define STX_CTRL_PERF_CNT0_SHIFT 4 /* Safari/JBus performance counter register */ -#define SCZTOM_CTRL_PERF_CNT_MASK 0x00000000ffffffffULL -#define SCZTOM_CTRL_PERF_CNT_CNT1_SHIFT 32 -#define SCZTOM_CTRL_PERF_CNT_CNT0_SHIFT 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 25 18:20:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97ED41065683; Mon, 25 Aug 2008 18:20: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 5B06B106567B for ; Mon, 25 Aug 2008 18:20:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 421258FC20 for ; Mon, 25 Aug 2008 18:20:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PIKVYF064993 for ; Mon, 25 Aug 2008 18:20:31 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PIKVcE064991 for perforce@freebsd.org; Mon, 25 Aug 2008 18:20:31 GMT (envelope-from bz@freebsd.org) Date: Mon, 25 Aug 2008 18:20:31 GMT Message-Id: <200808251820.m7PIKVcE064991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 148412 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, 25 Aug 2008 18:20:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=148412 Change 148412 by bz@bz_dumpster on 2008/08/25 18:19:48 Put the lines into heading.xsl as I had submitted them. They were misplaced in @148380. Affected files ... .. //depot/projects/trustedbsd/www/heading.xsl#4 edit .. //depot/projects/trustedbsd/www/page.xsl#7 edit Differences ... ==== //depot/projects/trustedbsd/www/heading.xsl#4 (text+ko) ==== @@ -2,6 +2,9 @@ + + + - + TrustedBSD Access Control Lists (ACLs) - $P4: //depot/projects/trustedbsd/www/acls.page#1 $ + $P4: //depot/projects/trustedbsd/www/acls.page#2 $ ==== //depot/projects/trustedbsd/www/audit.page#7 (text+ko) ==== @@ -24,12 +24,12 @@ SUCH DAMAGE. --> - + Security Event Audit - $P4: //depot/projects/trustedbsd/www/audit.page#6 $ + $P4: //depot/projects/trustedbsd/www/audit.page#7 $ ==== //depot/projects/trustedbsd/www/bsmtrace.page#3 (text+ko) ==== @@ -26,12 +26,12 @@ SUCH DAMAGE. --> - + BSMtrace - $P4: //depot/projects/trustedbsd/www/bsmtrace.page#2 $ + $P4: //depot/projects/trustedbsd/www/bsmtrace.page#3 $ ==== //depot/projects/trustedbsd/www/components-selected.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/components.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/developers-selected.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/developers.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/docs-selected.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/docs.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/heading.xsl#5 (text+ko) ==== @@ -5,24 +5,23 @@ - - - - + tag. Use a "selected" version of the image when on a page. --> - {$description} + + {$description} + - {$description} + + {$description} + - @@ -31,62 +30,92 @@ - - - - - - - + +
    - www.TrustedBSD.org + + www.TrustedBSD.org
    - - + + - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - + + + - - + - - - + + + - -
    ==== //depot/projects/trustedbsd/www/home-selected.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/home.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/mac.page#4 (text+ko) ==== @@ -32,12 +32,12 @@ SUCH DAMAGE. --> - + TrustedBSD Mandatory Access Control (MAC) Framework - $P4: //depot/projects/trustedbsd/www/mac.page#3 $ + $P4: //depot/projects/trustedbsd/www/mac.page#4 $ ==== //depot/projects/trustedbsd/www/mailinglists-selected.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/mailinglists.png#2 (binary) ==== ==== //depot/projects/trustedbsd/www/openbsm.page#30 (text+ko) ==== @@ -24,12 +24,12 @@ SUCH DAMAGE. --> - + OpenBSM - $P4: //depot/projects/trustedbsd/www/openbsm.page#29 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#30 $ ==== //depot/projects/trustedbsd/www/trustyheader.png#2 (binary) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 25 19:14:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08FF8106568C; Mon, 25 Aug 2008 19:14: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 C0FD81065681 for ; Mon, 25 Aug 2008 19:14:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A46A98FC19 for ; Mon, 25 Aug 2008 19:14:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PJEqXb076651 for ; Mon, 25 Aug 2008 19:14:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PJEqKm076649 for perforce@freebsd.org; Mon, 25 Aug 2008 19:14:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 19:14:52 GMT Message-Id: <200808251914.m7PJEqKm076649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148424 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, 25 Aug 2008 19:14:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=148424 Change 148424 by rwatson@rwatson_fledge on 2008/08/25 19:14:37 Improve XML happiness. Submitted by: bz Affected files ... .. //depot/projects/trustedbsd/www/bib-stylesheet.xsl#3 edit .. //depot/projects/trustedbsd/www/dev-stylesheet.xsl#3 edit .. //depot/projects/trustedbsd/www/page.xsl#8 edit Differences ... ==== //depot/projects/trustedbsd/www/bib-stylesheet.xsl#3 (text+ko) ==== @@ -29,12 +29,12 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $P4: //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 $ + $P4: //depot/projects/trustedbsd/www/bib-stylesheet.xsl#3 $ --> - + ==== //depot/projects/trustedbsd/www/dev-stylesheet.xsl#3 (text+ko) ==== @@ -29,12 +29,12 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $P4: //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 $ + $P4: //depot/projects/trustedbsd/www/dev-stylesheet.xsl#3 $ --> - + ==== //depot/projects/trustedbsd/www/page.xsl#8 (text+ko) ==== @@ -2,7 +2,9 @@ xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> - + + + From owner-p4-projects@FreeBSD.ORG Mon Aug 25 19:16:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78B0B1065680; Mon, 25 Aug 2008 19:16: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 37B77106568A for ; Mon, 25 Aug 2008 19:16:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D44678FC08 for ; Mon, 25 Aug 2008 19:16:54 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PJGsVm076840 for ; Mon, 25 Aug 2008 19:16:54 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PJGsHT076838 for perforce@freebsd.org; Mon, 25 Aug 2008 19:16:54 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 Aug 2008 19:16:54 GMT Message-Id: <200808251916.m7PJGsHT076838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148425 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, 25 Aug 2008 19:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=148425 Change 148425 by trasz@trasz_traszkan on 2008/08/25 19:16:10 Fix a performance problem, visible e.g. with untarring the ports tree. Change the return type of acl_nfs4_sync_acl_from_mode and acl_nfs4_compute_inherited_acl to void, as they cannot return an error. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#28 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#24 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#16 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#28 (text+ko) ==== @@ -324,7 +324,7 @@ return (&(aclp->acl_entry[entry_index + 1])); } -int +void acl_nfs4_sync_acl_from_mode(struct acl *aclp, mode_t mode, int file_owner_id) { int i, meets, must_append; @@ -335,6 +335,10 @@ const int WRITE = 02; const int EXEC = 01; + KASSERT(aclp->acl_cnt >= 0, ("aclp->acl_cnt >= 0")); + KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, + ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); + /* * NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-03.txt * @@ -600,8 +604,8 @@ } if (must_append) { - if (aclp->acl_cnt + 6 >= ACL_MAX_ENTRIES) - return (EPERM); + KASSERT(aclp->acl_cnt + 6 <= ACL_MAX_ENTRIES, + ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); a1 = _acl_append(aclp, ACL_USER_OBJ, 0, ACL_EXTENDED_DENY); a2 = _acl_append(aclp, ACL_USER_OBJ, ACL_WRITE_ACL | @@ -661,10 +665,6 @@ a6->ae_perm |= ACL_EXECUTE; else a5->ae_perm |= ACL_EXECUTE; - - KASSERT(aclp->acl_cnt >= 6, ("acl->acl_cnt >= 6")); - - return (0); } void @@ -674,6 +674,10 @@ mode_t old_mode = *_mode, mode = 0, seen = 0; const struct acl_entry *entry; + KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0")); + KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, + ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); + /* * NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-03.txt * @@ -800,16 +804,19 @@ *_mode = mode | (old_mode & ACL_PRESERVE_MASK); } -int +void acl_nfs4_compute_inherited_acl(const struct acl *parent_aclp, struct acl *child_aclp, mode_t mode, int file_owner_id, int is_directory) { - int i, error, flags; + int i, flags; const struct acl_entry *parent_entry; struct acl_entry *entry, *copy; KASSERT(child_aclp->acl_cnt == 0, ("child_aclp->acl_cnt == 0")); + KASSERT(parent_aclp->acl_cnt > 0, ("parent_aclp->acl_cnt > 0")); + KASSERT(parent_aclp->acl_cnt <= ACL_MAX_ENTRIES, + ("parent_aclp->acl_cnt <= ACL_MAX_ENTRIES")); /* * NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-03.txt @@ -955,9 +962,31 @@ * in Section 2.16.6.3, using the mode that is to be used for file * creation. */ - error = acl_nfs4_sync_acl_from_mode(child_aclp, mode, file_owner_id); + acl_nfs4_sync_acl_from_mode(child_aclp, mode, file_owner_id); +} + +static int +_acls_are_equal(const struct acl *a, const struct acl *b) +{ + int i; + const struct acl_entry *entrya, *entryb; + + if (a->acl_cnt != b->acl_cnt) + return (0); + + for (i = 0; i < b->acl_cnt; i++) { + entrya = &(a->acl_entry[i]); + entryb = &(b->acl_entry[i]); + + if (entrya->ae_tag != entryb->ae_tag || + entrya->ae_id != entryb->ae_id || + entrya->ae_perm != entryb->ae_perm || + entrya->ae_extended != entryb->ae_extended || + entrya->ae_flags != entryb->ae_flags) + return (0); + } - return (error); + return (1); } /* @@ -965,9 +994,32 @@ * that stores ACL contents. */ int -acl_nfs4_is_trivial(const struct acl *aclp) +acl_nfs4_is_trivial(const struct acl *aclp, int file_owner_id) { - return (0); + int trivial; + mode_t tmpmode = 0; + struct acl *tmpaclp; + + if (aclp->acl_cnt != 6) + return (0); + + /* + * Compute the mode from the ACL, then compute new ACL from that mode. + * If the ACLs are identical, then the ACL is trivial. + * + * XXX: I guess there is a faster way to do this. However, even + * this slow implementation significantly speeds things up + * for files that don't have any extended ACL entries - it's + * critical for performance to not use EA when they are not + * needed. + */ + tmpaclp = acl_alloc(); + acl_nfs4_sync_mode_from_acl(&tmpmode, aclp); + acl_nfs4_sync_acl_from_mode(tmpaclp, tmpmode, file_owner_id); + trivial = _acls_are_equal(aclp, tmpaclp); + acl_free(tmpaclp); + + return (trivial); } int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#24 (text+ko) ==== @@ -270,12 +270,13 @@ mode_t acl_posix1e_newfilemode(mode_t cmode, struct acl *dacl); -int acl_nfs4_sync_acl_from_mode(struct acl *aclp, +void acl_nfs4_sync_acl_from_mode(struct acl *aclp, mode_t mode, int file_owner_id); void acl_nfs4_sync_mode_from_acl(mode_t *mode, const struct acl *aclp); -int acl_nfs4_is_trivial(const struct acl *aclp); -int acl_nfs4_compute_inherited_acl( +int acl_nfs4_is_trivial(const struct acl *aclp, + int file_owner_id); +void acl_nfs4_compute_inherited_acl( const struct acl *parent_aclp, struct acl *child_aclp, mode_t mode, int file_owner_id, int is_directory); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#12 (text+ko) ==== @@ -163,10 +163,9 @@ * Legitimately no ACL set on object, purely * emulate it through the inode. */ - error = acl_nfs4_sync_acl_from_mode(ap->a_aclp, ip->i_mode, - ip->i_uid); + acl_nfs4_sync_acl_from_mode(ap->a_aclp, ip->i_mode, ip->i_uid); - return (error); + return (0); } if (error) @@ -404,16 +403,23 @@ return (EPERM); /* - * Must hold VADMIN (be file owner) or have appropriate privilege. + * Must hold VWRITE_ACL or have appropriate privilege. */ if ((error = VOP_ACCESS(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td))) return (error); - if (acl_nfs4_is_trivial(ap->a_aclp)) { + if (acl_nfs4_is_trivial(ap->a_aclp, ip->i_uid)) { error = vn_extattr_rm(ap->a_vp, IO_NODELOCKED, NFS4_ACL_EXTATTR_NAMESPACE, NFS4_ACL_EXTATTR_NAME, ap->a_td); + /* + * An attempt to remove ACL from a file that didn't have + * any extended entries is not an error. + */ + if (error == ENOATTR) + error = 0; + } else { ap->a_aclp->acl_magic = ACL_MAGIC; error = vn_extattr_set(ap->a_vp, IO_NODELOCKED, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#16 (text+ko) ==== @@ -669,9 +669,7 @@ if (error) goto out; - error = acl_nfs4_sync_acl_from_mode(aclp, mode, file_owner_id); - if (error) - goto out; + acl_nfs4_sync_acl_from_mode(aclp, mode, file_owner_id); error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, td); @@ -1430,10 +1428,8 @@ if (error) goto out; - error = acl_nfs4_compute_inherited_acl(parent_aclp, child_aclp, + acl_nfs4_compute_inherited_acl(parent_aclp, child_aclp, child_mode, VTOI(tvp)->i_uid, tvp->v_type == VDIR); - if (error) - goto out; error = VOP_SETACL(tvp, ACL_TYPE_NFS4, child_aclp, cred, td); if (error) From owner-p4-projects@FreeBSD.ORG Mon Aug 25 19:45:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CC801065670; Mon, 25 Aug 2008 19:45: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 07177106566B for ; Mon, 25 Aug 2008 19:45:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD2A38FC0A for ; Mon, 25 Aug 2008 19:45:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PJjNkA079121 for ; Mon, 25 Aug 2008 19:45:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PJjNho079119 for perforce@freebsd.org; Mon, 25 Aug 2008 19:45:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 19:45:23 GMT Message-Id: <200808251945.m7PJjNho079119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148428 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, 25 Aug 2008 19:45:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=148428 Change 148428 by rwatson@rwatson_fledge on 2008/08/25 19:44:57 More menu and image magic for the TrustedBSD page. Well, sort of magic. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#11 edit .. //depot/projects/trustedbsd/www/extattr-selected.png#1 add .. //depot/projects/trustedbsd/www/extattr.png#1 add .. //depot/projects/trustedbsd/www/geom-selected.png#1 add .. //depot/projects/trustedbsd/www/geom.png#1 add .. //depot/projects/trustedbsd/www/heading.xsl#6 edit .. //depot/projects/trustedbsd/www/openpam-selected.png#1 add .. //depot/projects/trustedbsd/www/openpam.png#1 add .. //depot/projects/trustedbsd/www/page.xsl#9 edit .. //depot/projects/trustedbsd/www/privileges.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#11 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#10 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#11 $ STYLESHEET= page.xsl @@ -55,12 +55,15 @@ IMGS+= components.png components-selected.png IMGS+= developers.png developers-selected.png IMGS+= docs.png docs-selected.png +IMGS+= extattr.png extattr-selected.png +IMGS+= geom.png geom-selected.png IMGS+= home.png home-selected.png IMGS+= horizontalbar1.gif IMGS+= mac.png mac-selected.png IMGS+= mailinglists.png mailinglists-selected.png IMGS+= minipemaquidlight.jpg pemaquidlight.jpg powerlogo.gif IMGS+= openbsm.png openbsm-selected.png +IMGS+= openpam.png openpam-selected.png IMGS+= privileges.png privileges-selected.png IMGS+= resources.gif trustydibmed2.jpg trustyshadow.gif IMGS+= sebsd.png sebsd-selected.png ==== //depot/projects/trustedbsd/www/heading.xsl#6 (text+ko) ==== @@ -31,11 +31,13 @@ - www.TrustedBSD.org + www.TrustedBSD.org - + + @@ -60,6 +62,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -76,41 +121,49 @@ - + + + + + + + + + - + - + - + - + - + - + - + - + - + ==== //depot/projects/trustedbsd/www/page.xsl#9 (text+ko) ==== @@ -27,16 +27,25 @@ + + + @@ -68,7 +74,7 @@
    -Copyright (c) 2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2003, 2008 Sendmail, Inc. and its suppliers. All rights reserved.
    By using this file, you agree to the terms and conditions set ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/docs/smfi_version.html#2 (text+ko) ==== @@ -2,7 +2,7 @@ smfi_version()

    smfi_version()

    @@ -59,24 +59,30 @@ Note: the compile time version of libmilter is available in the macro SMFI_VERSION. -A milter can check this macro to determine which functions to use +To extract the major and minor version as well as the current patch level +from this macro, the macros +SM_LM_VRS_MAJOR(v), +SM_LM_VRS_MINOR(v), and +SM_LM_VRS_PLVL(v) +can be used, respectively. +A milter can check the +SMFI_VERSION +macro to determine which functions to use (at compile time via C preprocessor statements). Using this macro and the smfi_version() function, a milter can determine at runtime whether it has been (dynamically) linked against the expected libmilter version. -To extract the major and minor version as well as the current patch level -from this macro, the macros -SM_LM_VRS_MAJOR(v), -SM_LM_VRS_MINOR(v), and -SM_LM_VRS_PLVL(v) -can be used, respectively. +Such a function should only compare the major and minor version, +not the patch level, +i.e., the libmilter library will be compatible despite +different patch levels.
    -Copyright (c) 2006, 2007 Sendmail, Inc. and its suppliers. +Copyright (c) 2006-2008 Sendmail, Inc. and its suppliers. All rights reserved.
    By using this file, you agree to the terms and conditions set ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/engine.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006-2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include -SM_RCSID("@(#)$Id: engine.c,v 8.159 2007/04/23 22:22:50 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.162 2008/02/27 01:34:14 ca Exp $") #include "libmilter.h" @@ -1001,6 +1001,7 @@ (long) ctx->ctx_id, ctx->ctx_mta_pflags, i); return _SMFIS_ABORT; } + fix_stm(ctx); if (ctx->ctx_dbg > 3) sm_dprintf("[%ld] milter_negotiate:" @@ -1725,9 +1726,9 @@ int n; int nerr = 0; #if SM_CONF_POLL - struct pollfd pfd; + struct pollfd pfd; #else /* SM_CONF_POLL */ - fd_set rd_set, exc_set; + fd_set rd_set, exc_set; #endif /* SM_CONF_POLL */ do ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/worker.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2003-2004, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -11,7 +11,7 @@ */ #include -SM_RCSID("@(#)$Id: worker.c,v 8.9 2006/12/18 18:26:51 ca Exp $") +SM_RCSID("@(#)$Id: worker.c,v 8.10 2007/12/03 22:06:05 ca Exp $") #include "libmilter.h" @@ -263,8 +263,6 @@ return MI_FAILURE; } - POOL_LEV_DPRINTF(4, ("PIPE r=[%d] w=[%d]", RD_PIPE, WR_PIPE)); - (void) smutex_init(&Tskmgr.tm_w_mutex); (void) scond_init(&Tskmgr.tm_w_cond); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/mail.local/mail.local.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 30 14:50:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB9E4106567B; Sat, 30 Aug 2008 14:50:30 +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 AFC1B1065670 for ; Sat, 30 Aug 2008 14:50:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB9C8FC1F for ; Sat, 30 Aug 2008 14:50:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UEoUuc047656 for ; Sat, 30 Aug 2008 14:50:30 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UEoUhv047654 for perforce@freebsd.org; Sat, 30 Aug 2008 14:50:30 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 14:50:30 GMT Message-Id: <200808301450.m7UEoUhv047654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148847 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, 30 Aug 2008 14:50:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=148847 Change 148847 by trasz@trasz_traszkan on 2008/08/30 14:50:06 Include kern/subr_acl_nfs4.c in a libc in somewhat nicer way. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#8 (text+ko) ==== @@ -26,7 +26,8 @@ mac.c \ mac_exec.c \ mac_get.c \ - mac_set.c + mac_set.c \ + ${.CURDIR/../../sys/kern/subr_acl_nfs4.c SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#5 (text+ko) ==== @@ -26,16 +26,20 @@ /* XXX: remove all the err(3) calls. */ #include +#include #include #include #include +#include "acl_support.h" + /* - * XXX: I don't think this is the correct way of doing stuff. + * These two routines from sys/kern/subr_acl_nfs4.c are used by both kernel + * and libc. */ -#include "/sys/kern/subr_acl_nfs4.c" - -#include "acl_support.h" +void acl_nfs4_sync_acl_from_mode(struct acl *aclp, mode_t mode, + int file_owner_id); +void acl_nfs4_sync_mode_from_acl(mode_t *_mode, const struct acl *aclp); static acl_t _nfs4_acl_strip_np(const acl_t aclp, int recalculate_mask) From owner-p4-projects@FreeBSD.ORG Sat Aug 30 15:03:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E25C1065670; Sat, 30 Aug 2008 15:03:19 +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 E64E01065681 for ; Sat, 30 Aug 2008 15:03:18 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D32228FC12 for ; Sat, 30 Aug 2008 15:03:18 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UF3IaZ049737 for ; Sat, 30 Aug 2008 15:03:18 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UF3IXs049735 for perforce@freebsd.org; Sat, 30 Aug 2008 15:03:18 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 30 Aug 2008 15:03:18 GMT Message-Id: <200808301503.m7UF3IXs049735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 148849 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, 30 Aug 2008 15:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=148849 Change 148849 by nwhitehorn@nwhitehorn_trantor on 2008/08/30 15:02:20 Partially fix boot while WITNESS and INVARIANTS are enabled. It will no longer silently hang, but there are still panics from lock-order reversals that will need the standard treatment. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#2 (text+ko) ==== @@ -902,6 +902,8 @@ /* Enter the pages */ PMAP_LOCK(&ofw_pmap); + PMAP_LOCK(kernel_pmap); + DISABLE_TRANS(msr); for (off = 0; off < translations[i].om_len; off += PAGE_SIZE) { struct vm_page m; @@ -915,11 +917,12 @@ * so we need them if we want to keep executing. */ if (translations[i].om_va + off < SEGMENT_LENGTH) { - moea64_kenter(mmup,translations[i].om_va + off, - translations[i].om_pa_lo + off); + moea64_enter_locked(kernel_pmap, + translations[i].om_va + off, &m, + prot, 1); } - /* Map the frame buffer into the kernel pmap */ + /* Map the frame buffer into the kernel pmap instead */ if ((translations[i].om_va + off >= fbva) && (translations[i].om_va + off < fbva + fbsize)) { @@ -932,6 +935,8 @@ ofw_mappings++; } ENABLE_TRANS(msr); + + PMAP_UNLOCK(kernel_pmap); PMAP_UNLOCK(&ofw_pmap); } From owner-p4-projects@FreeBSD.ORG Sat Aug 30 15:39:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08691106568A; Sat, 30 Aug 2008 15:39: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 C0B57106567D for ; Sat, 30 Aug 2008 15:39:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADFA68FC1B for ; Sat, 30 Aug 2008 15:39:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UFduKU052710 for ; Sat, 30 Aug 2008 15:39:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UFduCZ052708 for perforce@freebsd.org; Sat, 30 Aug 2008 15:39:56 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 15:39:56 GMT Message-Id: <200808301539.m7UFduCZ052708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148852 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, 30 Aug 2008 15:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=148852 Change 148852 by trasz@trasz_traszkan on 2008/08/30 15:39:16 Remove all the err(3) calls from libc/posix1e/acl_strip.c. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#6 (text+ko) ==== @@ -24,8 +24,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* XXX: remove all the err(3) calls. */ -#include #include #include #include @@ -74,14 +72,14 @@ acl_old = acl_dup(aclp); if (acl_old == NULL) - err(1, "acl_dup() failed"); + return (NULL); assert(_acl_brand(acl_old) == ACL_BRAND_POSIX); have_mask_entry = 0; acl_new = acl_init(ACL_MAX_ENTRIES); if (acl_new == NULL) - err(1, "acl_init() failed"); + return (NULL); tag = ACL_UNDEFINED_TAG; /* only save the default user/group/other entries */ @@ -92,24 +90,24 @@ assert(_entry_brand(entry) == ACL_BRAND_POSIX); if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + return (NULL); switch(tag) { case ACL_USER_OBJ: case ACL_GROUP_OBJ: case ACL_OTHER: if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + return (NULL); if (acl_get_permset(entry, &perm) == -1) - err(1, "acl_get_permset() failed"); + return (NULL); if (acl_create_entry(&acl_new, &entry_new) == -1) - err(1, "acl_create_entry() failed"); + return (NULL); if (acl_set_tag_type(entry_new, tag) == -1) - err(1, "acl_set_tag_type() failed"); + return (NULL); if (acl_set_permset(entry_new, perm) == -1) - err(1, "acl_get_permset() failed"); + return (NULL); if (acl_copy_entry(entry_new, entry) == -1) - err(1, "acl_copy_entry() failed"); + return (NULL); assert(_entry_brand(entry_new) == ACL_BRAND_POSIX); break; case ACL_MASK: @@ -124,7 +122,7 @@ if (have_mask_entry && recalculate_mask) { if (acl_calc_mask(&acl_new) == -1) - err(1, "acl_calc_mask() failed"); + return (NULL); } return (acl_new); From owner-p4-projects@FreeBSD.ORG Sat Aug 30 18:02:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D950E1065681; Sat, 30 Aug 2008 18:02: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 9B8DF106567A for ; Sat, 30 Aug 2008 18:02:21 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 799148FC14 for ; Sat, 30 Aug 2008 18:02:21 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UI2LWa076221 for ; Sat, 30 Aug 2008 18:02:21 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UI2LGf076219 for perforce@freebsd.org; Sat, 30 Aug 2008 18:02:21 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 18:02:21 GMT Message-Id: <200808301802.m7UI2LGf076219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148857 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, 30 Aug 2008 18:02:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=148857 Change 148857 by trasz@trasz_traszkan on 2008/08/30 18:02:11 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/add.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/boot.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/create.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/destroy.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/gpt.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/gpt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/gpt.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/label.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/map.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/map.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/migrate.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/recover.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/remove.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/gpt/show.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/witness.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/witness.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/witness.4,v 1.11 2005/07/31 03:30:44 keramida Exp $ +.\" $FreeBSD: src/share/man/man4/witness.4,v 1.12 2008/08/30 13:37:28 attilio Exp $ .\" .Dd February 18, 2001 .Dt WITNESS 4 @@ -95,9 +95,10 @@ .Va debug.witness.watch specifies the level of witness involvement in the system. A value of 1 specifies that witness is enabled. -A value of 0 specifies that witness is disabled. -This sysctl can be written to in order to -disable witness, however it may not be used to enable witness. +A value of 0 specifies that witness is disabled, but that can be enabled +again. This will maintain a small amount of overhead in the system. +A value of -1 specifies that witness is disabled permanently and that +cannot be enabled again. The sysctl .Va debug.witness.watch can be set via ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.26 2008/08/30 15:16:40 stas Exp $"); #include #include @@ -170,7 +170,8 @@ struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; int err; - u_char eaddr[6]; + u_char eaddr[ETHER_ADDR_LEN]; + uint32_t rnd; sc->dev = dev; err = ate_activate(dev); @@ -179,7 +180,7 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ + /* Sysctls */ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", @@ -191,8 +192,23 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set\n"); - goto out; + /* + * No MAC address configured. Generate the fake one. + */ + if (bootverbose) + device_printf(dev, + "Generating fake ethernet address.\n"); + rnd = arc4random(); + + /* + * Set OUI to Atmel. + */ + eaddr[0] = 0x00; + eaddr[1] = 0x04; + eaddr[2] = 0x25; + eaddr[3] = (rnd >> 16) & 0xff; + eaddr[4] = (rnd >> 8) & 0xff; + eaddr[5] = rnd & 0xff; } ate_set_mac(sc, eaddr); @@ -586,24 +602,29 @@ static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { + bus_size_t sa_low_reg[] = { ETH_SA1L, ETH_SA2L, ETH_SA3L, ETH_SA4L }; + bus_size_t sa_high_reg[] = { ETH_SA1H, ETH_SA2H, ETH_SA3H, ETH_SA4H }; uint32_t low, high; + int i; /* * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. + * the loader. Grab one MAC address from the SA[1-4][HL] registers. */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - if ((low | (high & 0xffff)) == 0) - return (ENXIO); - eaddr[0] = low & 0xff; - eaddr[1] = (low >> 8) & 0xff; - eaddr[2] = (low >> 16) & 0xff; - eaddr[3] = (low >> 24) & 0xff; - eaddr[4] = high & 0xff; - eaddr[5] = (high >> 8) & 0xff; - return (0); + for (i = 0; i < 4; i++) { + low = RD4(sc, sa_low_reg[i]); + high = RD4(sc, sa_high_reg[i]); + if ((low | (high & 0xffff)) != 0) { + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; + return (0); + } + } + return (ENXIO); } static void ==== //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.35 2008/08/30 16:03:22 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -36,6 +36,7 @@ #include #include #include +#include #include "bootstrap.h" #include "libofw.h" @@ -57,8 +58,10 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); +static inline u_long dtlb_get_data_sun4u(int slot); static void dtlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t); +static inline u_long itlb_get_data_sun4u(int slot); static void itlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t); extern vm_offset_t md_load(char *, vm_offset_t *); @@ -92,6 +95,7 @@ struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; +int cpu_impl; static int dtlb_slot_max; static int itlb_slot_max; @@ -365,6 +369,30 @@ panic("%s: exec returned", __func__); } +static inline u_long +dtlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_DTLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG)); +} + +static inline u_long +itlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_ITLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG)); +} + static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t va) { @@ -375,7 +403,9 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + reg = dtlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); @@ -391,34 +421,38 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + reg = itlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); } static void -itlb_enter_sun4u(u_long vpn, u_long data) +dtlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_IMMU_TAR, ASI_IMMU, vpn); - stxa(0, ASI_ITLB_DATA_IN_REG, data); + stxa(AA_DMMU_TAR, ASI_DMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } static void -dtlb_enter_sun4u(u_long vpn, u_long data) +itlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_DMMU_TAR, ASI_DMMU, vpn); - stxa(0, ASI_DTLB_DATA_IN_REG, data); + stxa(AA_IMMU_TAR, ASI_IMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_ITLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } @@ -539,19 +573,18 @@ u_int bootcpu; u_int cpu; + cpu_impl = VER_IMPL(rdpr(ver)); bootcpu = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); for (child = OF_child(root); child != 0; child = OF_peer(child)) { - if (child == -1) - panic("%s: can't get child phandle", __func__); - if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 && - strcmp(buf, "cpu") == 0) { - if (OF_getprop(child, "upa-portid", &cpu, - sizeof(cpu)) == -1 && OF_getprop(child, "portid", - &cpu, sizeof(cpu)) == -1) - panic("%s: can't get portid", __func__); - if (cpu == bootcpu) - break; - } + if (OF_getprop(child, "device_type", buf, sizeof(buf)) <= 0) + continue; + if (strcmp(buf, "cpu") != 0) + continue; + if (OF_getprop(child, cpu_impl < CPU_IMPL_ULTRASPARCIII ? + "upa-portid" : "portid", &cpu, sizeof(cpu)) <= 0) + continue; + if (cpu == bootcpu) + break; } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); @@ -712,10 +745,14 @@ pmap_print_tlb_sun4u(void) { tte_t tag, tte; + u_long pstate; int i; + pstate = rdpr(pstate); for (i = 0; i < itlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = itlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); @@ -723,7 +760,9 @@ pmap_print_tte_sun4u(tag, tte); } for (i = 0; i < dtlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = dtlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_pci.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.34 2008/07/30 19:16:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.35 2008/08/30 16:23:04 imp Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. @@ -52,8 +52,6 @@ * sharing of code between *BSD's */ -#include "opt_bus.h" - #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ohci_pci.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.50 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.51 2008/08/30 16:23:04 imp Exp $"); /* * USB Open Host Controller driver. @@ -49,8 +49,6 @@ * sharing of code between *BSD's */ -#include "opt_bus.h" - #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhci_pci.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.64 2008/04/11 05:50:53 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.65 2008/08/30 16:21:16 imp Exp $"); /* Universal Host Controller Interface * @@ -48,8 +48,6 @@ * sharing of code between *BSD's */ -#include "opt_bus.h" - #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/usb/Makefile,v 1.18 2005/06/04 10:58:39 schweikh Exp $ +# $FreeBSD: src/sys/modules/usb/Makefile,v 1.19 2008/08/30 16:24:01 imp Exp $ S= ${.CURDIR}/../.. @@ -22,6 +22,6 @@ SRCS+= uhci_pci.c uhci.c uhcireg.h uhcivar.h SRCS+= ohci_pci.c ohci.c ohcireg.h ohcivar.h SRCS+= ehci_pci.c ehci.c ehcireg.h ehcivar.h -SRCS+= opt_bus.h pci_if.h +SRCS+= pci_if.h .include From owner-p4-projects@FreeBSD.ORG Sat Aug 30 19:13:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 674381065673; Sat, 30 Aug 2008 19:13: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 2BDBA1065670 for ; Sat, 30 Aug 2008 19:13:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B1E68FC08 for ; Sat, 30 Aug 2008 19:13:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UJDXdo084437 for ; Sat, 30 Aug 2008 19:13:34 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UJDXr1084435 for perforce@freebsd.org; Sat, 30 Aug 2008 19:13:33 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 19:13:33 GMT Message-Id: <200808301913.m7UJDXr1084435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148861 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, 30 Aug 2008 19:13:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=148861 Change 148861 by trasz@trasz_traszkan on 2008/08/30 19:12:55 Move new library routines to FBSD_1.1 namespace. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#7 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#7 (text) ==== @@ -13,49 +13,35 @@ acl_delete_link_np; acl_delete_fd_np; acl_delete_entry; - acl_delete_entry_np; acl_create_entry; - acl_create_entry_np; - acl_get_brand_np; acl_get_entry; acl_free; acl_from_text; acl_get_file; acl_get_link_np; - acl_get_extended_np; acl_get_fd; acl_get_fd_np; - acl_get_flag_np; acl_get_perm_np; - acl_get_flagset_np; acl_get_permset; acl_get_qualifier; acl_get_tag_type; acl_init; acl_dup; - acl_add_flag_np; acl_add_perm; - acl_clear_flags_np; acl_clear_perms; - acl_delete_flag_np; acl_delete_perm; - acl_set_extended_np; acl_set_file; acl_set_link_np; acl_set_fd; acl_set_fd_np; - acl_set_flagset_np; acl_set_permset; acl_set_qualifier; acl_set_tag_type; acl_to_text; - acl_to_text_np; acl_valid; acl_valid_file_np; acl_valid_link_np; acl_valid_fd_np; - acl_is_trivial_np; - acl_strip_np; extattr_namespace_to_string; extattr_string_to_namespace; mac_reload; @@ -81,3 +67,21 @@ mac_set_link; mac_set_proc; }; + +FBSD_1.1 { + acl_add_flag_np; + acl_clear_flags_np; + acl_create_entry_np; + acl_delete_entry_np; + acl_delete_flag_np; + acl_get_brand_np; + acl_get_extended_np; + acl_get_flag_np; + acl_get_flagset_np; + acl_is_trivial_np; + acl_set_extended_np; + acl_set_flagset_np; + acl_strip_np; + acl_to_text_np; +}; + From owner-p4-projects@FreeBSD.ORG Sat Aug 30 19:21:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C002B106567E; Sat, 30 Aug 2008 19:21: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 84060106567C for ; Sat, 30 Aug 2008 19:21:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 732778FC16 for ; Sat, 30 Aug 2008 19:21:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UJLgtn085112 for ; Sat, 30 Aug 2008 19:21:42 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UJLgYT085110 for perforce@freebsd.org; Sat, 30 Aug 2008 19:21:42 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 19:21:42 GMT Message-Id: <200808301921.m7UJLgYT085110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148862 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, 30 Aug 2008 19:21:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=148862 Change 148862 by trasz@trasz_traszkan on 2008/08/30 19:20:50 Backwards binary compatibility wrappers for libc. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_perm.c#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#9 (text+ko) ==== @@ -5,6 +5,7 @@ SRCS+= acl_branding.c \ acl_calc_mask.c \ acl_copy.c \ + acl_compat.c \ acl_delete.c \ acl_delete_entry.c \ acl_entry.c \ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#8 (text) ==== @@ -21,15 +21,12 @@ acl_get_link_np; acl_get_fd; acl_get_fd_np; - acl_get_perm_np; acl_get_permset; acl_get_qualifier; acl_get_tag_type; acl_init; acl_dup; - acl_add_perm; acl_clear_perms; - acl_delete_perm; acl_set_file; acl_set_link_np; acl_set_fd; @@ -70,14 +67,17 @@ FBSD_1.1 { acl_add_flag_np; + acl_add_perm; acl_clear_flags_np; acl_create_entry_np; acl_delete_entry_np; acl_delete_flag_np; + acl_delete_perm; acl_get_brand_np; acl_get_extended_np; acl_get_flag_np; acl_get_flagset_np; + acl_get_perm_np; acl_is_trivial_np; acl_set_extended_np; acl_set_flagset_np; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#7 (text+ko) ==== @@ -45,8 +45,6 @@ * draft ACLs. In POSIX, there may be only one entry for the particular * user or group. In NFSv4 ACL, there may be any number of them. We're * trying to be more specific here in that case. - * - * XXX: The proper way would be to remove them by entry number. */ switch (_entry_brand(a)) { case ACL_BRAND_NFS4: ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#8 (text+ko) ==== @@ -137,9 +137,6 @@ return (aclp); } -/* - * XXX: Possible binary compatibility problem; acl_perm_t definition changed. - */ int acl_get_perm_np(acl_permset_t permset_d, acl_perm_t perm) { ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_perm.c#3 (text+ko) ==== @@ -39,9 +39,6 @@ * acl_add_perm() (23.4.1): add the permission contained in perm to the * permission set permset_d */ -/* - * XXX: Possible binary compatibility problem; acl_perm_t definition changed. - */ int acl_add_perm(acl_permset_t permset_d, acl_perm_t perm) { @@ -82,9 +79,6 @@ * acl_delete_perm() (23.4.10): remove the permission in perm from the * permission set permset_d */ -/* - * XXX: Possible binary compatibility problem; acl_perm_t definition changed. - */ int acl_delete_perm(acl_permset_t permset_d, acl_perm_t perm) { From owner-p4-projects@FreeBSD.ORG Sat Aug 30 19:52:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B68C71065674; Sat, 30 Aug 2008 19:52:13 +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 79B7B106567C for ; Sat, 30 Aug 2008 19:52:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6942E8FC13 for ; Sat, 30 Aug 2008 19:52:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UJqDQ1087531 for ; Sat, 30 Aug 2008 19:52:13 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UJqDjX087529 for perforce@freebsd.org; Sat, 30 Aug 2008 19:52:13 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 19:52:13 GMT Message-Id: <200808301952.m7UJqDjX087529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148863 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, 30 Aug 2008 19:52:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148863 Change 148863 by trasz@trasz_traszkan on 2008/08/30 19:51:21 Aliasing newly added V* flags to ACL_* flags was a bad idea. Remove it from the TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#48 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#48 (text+ko) ==== @@ -2,10 +2,6 @@ - Add support for NFS4 ACLs to tar(1). -- Clean up #defines. For example, make VREAD_NAMED_ATTRS equal - to ACL_READ_NAMED_ATTRS, so there is no need for translation - between the two in kern/subr_acl_nfs4.c. - - Make 'struct acl' variable size. - Benchmark things. From owner-p4-projects@FreeBSD.ORG Sat Aug 30 20:30:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B3B106568F; Sat, 30 Aug 2008 20:30: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 EAA501065682 for ; Sat, 30 Aug 2008 20:30:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFE898FC1E for ; Sat, 30 Aug 2008 20:30:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UKUq9p092064 for ; Sat, 30 Aug 2008 20:30:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UKUqbL092062 for perforce@freebsd.org; Sat, 30 Aug 2008 20:30:52 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 20:30:52 GMT Message-Id: <200808302030.m7UKUqbL092062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148864 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, 30 Aug 2008 20:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=148864 Change 148864 by trasz@trasz_traszkan on 2008/08/30 20:30:17 Add forgotten file. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 30 22:33:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2B281065677; Sat, 30 Aug 2008 22:33:13 +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 846731065670 for ; Sat, 30 Aug 2008 22:33:13 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 709228FC0A for ; Sat, 30 Aug 2008 22:33:13 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UMXD3B013943 for ; Sat, 30 Aug 2008 22:33:13 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UMWV4X013849 for perforce@freebsd.org; Sat, 30 Aug 2008 22:32:31 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 30 Aug 2008 22:32:31 GMT Message-Id: <200808302232.m7UMWV4X013849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148868 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, 30 Aug 2008 22:33:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148868 Change 148868 by rpaulo@rpaulo_alpha on 2008/08/30 22:32:15 IFC Affected files ... .. //depot/projects/efi/Makefile#2 integrate .. //depot/projects/efi/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/efi/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/efi/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/efi/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/efi/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/efi/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/efi/amd64/amd64/exception.S#2 integrate .. //depot/projects/efi/amd64/amd64/genassym.c#2 integrate .. //depot/projects/efi/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/efi/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/efi/amd64/amd64/machdep.c#2 integrate .. //depot/projects/efi/amd64/amd64/mem.c#2 integrate .. //depot/projects/efi/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/efi/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/efi/amd64/amd64/pmap.c#2 integrate .. //depot/projects/efi/amd64/amd64/support.S#2 integrate .. //depot/projects/efi/amd64/amd64/trap.c#2 integrate .. //depot/projects/efi/amd64/conf/GENERIC#2 integrate .. //depot/projects/efi/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/efi/amd64/conf/NOTES#2 integrate .. //depot/projects/efi/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/efi/amd64/include/clock.h#2 integrate .. //depot/projects/efi/amd64/include/cpufunc.h#2 integrate .. //depot/projects/efi/amd64/include/iodev.h#2 integrate .. //depot/projects/efi/amd64/include/memdev.h#2 integrate .. //depot/projects/efi/amd64/include/param.h#2 integrate .. //depot/projects/efi/amd64/include/pcb.h#2 integrate .. //depot/projects/efi/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/efi/amd64/include/pcpu.h#2 integrate .. //depot/projects/efi/amd64/include/pmap.h#2 integrate .. //depot/projects/efi/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/efi/amd64/include/specialreg.h#2 integrate .. //depot/projects/efi/amd64/include/stack.h#2 integrate .. //depot/projects/efi/amd64/include/vmparam.h#2 integrate .. //depot/projects/efi/amd64/isa/clock.c#2 integrate .. //depot/projects/efi/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/efi/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/efi/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/efi/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/efi/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/efi/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/efi/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/efi/arm/arm/db_interface.c#2 integrate .. //depot/projects/efi/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/efi/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/efi/arm/arm/identcpu.c#2 integrate .. //depot/projects/efi/arm/arm/intr.c#2 integrate .. //depot/projects/efi/arm/arm/machdep.c#2 integrate .. //depot/projects/efi/arm/arm/pmap.c#2 integrate .. //depot/projects/efi/arm/arm/swtch.S#2 integrate .. //depot/projects/efi/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/efi/arm/at91/at91.c#2 integrate .. //depot/projects/efi/arm/at91/at91_pio.c#2 integrate .. //depot/projects/efi/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/efi/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/efi/arm/at91/at91_twi.c#2 integrate .. //depot/projects/efi/arm/at91/if_ate.c#2 integrate .. //depot/projects/efi/arm/at91/if_atereg.h#2 integrate .. //depot/projects/efi/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/efi/arm/conf/AVILA#2 integrate .. //depot/projects/efi/arm/conf/BWCT#2 integrate .. //depot/projects/efi/arm/conf/CRB#2 integrate .. //depot/projects/efi/arm/conf/EP80219#2 integrate .. //depot/projects/efi/arm/conf/GUMSTIX#1 branch .. //depot/projects/efi/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/efi/arm/conf/HL200#2 integrate .. //depot/projects/efi/arm/conf/IQ31244#2 integrate .. //depot/projects/efi/arm/conf/KB920X#2 integrate .. //depot/projects/efi/arm/conf/NSLU#1 branch .. //depot/projects/efi/arm/conf/NSLU.hints#1 branch .. //depot/projects/efi/arm/conf/SIMICS#2 integrate .. //depot/projects/efi/arm/conf/SKYEYE#2 integrate .. //depot/projects/efi/arm/include/db_machdep.h#2 integrate .. //depot/projects/efi/arm/include/endian.h#2 integrate .. //depot/projects/efi/arm/include/intr.h#2 integrate .. //depot/projects/efi/arm/include/memdev.h#2 integrate .. //depot/projects/efi/arm/include/pcpu.h#2 integrate .. //depot/projects/efi/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/efi/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/efi/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/efi/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/efi/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/efi/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/efi/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/efi/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/efi/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/efi/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/efi/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/efi/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/efi/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/efi/boot/Makefile#2 integrate .. //depot/projects/efi/boot/Makefile.inc#1 branch .. //depot/projects/efi/boot/arm/Makefile.inc#1 branch .. //depot/projects/efi/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/efi/boot/common/misc.c#2 integrate .. //depot/projects/efi/boot/common/ufsread.c#2 integrate .. //depot/projects/efi/boot/efi/Makefile.inc#2 integrate .. //depot/projects/efi/boot/forth/loader.conf#2 integrate .. //depot/projects/efi/boot/i386/Makefile.inc#2 integrate .. //depot/projects/efi/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/efi/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/efi/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/efi/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/efi/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/efi/boot/i386/libi386/time.c#2 integrate .. //depot/projects/efi/boot/i386/loader/Makefile#2 integrate .. //depot/projects/efi/boot/i386/loader/main.c#2 integrate .. //depot/projects/efi/boot/ia64/Makefile.inc#2 integrate .. //depot/projects/efi/boot/ia64/common/Makefile#2 integrate .. //depot/projects/efi/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/efi/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/efi/boot/ofw/Makefile.inc#1 branch .. //depot/projects/efi/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/efi/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/efi/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/efi/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/efi/boot/pc98/loader/main.c#2 integrate .. //depot/projects/efi/boot/powerpc/Makefile.inc#1 branch .. //depot/projects/efi/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/efi/boot/sparc64/Makefile.inc#2 integrate .. //depot/projects/efi/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/efi/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/efi/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/efi/boot/uboot/Makefile.inc#1 branch .. //depot/projects/efi/bsm/audit.h#2 integrate .. //depot/projects/efi/bsm/audit_internal.h#2 integrate .. //depot/projects/efi/bsm/audit_kevents.h#2 integrate .. //depot/projects/efi/bsm/audit_record.h#2 integrate .. //depot/projects/efi/cam/cam_xpt.c#2 integrate .. //depot/projects/efi/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/efi/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/efi/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/efi/cddl/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/acl.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/bitmap.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/byteorder.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/callb.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/cpupart.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/cyclic.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/dkio.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/mntent.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/objfs.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/pcpu.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/taskq.h#2 integrate .. //depot/projects/efi/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/efi/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/efi/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch .. //depot/projects/efi/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch .. //depot/projects/efi/cddl/dev/cyclic/cyclic.c#1 branch .. //depot/projects/efi/cddl/dev/cyclic/cyclic_test.c#1 branch .. //depot/projects/efi/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch .. //depot/projects/efi/cddl/dev/dtmalloc/dtmalloc.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/amd64/dis_tables.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/amd64/dis_tables.h#1 branch .. //depot/projects/efi/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch .. //depot/projects/efi/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/amd64/instr_size.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_anon.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_cddl.h#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_clone.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_debug.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_hacks.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_ioctl.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_load.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_modevent.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_sysctl.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_test.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_unload.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/dtrace_vtime.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/i386/dis_tables.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/i386/dis_tables.h#1 branch .. //depot/projects/efi/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch .. //depot/projects/efi/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch .. //depot/projects/efi/cddl/dev/dtrace/i386/instr_size.c#1 branch .. //depot/projects/efi/cddl/dev/fbt/fbt.c#1 branch .. //depot/projects/efi/cddl/dev/profile/profile.c#1 branch .. //depot/projects/efi/cddl/dev/prototype.c#1 branch .. //depot/projects/efi/cddl/dev/sdt/sdt.c#1 branch .. //depot/projects/efi/cddl/dev/systrace/systrace.c#1 branch .. //depot/projects/efi/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/efi/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/efi/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/efi/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/efi/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/efi/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/efi/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/efi/compat/linux/linux_emul.c#2 integrate .. //depot/projects/efi/compat/linux/linux_emul.h#2 integrate .. //depot/projects/efi/compat/linux/linux_file.c#2 integrate .. //depot/projects/efi/compat/linux/linux_futex.c#2 integrate .. //depot/projects/efi/compat/linux/linux_futex.h#2 integrate .. //depot/projects/efi/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/efi/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/efi/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/efi/compat/linux/linux_mib.c#2 integrate .. //depot/projects/efi/compat/linux/linux_misc.c#2 integrate .. //depot/projects/efi/compat/linux/linux_socket.c#2 integrate .. //depot/projects/efi/compat/linux/linux_stats.c#2 integrate .. //depot/projects/efi/compat/linux/linux_util.c#2 integrate .. //depot/projects/efi/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/efi/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/efi/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/efi/compat/pecoff/imgact_pecoff.c#2 delete .. //depot/projects/efi/compat/pecoff/imgact_pecoff.h#2 delete .. //depot/projects/efi/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/efi/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/efi/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/efi/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/efi/conf/Makefile.amd64#2 integrate .. //depot/projects/efi/conf/Makefile.arm#2 integrate .. //depot/projects/efi/conf/NOTES#2 integrate .. //depot/projects/efi/conf/files#2 integrate .. //depot/projects/efi/conf/files.amd64#2 integrate .. //depot/projects/efi/conf/files.i386#2 integrate .. //depot/projects/efi/conf/files.mips#2 integrate .. //depot/projects/efi/conf/files.pc98#2 integrate .. //depot/projects/efi/conf/files.powerpc#2 integrate .. //depot/projects/efi/conf/files.sparc64#2 integrate .. //depot/projects/efi/conf/files.sun4v#2 integrate .. //depot/projects/efi/conf/kern.mk#2 integrate .. //depot/projects/efi/conf/kern.post.mk#2 integrate .. //depot/projects/efi/conf/kern.pre.mk#2 integrate .. //depot/projects/efi/conf/ldscript.mips#2 integrate .. //depot/projects/efi/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/efi/conf/newvers.sh#2 integrate .. //depot/projects/efi/conf/options#2 integrate .. //depot/projects/efi/conf/options.amd64#2 integrate .. //depot/projects/efi/conf/options.arm#2 integrate .. //depot/projects/efi/conf/options.i386#2 integrate .. //depot/projects/efi/conf/options.pc98#2 integrate .. //depot/projects/efi/conf/options.sparc64#2 integrate .. //depot/projects/efi/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/efi/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/efi/contrib/dev/ath/README#2 integrate .. //depot/projects/efi/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/efi/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/efi/contrib/dev/ath/version.h#2 integrate .. //depot/projects/efi/contrib/dev/iwn/LICENSE#1 branch .. //depot/projects/efi/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch .. //depot/projects/efi/contrib/dev/oltr/COPYRIGHT#2 delete .. //depot/projects/efi/contrib/dev/oltr/i386-elf.trlld.o.uu#2 delete .. //depot/projects/efi/contrib/dev/oltr/if_oltr.c#2 delete .. //depot/projects/efi/contrib/dev/oltr/if_oltr_isa.c#2 delete .. //depot/projects/efi/contrib/dev/oltr/if_oltr_pci.c#2 delete .. //depot/projects/efi/contrib/dev/oltr/if_oltrvar.h#2 delete .. //depot/projects/efi/contrib/dev/oltr/trlld.h#2 delete .. //depot/projects/efi/contrib/dev/oltr/trlldbm.c#2 delete .. //depot/projects/efi/contrib/dev/oltr/trlldhm.c#2 delete .. //depot/projects/efi/contrib/dev/oltr/trlldmac.c#2 delete .. //depot/projects/efi/contrib/dev/ral/LICENSE#1 branch .. //depot/projects/efi/contrib/dev/ral/Makefile#1 branch .. //depot/projects/efi/contrib/dev/ral/rt2561.fw.uu#1 branch .. //depot/projects/efi/contrib/dev/ral/rt2561s.fw.uu#1 branch .. //depot/projects/efi/contrib/dev/ral/rt2661.fw.uu#1 branch .. //depot/projects/efi/contrib/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/efi/contrib/dev/ral/rt2860.fw.uu#1 branch .. //depot/projects/efi/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/efi/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/efi/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/efi/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/efi/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/efi/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/efi/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/efi/contrib/pf/net/pf.c#2 integrate .. //depot/projects/efi/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/efi/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/efi/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/efi/contrib/rdma/core_priv.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_addr.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_cache.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_cm.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_fmr_pool.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_mad.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_marshall.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_pack.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_sa.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_smi.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_umem.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_user_cm.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_user_mad.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_user_sa.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_user_verbs.h#1 branch .. //depot/projects/efi/contrib/rdma/ib_verbs.h#1 branch .. //depot/projects/efi/contrib/rdma/iw_cm.h#1 branch .. //depot/projects/efi/contrib/rdma/krping/getopt.c#1 branch .. //depot/projects/efi/contrib/rdma/krping/getopt.h#1 branch .. //depot/projects/efi/contrib/rdma/krping/krping.c#1 branch .. //depot/projects/efi/contrib/rdma/krping/krping.h#1 branch .. //depot/projects/efi/contrib/rdma/krping/krping_dev.c#1 branch .. //depot/projects/efi/contrib/rdma/rdma_addr.c#1 branch .. //depot/projects/efi/contrib/rdma/rdma_cache.c#1 branch .. //depot/projects/efi/contrib/rdma/rdma_cm.h#1 branch .. //depot/projects/efi/contrib/rdma/rdma_cm_ib.h#1 branch .. //depot/projects/efi/contrib/rdma/rdma_cma.c#1 branch .. //depot/projects/efi/contrib/rdma/rdma_device.c#1 branch .. //depot/projects/efi/contrib/rdma/rdma_iwcm.c#1 branch .. //depot/projects/efi/contrib/rdma/rdma_user_cm.h#1 branch .. //depot/projects/efi/contrib/rdma/rdma_verbs.c#1 branch .. //depot/projects/efi/contrib/rdma/types.h#1 branch .. //depot/projects/efi/crypto/via/padlock.c#2 integrate .. //depot/projects/efi/ddb/db_capture.c#2 integrate .. //depot/projects/efi/ddb/db_output.c#2 integrate .. //depot/projects/efi/ddb/db_ps.c#2 integrate .. //depot/projects/efi/ddb/db_run.c#2 integrate .. //depot/projects/efi/ddb/db_textdump.c#2 integrate .. //depot/projects/efi/dev/aac/aac.c#2 integrate .. //depot/projects/efi/dev/aac/aac_pci.c#2 integrate .. //depot/projects/efi/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/efi/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/efi/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/efi/dev/acpica/acpi.c#2 integrate .. //depot/projects/efi/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/efi/dev/age/if_age.c#1 branch .. //depot/projects/efi/dev/age/if_agereg.h#1 branch .. //depot/projects/efi/dev/age/if_agevar.h#1 branch .. //depot/projects/efi/dev/agp/agp.c#2 integrate .. //depot/projects/efi/dev/agp/agp_i810.c#2 integrate .. //depot/projects/efi/dev/aha/aha.c#2 integrate .. //depot/projects/efi/dev/amr/amr.c#2 integrate .. //depot/projects/efi/dev/arl/if_arl.c#2 delete .. //depot/projects/efi/dev/arl/if_arl_isa.c#2 delete .. //depot/projects/efi/dev/arl/if_arlreg.h#2 delete .. //depot/projects/efi/dev/ata/ata-all.c#2 integrate .. //depot/projects/efi/dev/ata/ata-all.h#2 integrate .. //depot/projects/efi/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/efi/dev/ata/ata-disk.c#2 integrate .. //depot/projects/efi/dev/ata/ata-dma.c#2 integrate .. //depot/projects/efi/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/efi/dev/ata/ata-pci.c#2 integrate .. //depot/projects/efi/dev/ata/ata-pci.h#2 integrate .. //depot/projects/efi/dev/ata/ata-queue.c#2 integrate .. //depot/projects/efi/dev/ata/ata-raid.c#2 integrate .. //depot/projects/efi/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/efi/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/efi/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/efi/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/efi/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/efi/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/efi/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/efi/dev/ath/ath_rate/amrr/amrr.h#2 integrate .. //depot/projects/efi/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/efi/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/efi/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/efi/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/efi/dev/ath/if_ath.c#2 integrate .. //depot/projects/efi/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/efi/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/efi/dev/ath/if_athrate.h#2 integrate .. //depot/projects/efi/dev/ath/if_athvar.h#2 integrate .. //depot/projects/efi/dev/atkbdc/psm.c#2 integrate .. //depot/projects/efi/dev/awi/am79c930.c#2 delete .. //depot/projects/efi/dev/awi/am79c930reg.h#2 delete .. //depot/projects/efi/dev/awi/am79c930var.h#2 delete .. //depot/projects/efi/dev/awi/awi.c#2 delete .. //depot/projects/efi/dev/awi/awireg.h#2 delete .. //depot/projects/efi/dev/awi/awivar.h#2 delete .. //depot/projects/efi/dev/awi/if_awi_pccard.c#2 delete .. //depot/projects/efi/dev/bce/if_bce.c#2 integrate .. //depot/projects/efi/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/efi/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/efi/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/efi/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/efi/dev/bge/if_bge.c#2 integrate .. //depot/projects/efi/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/efi/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/efi/dev/bm/if_bm.c#1 branch .. //depot/projects/efi/dev/bm/if_bmreg.h#1 branch .. //depot/projects/efi/dev/bm/if_bmvar.h#1 branch .. //depot/projects/efi/dev/ce/ceddk.h#2 integrate .. //depot/projects/efi/dev/ce/if_ce.c#2 integrate .. //depot/projects/efi/dev/ciss/ciss.c#2 integrate .. //depot/projects/efi/dev/ciss/cissio.h#2 integrate .. //depot/projects/efi/dev/ciss/cissreg.h#2 integrate .. //depot/projects/efi/dev/ciss/cissvar.h#2 integrate .. //depot/projects/efi/dev/cnw/if_cnw.c#2 delete .. //depot/projects/efi/dev/cnw/if_cnwioctl.h#2 delete .. //depot/projects/efi/dev/cnw/if_cnwreg.h#2 delete .. //depot/projects/efi/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/efi/dev/cp/cpddk.h#2 integrate .. //depot/projects/efi/dev/cp/if_cp.c#2 integrate .. //depot/projects/efi/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/efi/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/efi/dev/cs/if_cs.c#2 integrate .. //depot/projects/efi/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/efi/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/efi/dev/cs/if_csreg.h#2 integrate .. //depot/projects/efi/dev/cs/if_csvar.h#2 integrate .. //depot/projects/efi/dev/ctau/ctddk.h#2 integrate .. //depot/projects/efi/dev/ctau/if_ct.c#2 integrate .. //depot/projects/efi/dev/cx/cxddk.h#2 integrate .. //depot/projects/efi/dev/cx/if_cx.c#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_tn1010.c#1 branch .. //depot/projects/efi/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/efi/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_l2t.c#2 delete .. //depot/projects/efi/dev/cxgb/cxgb_l2t.h#2 delete .. //depot/projects/efi/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/efi/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/efi/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/efi/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/efi/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/efi/dev/dc/if_dc.c#2 integrate .. //depot/projects/efi/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/efi/dev/dcons/dcons.h#2 integrate .. //depot/projects/efi/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/efi/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/efi/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/efi/dev/drm/drm.h#2 integrate .. //depot/projects/efi/dev/drm/drmP.h#2 integrate .. //depot/projects/efi/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/efi/dev/drm/drm_auth.c#2 integrate .. //depot/projects/efi/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/efi/dev/drm/drm_context.c#2 integrate .. //depot/projects/efi/dev/drm/drm_dma.c#2 integrate .. //depot/projects/efi/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/efi/dev/drm/drm_drv.c#2 integrate .. //depot/projects/efi/dev/drm/drm_fops.c#2 integrate .. //depot/projects/efi/dev/drm/drm_internal.h#1 branch .. //depot/projects/efi/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/efi/dev/drm/drm_irq.c#2 integrate .. //depot/projects/efi/dev/drm/drm_lock.c#2 integrate .. //depot/projects/efi/dev/drm/drm_memory.c#2 integrate .. //depot/projects/efi/dev/drm/drm_pci.c#2 integrate .. //depot/projects/efi/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/efi/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/efi/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/efi/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/efi/dev/drm/drm_vm.c#2 integrate .. //depot/projects/efi/dev/drm/i915_dma.c#2 integrate .. //depot/projects/efi/dev/drm/i915_drm.h#2 integrate .. //depot/projects/efi/dev/drm/i915_drv.c#2 integrate .. //depot/projects/efi/dev/drm/i915_drv.h#2 integrate .. //depot/projects/efi/dev/drm/i915_irq.c#2 integrate .. //depot/projects/efi/dev/drm/i915_mem.c#2 integrate .. //depot/projects/efi/dev/drm/i915_suspend.c#1 branch .. //depot/projects/efi/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/efi/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/efi/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/efi/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/efi/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/efi/dev/drm/mach64_state.c#2 integrate .. //depot/projects/efi/dev/drm/mga_dma.c#2 integrate .. //depot/projects/efi/dev/drm/mga_drm.h#2 integrate .. //depot/projects/efi/dev/drm/mga_drv.c#2 integrate .. //depot/projects/efi/dev/drm/mga_drv.h#2 integrate .. //depot/projects/efi/dev/drm/mga_irq.c#2 integrate .. //depot/projects/efi/dev/drm/mga_state.c#2 integrate .. //depot/projects/efi/dev/drm/mga_warp.c#2 integrate .. //depot/projects/efi/dev/drm/r128_cce.c#2 integrate .. //depot/projects/efi/dev/drm/r128_drm.h#2 integrate .. //depot/projects/efi/dev/drm/r128_drv.c#2 integrate .. //depot/projects/efi/dev/drm/r128_drv.h#2 integrate .. //depot/projects/efi/dev/drm/r128_irq.c#2 integrate .. //depot/projects/efi/dev/drm/r128_state.c#2 integrate .. //depot/projects/efi/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/efi/dev/drm/r300_reg.h#2 integrate .. //depot/projects/efi/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/efi/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/efi/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/efi/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/efi/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/efi/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/efi/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/efi/dev/drm/radeon_state.c#2 integrate .. //depot/projects/efi/dev/drm/savage_bci.c#2 integrate .. //depot/projects/efi/dev/drm/savage_drm.h#2 integrate .. //depot/projects/efi/dev/drm/savage_drv.c#2 integrate .. //depot/projects/efi/dev/drm/savage_drv.h#2 integrate .. //depot/projects/efi/dev/drm/savage_state.c#2 integrate .. //depot/projects/efi/dev/drm/sis_drv.c#2 integrate .. //depot/projects/efi/dev/drm/sis_drv.h#2 integrate .. //depot/projects/efi/dev/drm/sis_mm.c#2 integrate .. //depot/projects/efi/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/efi/dev/e1000/LICENSE#1 branch .. //depot/projects/efi/dev/e1000/README#1 branch .. //depot/projects/efi/dev/e1000/e1000_80003es2lan.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_80003es2lan.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_82540.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_82541.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_82541.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_82542.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_82543.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_82543.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_82571.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_82571.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_82575.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_82575.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_api.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_api.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_defines.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_hw.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_ich8lan.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_ich8lan.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_mac.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_mac.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_manage.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_manage.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_nvm.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_nvm.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_osdep.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_osdep.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/efi/dev/e1000/e1000_phy.h#1 branch .. //depot/projects/efi/dev/e1000/e1000_regs.h#1 branch .. //depot/projects/efi/dev/e1000/if_em.c#1 branch .. //depot/projects/efi/dev/e1000/if_em.h#1 branch .. //depot/projects/efi/dev/e1000/if_igb.c#1 branch .. //depot/projects/efi/dev/e1000/if_igb.h#1 branch .. //depot/projects/efi/dev/ed/if_ed.c#2 integrate .. //depot/projects/efi/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/efi/dev/em/LICENSE#2 delete .. //depot/projects/efi/dev/em/README#2 delete .. //depot/projects/efi/dev/em/e1000_80003es2lan.c#2 delete .. //depot/projects/efi/dev/em/e1000_80003es2lan.h#2 delete .. //depot/projects/efi/dev/em/e1000_82540.c#2 delete .. //depot/projects/efi/dev/em/e1000_82541.c#2 delete .. //depot/projects/efi/dev/em/e1000_82541.h#2 delete .. //depot/projects/efi/dev/em/e1000_82542.c#2 delete .. //depot/projects/efi/dev/em/e1000_82543.c#2 delete .. //depot/projects/efi/dev/em/e1000_82543.h#2 delete .. //depot/projects/efi/dev/em/e1000_82571.c#2 delete .. //depot/projects/efi/dev/em/e1000_82571.h#2 delete .. //depot/projects/efi/dev/em/e1000_api.c#2 delete .. //depot/projects/efi/dev/em/e1000_api.h#2 delete .. //depot/projects/efi/dev/em/e1000_defines.h#2 delete .. //depot/projects/efi/dev/em/e1000_hw.h#2 delete .. //depot/projects/efi/dev/em/e1000_ich8lan.c#2 delete .. //depot/projects/efi/dev/em/e1000_ich8lan.h#2 delete .. //depot/projects/efi/dev/em/e1000_mac.c#2 delete .. //depot/projects/efi/dev/em/e1000_mac.h#2 delete .. //depot/projects/efi/dev/em/e1000_manage.c#2 delete .. //depot/projects/efi/dev/em/e1000_manage.h#2 delete .. //depot/projects/efi/dev/em/e1000_nvm.c#2 delete .. //depot/projects/efi/dev/em/e1000_nvm.h#2 delete .. //depot/projects/efi/dev/em/e1000_osdep.c#2 delete .. //depot/projects/efi/dev/em/e1000_osdep.h#2 delete .. //depot/projects/efi/dev/em/e1000_phy.c#2 delete .. //depot/projects/efi/dev/em/e1000_phy.h#2 delete .. //depot/projects/efi/dev/em/e1000_regs.h#2 delete .. //depot/projects/efi/dev/em/if_em.c#2 delete .. //depot/projects/efi/dev/em/if_em.h#2 delete .. //depot/projects/efi/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/efi/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/efi/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/efi/dev/et/if_et.c#1 branch .. //depot/projects/efi/dev/et/if_etreg.h#1 branch .. //depot/projects/efi/dev/et/if_etvar.h#1 branch .. //depot/projects/efi/dev/ex/if_ex.c#2 integrate .. //depot/projects/efi/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/efi/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/efi/dev/ex/if_exvar.h#2 integrate .. //depot/projects/efi/dev/fe/if_fe.c#2 integrate .. //depot/projects/efi/dev/fe/if_fe_cbus.c#2 integrate .. //depot/projects/efi/dev/fe/if_fe_isa.c#2 integrate .. //depot/projects/efi/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/efi/dev/fe/if_fevar.h#2 integrate .. //depot/projects/efi/dev/firewire/firewire.c#2 integrate .. //depot/projects/efi/dev/firewire/fwohci.c#2 integrate .. //depot/projects/efi/dev/gem/if_gem.c#2 integrate .. //depot/projects/efi/dev/glxsb/glxsb.c#1 branch .. //depot/projects/efi/dev/glxsb/glxsb.h#1 branch .. //depot/projects/efi/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/efi/dev/harp/if_harp.c#2 delete .. //depot/projects/efi/dev/hfa/fore.h#2 delete .. //depot/projects/efi/dev/hfa/fore_aali.h#2 delete .. //depot/projects/efi/dev/hfa/fore_buffer.c#2 delete .. //depot/projects/efi/dev/hfa/fore_command.c#2 delete .. //depot/projects/efi/dev/hfa/fore_globals.c#2 delete .. //depot/projects/efi/dev/hfa/fore_if.c#2 delete .. //depot/projects/efi/dev/hfa/fore_include.h#2 delete .. //depot/projects/efi/dev/hfa/fore_init.c#2 delete .. //depot/projects/efi/dev/hfa/fore_intr.c#2 delete .. //depot/projects/efi/dev/hfa/fore_output.c#2 delete .. //depot/projects/efi/dev/hfa/fore_receive.c#2 delete .. //depot/projects/efi/dev/hfa/fore_slave.h#2 delete .. //depot/projects/efi/dev/hfa/fore_stats.c#2 delete .. //depot/projects/efi/dev/hfa/fore_stats.h#2 delete .. //depot/projects/efi/dev/hfa/fore_timer.c#2 delete .. //depot/projects/efi/dev/hfa/fore_transmit.c#2 delete .. //depot/projects/efi/dev/hfa/fore_var.h#2 delete .. //depot/projects/efi/dev/hfa/fore_vcm.c#2 delete .. //depot/projects/efi/dev/hfa/hfa_eisa.c#2 delete .. //depot/projects/efi/dev/hfa/hfa_freebsd.c#2 delete .. //depot/projects/efi/dev/hfa/hfa_freebsd.h#2 delete .. //depot/projects/efi/dev/hfa/hfa_pci.c#2 delete .. //depot/projects/efi/dev/hfa/hfa_sbus.c#2 delete .. //depot/projects/efi/dev/hme/if_hme.c#2 integrate .. //depot/projects/efi/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/efi/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/efi/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/efi/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/efi/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/efi/dev/ic/ns16550.h#2 integrate .. //depot/projects/efi/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/efi/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/efi/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/efi/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/efi/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/efi/dev/idt/idt.c#2 delete .. //depot/projects/efi/dev/idt/idt_harp.c#2 delete .. //depot/projects/efi/dev/idt/idt_pci.c#2 delete .. //depot/projects/efi/dev/idt/idtreg.h#2 delete .. //depot/projects/efi/dev/idt/idtvar.h#2 delete .. //depot/projects/efi/dev/ie/if_ie.c#2 integrate .. //depot/projects/efi/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/efi/dev/ie/if_ievar.h#2 integrate .. //depot/projects/efi/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/efi/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/efi/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/efi/dev/igb/e1000_82575.c#2 delete .. //depot/projects/efi/dev/igb/e1000_82575.h#2 delete .. //depot/projects/efi/dev/igb/e1000_api.c#2 delete .. //depot/projects/efi/dev/igb/e1000_api.h#2 delete .. //depot/projects/efi/dev/igb/e1000_defines.h#2 delete .. //depot/projects/efi/dev/igb/e1000_hw.h#2 delete .. //depot/projects/efi/dev/igb/e1000_mac.c#2 delete .. //depot/projects/efi/dev/igb/e1000_mac.h#2 delete .. //depot/projects/efi/dev/igb/e1000_manage.c#2 delete .. //depot/projects/efi/dev/igb/e1000_manage.h#2 delete .. //depot/projects/efi/dev/igb/e1000_nvm.c#2 delete .. //depot/projects/efi/dev/igb/e1000_nvm.h#2 delete .. //depot/projects/efi/dev/igb/e1000_osdep.c#2 delete .. //depot/projects/efi/dev/igb/e1000_osdep.h#2 delete .. //depot/projects/efi/dev/igb/e1000_phy.c#2 delete .. //depot/projects/efi/dev/igb/e1000_phy.h#2 delete .. //depot/projects/efi/dev/igb/e1000_regs.h#2 delete .. //depot/projects/efi/dev/igb/if_igb.c#2 delete .. //depot/projects/efi/dev/igb/if_igb.h#2 delete .. //depot/projects/efi/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/efi/dev/iicbus/ds133x.c#1 branch .. //depot/projects/efi/dev/iicbus/icee.c#2 integrate .. //depot/projects/efi/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/efi/dev/iicbus/iic.c#2 integrate .. //depot/projects/efi/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/efi/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/efi/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/efi/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/efi/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/efi/dev/io/iodev.c#2 integrate .. //depot/projects/efi/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/efi/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/efi/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/efi/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/efi/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/efi/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/efi/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/efi/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/efi/dev/iwn/if_iwn.c#1 branch .. //depot/projects/efi/dev/iwn/if_iwnreg.h#1 branch .. //depot/projects/efi/dev/iwn/if_iwnvar.h#1 branch .. //depot/projects/efi/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/efi/dev/ixgbe/README#1 branch .. //depot/projects/efi/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/efi/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/efi/dev/jme/if_jme.c#1 branch .. //depot/projects/efi/dev/jme/if_jmereg.h#1 branch .. //depot/projects/efi/dev/jme/if_jmevar.h#1 branch .. //depot/projects/efi/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/efi/dev/kbd/kbd.c#2 integrate .. //depot/projects/efi/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/efi/dev/led/led.c#2 integrate .. //depot/projects/efi/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/efi/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/efi/dev/malo/if_malo.c#2 integrate .. //depot/projects/efi/dev/malo/if_malo.h#2 integrate .. //depot/projects/efi/dev/md/md.c#2 integrate .. //depot/projects/efi/dev/mfi/mfi.c#2 integrate .. //depot/projects/efi/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/efi/dev/mii/atphy.c#1 branch .. //depot/projects/efi/dev/mii/atphyreg.h#1 branch .. //depot/projects/efi/dev/mii/brgphy.c#2 integrate .. //depot/projects/efi/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/efi/dev/mii/ciphy.c#2 integrate .. //depot/projects/efi/dev/mii/jmphy.c#1 branch .. //depot/projects/efi/dev/mii/jmphyreg.h#1 branch .. //depot/projects/efi/dev/mii/lxtphy.c#2 integrate .. //depot/projects/efi/dev/mii/mii.c#2 integrate .. //depot/projects/efi/dev/mii/miidevs#2 integrate .. //depot/projects/efi/dev/mii/mlphy.c#2 integrate .. //depot/projects/efi/dev/mii/rgephy.c#2 integrate .. //depot/projects/efi/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/efi/dev/mii/smcphy.c#1 branch .. //depot/projects/efi/dev/mii/tlphy.c#2 integrate .. //depot/projects/efi/dev/mii/truephy.c#1 branch .. //depot/projects/efi/dev/mii/truephyreg.h#1 branch .. //depot/projects/efi/dev/mpt/mpt.h#2 integrate .. //depot/projects/efi/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/efi/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/efi/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/efi/dev/mpt/mpt_user.c#1 branch .. //depot/projects/efi/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/efi/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/efi/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/efi/dev/nve/if_nve.c#2 integrate .. //depot/projects/efi/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/efi/dev/nvram/nvram.c#2 integrate .. //depot/projects/efi/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/efi/dev/pccard/pccard.c#2 integrate .. //depot/projects/efi/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/efi/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/efi/dev/pccard/pccarddevs#2 integrate .. //depot/projects/efi/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/efi/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/efi/dev/pcf/envctrl.c#2 integrate .. //depot/projects/efi/dev/pcf/pcf.c#2 integrate .. //depot/projects/efi/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/efi/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/efi/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/efi/dev/pci/pci.c#2 integrate .. //depot/projects/efi/dev/pci/pci_pci.c#2 integrate .. //depot/projects/efi/dev/pci/pcib_private.h#2 integrate .. //depot/projects/efi/dev/pci/pcireg.h#2 integrate .. //depot/projects/efi/dev/pci/pcivar.h#2 integrate .. //depot/projects/efi/dev/pcn/if_pcn.c#1 branch .. //depot/projects/efi/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/efi/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/efi/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/efi/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/efi/dev/ppc/ppc.c#2 integrate .. //depot/projects/efi/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/efi/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/efi/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/efi/dev/puc/pucdata.c#2 integrate .. //depot/projects/efi/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/efi/dev/ral/if_ralrate.c#2 delete .. //depot/projects/efi/dev/ral/if_ralrate.h#2 delete .. //depot/projects/efi/dev/ral/rt2560.c#2 integrate .. //depot/projects/efi/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/efi/dev/ral/rt2560var.h#2 integrate .. //depot/projects/efi/dev/ral/rt2661.c#2 integrate .. //depot/projects/efi/dev/ral/rt2661_ucode.h#2 delete .. //depot/projects/efi/dev/ral/rt2661var.h#2 integrate .. //depot/projects/efi/dev/re/if_re.c#2 integrate .. //depot/projects/efi/dev/sbni/if_sbni.c#2 delete .. //depot/projects/efi/dev/sbni/if_sbni_isa.c#2 delete .. //depot/projects/efi/dev/sbni/if_sbni_pci.c#2 delete .. //depot/projects/efi/dev/sbni/if_sbnireg.h#2 delete .. //depot/projects/efi/dev/sbni/if_sbnivar.h#2 delete .. //depot/projects/efi/dev/sbsh/if_sbsh.c#2 delete .. //depot/projects/efi/dev/sbsh/if_sbshreg.h#2 delete .. //depot/projects/efi/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/efi/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/efi/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/efi/dev/scc/scc_bfe_quicc.c#2 integrate .. //depot/projects/efi/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/efi/dev/scc/scc_core.c#2 integrate .. //depot/projects/efi/dev/si/si.c#2 integrate .. //depot/projects/efi/dev/si/si.h#2 integrate .. //depot/projects/efi/dev/sio/sio.c#2 integrate .. //depot/projects/efi/dev/sis/if_sis.c#1 branch .. //depot/projects/efi/dev/sis/if_sisreg.h#1 branch .. //depot/projects/efi/dev/smbus/smb.c#2 integrate .. //depot/projects/efi/dev/smc/if_smc.c#1 branch .. //depot/projects/efi/dev/smc/if_smcreg.h#1 branch .. //depot/projects/efi/dev/smc/if_smcvar.h#1 branch .. //depot/projects/efi/dev/snc/dp83932.c#2 integrate .. //depot/projects/efi/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/efi/dev/snc/dp83932var.h#2 integrate .. //depot/projects/efi/dev/snc/if_snc.c#2 integrate .. //depot/projects/efi/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/efi/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/efi/dev/snc/if_sncreg.h#2 integrate .. //depot/projects/efi/dev/snp/snp.c#2 integrate .. //depot/projects/efi/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/efi/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/efi/dev/sound/pci/csa.c#2 integrate .. //depot/projects/efi/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/efi/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/efi/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/efi/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/efi/dev/speaker/spkr.c#2 integrate .. //depot/projects/efi/dev/ste/if_ste.c#1 branch .. //depot/projects/efi/dev/ste/if_stereg.h#1 branch .. //depot/projects/efi/dev/sym/sym_defs.h#2 integrate .. //depot/projects/efi/dev/sym/sym_fw.h#2 integrate .. //depot/projects/efi/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/efi/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/efi/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/efi/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/efi/dev/syscons/schistory.c#2 integrate .. //depot/projects/efi/dev/syscons/scmouse.c#2 integrate .. //depot/projects/efi/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/efi/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/efi/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/efi/dev/syscons/syscons.c#2 integrate .. //depot/projects/efi/dev/syscons/syscons.h#2 integrate .. //depot/projects/efi/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/efi/dev/ti/if_ti.c#2 integrate .. //depot/projects/efi/dev/tl/if_tl.c#1 branch .. //depot/projects/efi/dev/tl/if_tlreg.h#1 branch .. //depot/projects/efi/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/efi/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/efi/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/efi/dev/tx/if_tx.c#2 integrate .. //depot/projects/efi/dev/tx/if_txvar.h#2 integrate .. //depot/projects/efi/dev/uart/uart.h#2 integrate .. //depot/projects/efi/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/efi/dev/uart/uart_core.c#2 integrate .. //depot/projects/efi/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/efi/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/efi/dev/uart/uart_tty.c#2 integrate .. //depot/projects/efi/dev/usb/ehci.c#2 integrate .. //depot/projects/efi/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/efi/dev/usb/ehcireg.h#2 integrate .. //depot/projects/efi/dev/usb/ehcivar.h#2 integrate .. //depot/projects/efi/dev/usb/hid.c#2 integrate .. //depot/projects/efi/dev/usb/if_axe.c#2 integrate .. //depot/projects/efi/dev/usb/if_rum.c#2 integrate .. //depot/projects/efi/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/efi/dev/usb/if_udav.c#2 integrate .. //depot/projects/efi/dev/usb/if_upgt.c#1 branch .. //depot/projects/efi/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/efi/dev/usb/if_ural.c#2 integrate .. //depot/projects/efi/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/efi/dev/usb/if_zyd.c#2 integrate .. //depot/projects/efi/dev/usb/if_zydreg.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 30 23:24:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9B1A106567E; Sat, 30 Aug 2008 23:24: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 9D1131065678 for ; Sat, 30 Aug 2008 23:24:05 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B86E8FC13 for ; Sat, 30 Aug 2008 23:24:05 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UNO5CV020849 for ; Sat, 30 Aug 2008 23:24:05 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UNO54n020847 for perforce@freebsd.org; Sat, 30 Aug 2008 23:24:05 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 30 Aug 2008 23:24:05 GMT Message-Id: <200808302324.m7UNO54n020847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148873 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, 30 Aug 2008 23:24:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=148873 Change 148873 by rpaulo@rpaulo_alpha on 2008/08/30 23:23:51 The entry is called _start. We won't be needing a _start_plabel. Affected files ... .. //depot/projects/efi/boot/i386/efi/ldscript.ia32#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/ldscript.ia32#2 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $FreeBSD: src/sys/boot/ia64/efi/ldscript.ia64,v 1.9 2004/11/23 05:38:30 marcel Exp $ */ +/* $FreeBSD$ */ OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") OUTPUT_ARCH(i386) -ENTRY(_start_plabel) +ENTRY(_start) SECTIONS { /* Read-only sections, merged into text segment: */ From owner-p4-projects@FreeBSD.ORG Sat Aug 30 23:26:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E6421065671; Sat, 30 Aug 2008 23:26:08 +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 E58CA106564A for ; Sat, 30 Aug 2008 23:26:07 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9BB08FC12 for ; Sat, 30 Aug 2008 23:26:07 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UNQ7R2021039 for ; Sat, 30 Aug 2008 23:26:07 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UNQ7E5021037 for perforce@freebsd.org; Sat, 30 Aug 2008 23:26:07 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 30 Aug 2008 23:26:07 GMT Message-Id: <200808302326.m7UNQ7E5021037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148874 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, 30 Aug 2008 23:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=148874 Change 148874 by rpaulo@rpaulo_alpha on 2008/08/30 23:25:35 Add a simple relocation function. On the ia64 we needed to write it on assembly, but for ia32 we don't. (I wonder if we can write the ia64 _reloc function in C, but I know nothing about ia64.) Affected files ... .. //depot/projects/efi/boot/i386/efi/reloc.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 30 23:32:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76BEC106568A; Sat, 30 Aug 2008 23:32: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 3A1071065670 for ; Sat, 30 Aug 2008 23:32:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E4138FC08 for ; Sat, 30 Aug 2008 23:32:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UNWDcr021486 for ; Sat, 30 Aug 2008 23:32:13 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UNWDhY021484 for perforce@freebsd.org; Sat, 30 Aug 2008 23:32:13 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 30 Aug 2008 23:32:13 GMT Message-Id: <200808302332.m7UNWDhY021484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148875 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, 30 Aug 2008 23:32:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148875 Change 148875 by rpaulo@rpaulo_alpha on 2008/08/30 23:31:33 Placeholder for upcoming assembly code for _start. Affected files ... .. //depot/projects/efi/boot/i386/efi/start.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 30 23:33:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F09710656D5; Sat, 30 Aug 2008 23:33: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 62FDD10656C5 for ; Sat, 30 Aug 2008 23:33:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 371388FC0C for ; Sat, 30 Aug 2008 23:33:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UNXFwe021600 for ; Sat, 30 Aug 2008 23:33:15 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UNXFhh021598 for perforce@freebsd.org; Sat, 30 Aug 2008 23:33:15 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 30 Aug 2008 23:33:15 GMT Message-Id: <200808302333.m7UNXFhh021598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148876 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, 30 Aug 2008 23:33:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=148876 Change 148876 by rpaulo@rpaulo_alpha on 2008/08/30 23:32:41 Keep compiler happy. Affected files ... .. //depot/projects/efi/boot/i386/efi/reloc.c#2 edit Differences ... ==== //depot/projects/efi/boot/i386/efi/reloc.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ break; case R_386_RELATIVE: /* Address relative to the base address. */ - newaddr = ImageBase + rel->r_offset; + newaddr = (unsigned long) ImageBase + rel->r_offset; *newaddr += ImageBase; break; default:
    + - + + + + @@ -68,7 +74,7 @@
    -Copyright (c) 2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2003, 2008 Sendmail, Inc. and its suppliers. All rights reserved.
    By using this file, you agree to the terms and conditions set ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_version.html#2 (text+ko) ==== @@ -2,7 +2,7 @@ smfi_version()

    smfi_version()

    @@ -59,24 +59,30 @@ Note: the compile time version of libmilter is available in the macro SMFI_VERSION. -A milter can check this macro to determine which functions to use +To extract the major and minor version as well as the current patch level +from this macro, the macros +SM_LM_VRS_MAJOR(v), +SM_LM_VRS_MINOR(v), and +SM_LM_VRS_PLVL(v) +can be used, respectively. +A milter can check the +SMFI_VERSION +macro to determine which functions to use (at compile time via C preprocessor statements). Using this macro and the smfi_version() function, a milter can determine at runtime whether it has been (dynamically) linked against the expected libmilter version. -To extract the major and minor version as well as the current patch level -from this macro, the macros -SM_LM_VRS_MAJOR(v), -SM_LM_VRS_MINOR(v), and -SM_LM_VRS_PLVL(v) -can be used, respectively. +Such a function should only compare the major and minor version, +not the patch level, +i.e., the libmilter library will be compatible despite +different patch levels.
    -Copyright (c) 2006, 2007 Sendmail, Inc. and its suppliers. +Copyright (c) 2006-2008 Sendmail, Inc. and its suppliers. All rights reserved.
    By using this file, you agree to the terms and conditions set ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/engine.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006-2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include -SM_RCSID("@(#)$Id: engine.c,v 8.159 2007/04/23 22:22:50 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.162 2008/02/27 01:34:14 ca Exp $") #include "libmilter.h" @@ -1001,6 +1001,7 @@ (long) ctx->ctx_id, ctx->ctx_mta_pflags, i); return _SMFIS_ABORT; } + fix_stm(ctx); if (ctx->ctx_dbg > 3) sm_dprintf("[%ld] milter_negotiate:" @@ -1725,9 +1726,9 @@ int n; int nerr = 0; #if SM_CONF_POLL - struct pollfd pfd; + struct pollfd pfd; #else /* SM_CONF_POLL */ - fd_set rd_set, exc_set; + fd_set rd_set, exc_set; #endif /* SM_CONF_POLL */ do ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/worker.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2003-2004, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -11,7 +11,7 @@ */ #include -SM_RCSID("@(#)$Id: worker.c,v 8.9 2006/12/18 18:26:51 ca Exp $") +SM_RCSID("@(#)$Id: worker.c,v 8.10 2007/12/03 22:06:05 ca Exp $") #include "libmilter.h" @@ -263,8 +263,6 @@ return MI_FAILURE; } - POOL_LEV_DPRINTF(4, ("PIPE r=[%d] w=[%d]", RD_PIPE, WR_PIPE)); - (void) smutex_init(&Tskmgr.tm_w_mutex); (void) scond_init(&Tskmgr.tm_w_cond); ==== //depot/projects/mpsafetty/contrib/sendmail/mail.local/mail.local.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.27 2007/04/09 01:44:16 gshapiro Exp $ + * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.28 2008/08/28 06:08:29 gshapiro Exp $ * */ @@ -20,7 +20,7 @@ Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.254 2006/10/12 22:23:45 ca Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.256 2008/02/19 07:13:30 gshapiro Exp $") #include #include @@ -81,6 +81,15 @@ # endif /* HASHSPOOLMD5 */ #endif /* HASHSPOOL */ +#if _FFR_SPOOL_PATH + /* + ** Override path to mail store at run time (using -p). + ** From: Eugene Grosbein of Svyaz Service JSC + ** See: http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/114195 + ** NOTE: Update man page before adding this to a release. + */ +#endif /* _FFR_SPOOL_PATH */ + #ifndef LOCKTO_RM # define LOCKTO_RM 300 /* timeout for stale lockfile removal */ @@ -231,7 +240,11 @@ #if HASHSPOOL while ((ch = getopt(argc, argv, "7BbdD:f:h:r:lH:p:ns")) != -1) #else /* HASHSPOOL */ +# if _FFR_SPOOL_PATH + while ((ch = getopt(argc, argv, "7BbdD:f:h:r:lp:s")) != -1) +# else /* _FFR_SPOOL_PATH */ while ((ch = getopt(argc, argv, "7BbdD:f:h:r:ls")) != -1) +# endif /* _FFR_SPOOL_PATH */ #endif /* HASHSPOOL */ { switch(ch) @@ -319,6 +332,12 @@ } break; + case 'n': + StripRcptDomain = false; + break; +#endif /* HASHSPOOL */ + +#if HASHSPOOL || _FFR_SPOOL_PATH case 'p': if (optarg == NULL || *optarg == '\0') { @@ -332,11 +351,7 @@ usage(); } break; - - case 'n': - StripRcptDomain = false; - break; -#endif /* HASHSPOOL */ +#endif /* HASHSPOOL || _FFR_SPOOL_PATH */ case '?': default: @@ -1582,7 +1597,11 @@ usage() { ExitVal = EX_USAGE; +# if _FFR_SPOOL_PATH + mailerr(NULL, "usage: mail.local [-7] [-B] [-b] [-d] [-l] [-s] [-f from|-r from] [-h filename] [-p path] user ..."); +# else /* _FFR_SPOOL_PATH */ mailerr(NULL, "usage: mail.local [-7] [-B] [-b] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ..."); +# endif /* _FFR_SPOOL_PATH */ sm_exit(ExitVal); } ==== //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.8#2 (text+ko) ==== @@ -8,9 +8,9 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: makemap.8,v 8.30 2002/06/27 23:41:04 gshapiro Exp $ +.\" $Id: makemap.8,v 8.31 2008/05/02 23:07:48 ca Exp $ .\" -.TH MAKEMAP 8 "$Date: 2002/06/27 23:41:04 $" +.TH MAKEMAP 8 "$Date: 2008/05/02 23:07:48 $" .SH NAME makemap \- create database maps for sendmail @@ -156,7 +156,8 @@ links in world writable directories. .TP .B \-t -Use the specified delimiter instead of white space. +Use the specified delimiter instead of white space +(also for dumping a map). .TP .B \-u dump (unmap) the content of the database to standard output. ==== //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2002, 2004, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1992 Eric P. Allman. All rights reserved. * Copyright (c) 1992, 1993 @@ -20,7 +20,7 @@ Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.178 2007/05/11 18:45:39 ca Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.179 2008/04/14 02:06:16 ca Exp $") #include @@ -378,9 +378,10 @@ break; (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, - "%.*s\t%.*s\n", + "%.*s%c%.*s\n", (int) db_key.size, (char *) db_key.data, + (sep != '\0') ? sep : '\t', (int) db_val.size, (char *)db_val.data); ==== //depot/projects/mpsafetty/contrib/sendmail/smrsh/README#2 (text+ko) ==== @@ -24,7 +24,7 @@ smrsh should build on most systems with the enclosed Build script: - host.domain% sh Build + host.domain% sh ./Build To compile smrsh.c by hand, use the following command: @@ -36,13 +36,13 @@ host.domain% cc -Bstatic -o smrsh smrsh.c or - host.domain% sh Build LDOPTS=-Bstatic + host.domain% sh ./Build LDOPTS=-Bstatic With gcc, the GNU C compiler, use the -static option. host.domain% cc -static -o smrsh smrsh.c or - host.domain% sh Build LDOPTS=-static + host.domain% sh ./Build LDOPTS=-static The following C defines can be set defined to change the search path and the bin directory used by smrsh. @@ -58,7 +58,7 @@ As root, install smrsh in /usr/libexec. Using the Build script: - host.domain# sh Build install + host.domain# sh ./Build install For manual installation: install smrsh in the /usr/libexec directory, with mode 511. @@ -163,4 +163,4 @@ host.domain# /usr/sbin/sendmail -bd -q30m -$Revision: 8.9 $, Last updated $Date: 2003/05/26 04:30:58 $ +$Revision: 8.10 $, Last updated $Date: 2008/02/12 16:40:06 $ ==== //depot/projects/mpsafetty/contrib/sendmail/smrsh/smrsh.c#2 (text+ko) ==== @@ -9,7 +9,6 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $FreeBSD: src/contrib/sendmail/smrsh/smrsh.c,v 1.19 2005/02/14 02:39:14 gshapiro Exp $ */ #include ==== //depot/projects/mpsafetty/contrib/sendmail/src/Makefile.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.112 2007/10/17 21:29:43 ca Exp $ +dnl $Id: Makefile.m4,v 8.115 2008/03/27 16:13:33 ca Exp $ include(confBUILDTOOLSDIR`/M4/switch.m4') define(`confREQUIRE_LIBSM', `true') ==== //depot/projects/mpsafetty/contrib/sendmail/src/README#2 (text+ko) ==== @@ -9,7 +9,7 @@ # the sendmail distribution. # # -# $Id: README,v 8.390 2006/11/13 22:27:27 ca Exp $ +# $Id: README,v 8.391 2008/02/12 16:38:21 ca Exp $ # This directory contains the source files for sendmail(TM). @@ -41,7 +41,7 @@ By far, the easiest way to compile sendmail is to use the "Build" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 28 19:08:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D1F1106567B; Thu, 28 Aug 2008 19:08: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 311571065670 for ; Thu, 28 Aug 2008 19:08:03 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 021DE8FC24 for ; Thu, 28 Aug 2008 19:08:03 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SJ82Bu056728 for ; Thu, 28 Aug 2008 19:08:02 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SJ82D8056726 for perforce@freebsd.org; Thu, 28 Aug 2008 19:08:02 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 28 Aug 2008 19:08:02 GMT Message-Id: <200808281908.m7SJ82D8056726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148736 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, 28 Aug 2008 19:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=148736 Change 148736 by ed@ed_dull on 2008/08/28 19:07:08 We have packet mode now. Affected files ... .. //depot/projects/mpsafetty/share/man/man4/pts.4#8 edit Differences ... ==== //depot/projects/mpsafetty/share/man/man4/pts.4#8 (text+ko) ==== @@ -173,9 +173,3 @@ it was replaced with the .Nm driver. -.Sh BUGS -Packet mode has not been properly implemented in this version of -.Fx . -When enabled, it will always prepend -.Dv TIOCPKT_DATA , -even if other events have been triggered. From owner-p4-projects@FreeBSD.ORG Thu Aug 28 22:34:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92A271065675; Thu, 28 Aug 2008 22:34: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 5674C1065671 for ; Thu, 28 Aug 2008 22:34:43 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E4D08FC14 for ; Thu, 28 Aug 2008 22:34:43 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SMYhF2098416 for ; Thu, 28 Aug 2008 22:34:43 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SMYh8C098414 for perforce@freebsd.org; Thu, 28 Aug 2008 22:34:43 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Aug 2008 22:34:43 GMT Message-Id: <200808282234.m7SMYh8C098414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 148753 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, 28 Aug 2008 22:34:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=148753 Change 148753 by gabor@gabor_server on 2008/08/28 22:34:22 - Drop unnecessary function - style(9) and better readable code - Add a comment about performance Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/queue.c#6 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ /* * A really poor man's queue. It does only what it has to and gets out of - * Dodge. + * Dodge. It is used in place of to get a better performance. */ #include @@ -62,23 +62,16 @@ q_head = q_tail = NULL; } -static void -free_item(struct queue *item) -{ - - free(item); -} - void enqueue(struct str *x) { struct queue *item; - item = grep_malloc(sizeof *item + x->len); + item = grep_malloc(sizeof(struct queue)); + item->data.dat = grep_malloc(sizeof(char) * x->len); item->data.len = x->len; item->data.line_no = x->line_no; item->data.off = x->off; - item->data.dat = (char *)item + sizeof *item; memcpy(item->data.dat, x->dat, x->len); item->data.file = x->file; item->next = NULL; @@ -91,7 +84,7 @@ } if (++count > Bflag) - free_item(dequeue()); + free(dequeue()); } static struct queue * @@ -117,7 +110,7 @@ while ((item = dequeue()) != NULL) { printline(&item->data, '-', (regmatch_t *)NULL, 0); - free_item(item); + free(item); } } @@ -127,5 +120,5 @@ struct queue *item; while ((item = dequeue()) != NULL) - free_item(item); + free(item); } From owner-p4-projects@FreeBSD.ORG Thu Aug 28 23:03:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B06181065671; Thu, 28 Aug 2008 23:03: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 747E9106564A for ; Thu, 28 Aug 2008 23:03:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C8108FC1A for ; Thu, 28 Aug 2008 23:03:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SN3CQ9002010 for ; Thu, 28 Aug 2008 23:03:12 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SN3C4U002008 for perforce@freebsd.org; Thu, 28 Aug 2008 23:03:12 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Aug 2008 23:03:12 GMT Message-Id: <200808282303.m7SN3C4U002008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 148756 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, 28 Aug 2008 23:03:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=148756 Change 148756 by gabor@gabor_server on 2008/08/28 23:02:40 - Be more error-prone in the -w part Suggested by: ache Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#74 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#74 (text+ko) ==== @@ -289,14 +289,22 @@ if (r == 0 && wflag && pmatch.rm_so != 0 && pmatch.rm_eo != l->len) { wchar_t *wbegin; wint_t wend; + size_t size; + + size = mbstowcs(NULL, l->dat, pmatch.rm_so); - wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so)); - if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) + if (size = -1) r = REG_NOMATCH; - wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend); - if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend)) - r = REG_NOMATCH; - free(wbegin); + else { + wbegin = grep_malloc(size); + if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) + r = REG_NOMATCH; + else if (sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend) != 1) + r = REG_NOMATCH; + else if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend)) + r = REG_NOMATCH; + free(wbegin); + } } if (r == 0) { if (m == 0) From owner-p4-projects@FreeBSD.ORG Fri Aug 29 00:13:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE55B1065682; Fri, 29 Aug 2008 00:13: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 8268F1065679 for ; Fri, 29 Aug 2008 00:13:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A3108FC17 for ; Fri, 29 Aug 2008 00:13:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T0DN18008692 for ; Fri, 29 Aug 2008 00:13:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0DN2o008690 for perforce@freebsd.org; Fri, 29 Aug 2008 00:13:23 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 00:13:23 GMT Message-Id: <200808290013.m7T0DN2o008690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148757 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, 29 Aug 2008 00:13:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=148757 Change 148757 by sam@sam_ebb on 2008/08/29 00:13:07 o delete key after use; otherwise crypto module winges about it o use hack at in-kernel clone api to make progress Affected files ... .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#4 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#4 (text+ko) ==== @@ -229,7 +229,7 @@ struct ieee80211_key key; struct mbuf *m = NULL; const struct ieee80211_cipher *cip; - int hdrlen; + int hdrlen, result = 0; printf("%s: ", t->name); @@ -337,12 +337,12 @@ } /* XXX check frame length and contents... */ printf("PASS\n"); - return 1; + result = 1; bad: if (m != NULL) m_freem(m); ieee80211_crypto_delkey(vap, &key); - return 0; + return result; } /* @@ -409,7 +409,7 @@ icp.icp_opmode = IEEE80211_M_STA; strlcpy(ifname, "wlan", sizeof(ifname)); - error = if_clone_create(ifname, sizeof(ifname), (caddr_t) &icp); + error = if_clone_create_sys(ifname, sizeof(ifname), (caddr_t) &icp); if (error != 0) { printf("%s: unable to clone vap (error %d)!\n", __func__, error); From owner-p4-projects@FreeBSD.ORG Fri Aug 29 00:14:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18ABB1065672; Fri, 29 Aug 2008 00:14: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 D119D1065676 for ; Fri, 29 Aug 2008 00:14:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EB588FC18 for ; Fri, 29 Aug 2008 00:14:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T0EOm1008777 for ; Fri, 29 Aug 2008 00:14:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0EODs008775 for perforce@freebsd.org; Fri, 29 Aug 2008 00:14:24 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 00:14:24 GMT Message-Id: <200808290014.m7T0EODs008775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148758 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, 29 Aug 2008 00:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=148758 Change 148758 by sam@sam_ebb on 2008/08/29 00:13:30 bump copyright Affected files ... .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#5 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2008 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Fri Aug 29 00:33:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96C961065689; Fri, 29 Aug 2008 00:33: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 5AE461065684 for ; Fri, 29 Aug 2008 00:33:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4289E8FC14 for ; Fri, 29 Aug 2008 00:33:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T0XiG4010353 for ; Fri, 29 Aug 2008 00:33:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0Xixv010351 for perforce@freebsd.org; Fri, 29 Aug 2008 00:33:44 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 00:33:44 GMT Message-Id: <200808290033.m7T0Xixv010351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148759 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, 29 Aug 2008 00:33:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=148759 Change 148759 by sam@sam_ebb on 2008/08/29 00:33:37 test remainder cases from 0-3 bytes Affected files ... .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#6 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#6 (text+ko) ==== @@ -182,15 +182,26 @@ } static struct mbuf * -formpacket(const struct ieee80211_cipher *cip, const void *plaintext, int len) +formpacket(const struct ieee80211_cipher *cip, const void *plaintext, + int len, int remainder) { - struct mbuf *m; + struct mbuf *m, *n; + const uint8_t *p = plaintext; + + printf("(packet %d+%d) ", len-remainder, remainder); - m = m_getcl(M_NOWAIT, MT_HEADER, M_PKTHDR); + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); KASSERT(m != NULL, ("cannot allocate mbuf!")); m->m_data += cip->ic_header; - m_append(m, len, plaintext); + m_append(m, len-remainder, p); + + if (remainder) { + n = m_get(M_NOWAIT, MT_DATA); + KASSERT(n != NULL, ("cannot split mbuf chain!")); + m_append(m, remainder, p + (len-remainder)); + m->m_next = n; + } return m; } @@ -223,7 +234,7 @@ } static int -runtest(struct ieee80211vap *vap, struct ciphertest *t) +runtest(struct ieee80211vap *vap, struct ciphertest *t, int remainder) { struct tkip_ctx *ctx; struct ieee80211_key key; @@ -259,7 +270,7 @@ */ cip = key.wk_cipher; m = formpacket(cip, t->plaintext, - t->plaintext_len - IEEE80211_WEP_MICLEN); + t->plaintext_len - IEEE80211_WEP_MICLEN, remainder); hdrlen = ieee80211_anyhdrsize(t->plaintext); /* @@ -383,7 +394,7 @@ struct ieee80211_clone_params icp; char ifname[IFNAMSIZ]; struct ieee80211vap *vap; - int pass = 0, total = 0, i, error; + int pass = 0, total = 0, i, error, remainder; uint8_t bands; ifp = if_alloc(IFT_IEEE80211); @@ -431,7 +442,8 @@ for (i = 0; i < N(tkiptests); i++) if (tests & (1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1D94106567D; Fri, 29 Aug 2008 00:37: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 958441065676 for ; Fri, 29 Aug 2008 00:37:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D2828FC22 for ; Fri, 29 Aug 2008 00:37:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T0bmJO010684 for ; Fri, 29 Aug 2008 00:37:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0bmR5010682 for perforce@freebsd.org; Fri, 29 Aug 2008 00:37:48 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 00:37:48 GMT Message-Id: <200808290037.m7T0bmR5010682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148760 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, 29 Aug 2008 00:37:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=148760 Change 148760 by sam@sam_ebb on 2008/08/29 00:37:34 fix count of passed test vectors Affected files ... .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#7 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#7 (text+ko) ==== @@ -394,7 +394,7 @@ struct ieee80211_clone_params icp; char ifname[IFNAMSIZ]; struct ieee80211vap *vap; - int pass = 0, total = 0, i, error, remainder; + int pass = 0, total = 0, i, error; uint8_t bands; ifp = if_alloc(IFT_IEEE80211); @@ -442,8 +442,11 @@ for (i = 0; i < N(tkiptests); i++) if (tests & (1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90969106566C; Fri, 29 Aug 2008 00:47: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 3C4EF1065676 for ; Fri, 29 Aug 2008 00:47:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22A748FC16 for ; Fri, 29 Aug 2008 00:47:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T0lxPR020844 for ; Fri, 29 Aug 2008 00:47:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T0lwG2020842 for perforce@freebsd.org; Fri, 29 Aug 2008 00:47:58 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 00:47:58 GMT Message-Id: <200808290047.m7T0lwG2020842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148762 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, 29 Aug 2008 00:47:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=148762 Change 148762 by sam@sam_ebb on 2008/08/29 00:47:10 update Affected files ... .. //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#3 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2008 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,8 +54,11 @@ #include #include +#include +#include #include +#include /* ==== CCMP test mpdu 1 ==== @@ -590,13 +593,65 @@ ); } +static struct mbuf * +formpacket(const struct ieee80211_cipher *cip, const void *plaintext, + int len, int remainder) +{ + struct mbuf *m, *n; + const uint8_t *p = plaintext; + + printf("(packet %d+%d) ", len-remainder, remainder); + + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + KASSERT(m != NULL, ("cannot allocate mbuf!")); + + m->m_data += cip->ic_header; + m_append(m, len-remainder, p); + + if (remainder) { + n = m_get(M_NOWAIT, MT_DATA); + KASSERT(n != NULL, ("cannot split mbuf chain!")); + m_append(m, remainder, p + (len-remainder)); + m->m_next = n; + } + + return m; +} + static int -runtest(struct ieee80211com *ic, struct ciphertest *t) +verifypacket(const struct mbuf *m, const void *data, int len, const char *what) +{ + void *buf; + int ok; + + if (m->m_pkthdr.len != len) { + printf("FAIL: %s botch; length mismatch\n", what); + cmpfail(mtod(m, const void *), m->m_pkthdr.len, data, len); + return 0; + } + + buf = malloc(m->m_pkthdr.len, M_TEMP, M_NOWAIT); + if (buf == NULL) { + printf("ERROR: cannot allocate temp buffer for packet check\n"); + return 0; + } + m_copydata(m, 0, m->m_pkthdr.len, buf); + ok = (memcmp(buf, data, len) == 0); + free(buf, M_TEMP); + if (!ok) { + printf("FAIL: %s does not compare\n", what); + cmpfail(buf, m->m_pkthdr.len, data, len); + } + return ok; +} + +static int +runtest(struct ieee80211vap *vap, struct ciphertest *t, int remainder) { struct ieee80211_key key; struct mbuf *m = NULL; const struct ieee80211_cipher *cip; - u_int8_t mac[IEEE80211_ADDR_LEN]; + int hdrlen, result = 0; printf("%s: ", t->name); @@ -606,7 +661,7 @@ memset(&key, 0, sizeof(key)); key.wk_flags = IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV; key.wk_cipher = &ieee80211_cipher_none; - if (!ieee80211_crypto_newkey(ic, t->cipher, + if (!ieee80211_crypto_newkey(vap, t->cipher, IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV, &key)) { printf("FAIL: ieee80211_crypto_newkey failed\n"); goto bad; @@ -614,9 +669,8 @@ memcpy(key.wk_key, t->key, t->key_len); key.wk_keylen = t->key_len; - key.wk_keyrsc = 0; key.wk_keytsc = t->pn-1; /* PN-1 since we do encap */ - if (!ieee80211_crypto_setkey(ic, &key, mac)) { + if (!ieee80211_crypto_setkey(vap, &key)) { printf("FAIL: ieee80211_crypto_setkey failed\n"); goto bad; } @@ -625,11 +679,8 @@ * Craft frame from plaintext data. */ cip = key.wk_cipher; - m = m_getcl(M_NOWAIT, MT_HEADER, M_PKTHDR); - m->m_data += cip->ic_header; - memcpy(mtod(m, void *), t->plaintext, t->plaintext_len); - m->m_len = t->plaintext_len; - m->m_pkthdr.len = m->m_len; + m = formpacket(cip, t->plaintext, t->plaintext_len, remainder); + hdrlen = ieee80211_anyhdrsize(t->plaintext); /* * Encrypt frame w/ MIC. @@ -642,17 +693,7 @@ /* * Verify: frame length, frame contents. */ - if (m->m_pkthdr.len != t->encrypted_len) { - printf("FAIL: encap data length mismatch\n"); - printtest(t); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->encrypted, t->encrypted_len); - goto bad; - } else if (memcmp(mtod(m, const void *), t->encrypted, t->encrypted_len)) { - printf("FAIL: encrypt data does not compare\n"); - printtest(t); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->encrypted, t->encrypted_len); + if (!verifypacket(m, t->encrypted, t->encrypted_len, "encrypt data")) { dumpdata("Plaintext", t->plaintext, t->plaintext_len); goto bad; } @@ -660,7 +701,7 @@ /* * Decrypt frame; strip MIC. */ - if (!cip->ic_decap(&key, m)) { + if (!cip->ic_decap(&key, m, hdrlen)) { printf("FAIL: ccmp decap failed\n"); printtest(t); cmpfail(mtod(m, const void *), m->m_len, @@ -670,28 +711,15 @@ /* * Verify: frame length, frame contents. */ - if (m->m_pkthdr.len != t->plaintext_len) { - printf("FAIL: decap botch; length mismatch\n"); - printtest(t); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->plaintext, t->plaintext_len); - goto bad; - } else if (memcmp(mtod(m, const void *), t->plaintext, t->plaintext_len)) { - printf("FAIL: decap botch; data does not compare\n"); - printtest(t); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->plaintext, sizeof(t->plaintext)); + if (!verifypacket(m, t->plaintext, t->plaintext_len, "decap")) goto bad; - } - m_freem(m); - ieee80211_crypto_delkey(ic, &key); printf("PASS\n"); - return 1; + result = 1; bad: if (m != NULL) m_freem(m); - ieee80211_crypto_delkey(ic, &key); - return 0; + ieee80211_crypto_delkey(vap, &key); + return result; } /* @@ -701,28 +729,97 @@ static int tests = -1; static int debug = 0; +static struct ieee80211vap * +fake_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, + int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) +{ + struct ieee80211vap *vap; + + vap = malloc(sizeof(*vap), M_80211_VAP, M_WAITOK | M_ZERO); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); + ieee80211_vap_attach(vap, + ieee80211_media_change, ieee80211_media_status); + return vap; +} + +static void +fake_vap_delete(struct ieee80211vap *vap) +{ + ieee80211_vap_detach(vap); + free(vap, M_80211_VAP); +} + static int init_crypto_ccmp_test(void) { #define N(a) (sizeof(a)/sizeof(a[0])) - struct ieee80211com ic; - int i, pass, total; + struct ifnet *ifp, *vifp; + struct ieee80211com *ic; + struct ieee80211_clone_params icp; + char ifname[IFNAMSIZ]; + struct ieee80211vap *vap; + int pass = 0, total = 0, i, error; + uint8_t bands; + + ifp = if_alloc(IFT_IEEE80211); + if (ifp == NULL) { + printf("%s: unable to allocate ifnet!\n", __func__); + return -1; + } + if_initname(ifp, "fake", 0); + ifp->if_snd.ifq_maxlen = ifqmaxlen; + + ic = ifp->if_l2com; + ic->ic_caps = IEEE80211_C_STA; + ic->ic_opmode = IEEE80211_M_STA; + ic->ic_vap_create = fake_vap_create; + ic->ic_vap_delete = fake_vap_delete; + bands = 0; + setbit(&bands, IEEE80211_MODE_11B); + ieee80211_init_channels(ic, NULL, &bands); + ieee80211_ifattach(ic); + + memset(&icp, 0, sizeof(icp)); + strlcpy(icp.icp_parent, ifp->if_xname, sizeof(icp.icp_parent)); + icp.icp_opmode = IEEE80211_M_STA; - memset(&ic, 0, sizeof(ic)); + strlcpy(ifname, "wlan", sizeof(ifname)); + error = if_clone_create_sys(ifname, sizeof(ifname), (caddr_t) &icp); + if (error != 0) { + printf("%s: unable to clone vap (error %d)!\n", + __func__, error); + pass = -1; + goto bad; + } + vifp = ifunit(ifname); + if (vifp == NULL) { + printf("%s: unable to locate vap %s!\n", __func__, ifname); + pass = -1; + goto bad; + } + vap = vifp->if_softc; if (debug) - ic.ic_debug = IEEE80211_MSG_CRYPTO; - ieee80211_crypto_attach(&ic); + vap->iv_debug = IEEE80211_MSG_CRYPTO; pass = 0; total = 0; for (i = 0; i < N(ccmptests); i++) if (tests & (1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E62E1065676; Fri, 29 Aug 2008 03:02:26 +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 0A8BE1065678 for ; Fri, 29 Aug 2008 03:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E768E8FC17 for ; Fri, 29 Aug 2008 03:02:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T32Pj3033796 for ; Fri, 29 Aug 2008 03:02:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T32P13033794 for perforce@freebsd.org; Fri, 29 Aug 2008 03:02:25 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 03:02:25 GMT Message-Id: <200808290302.m7T32P13033794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148767 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, 29 Aug 2008 03:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=148767 Change 148767 by sam@sam_ebb on 2008/08/29 03:01:36 update Affected files ... .. //depot/projects/vap/tools/regression/net80211/wep/test_wep.c#3 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/wep/test_wep.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2008 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,8 +54,11 @@ #include #include +#include +#include #include +#include /* MPDU data @@ -177,18 +180,72 @@ dumpdata("Reference", ref, reflen); } +static struct mbuf * +formpacket(const struct ieee80211_cipher *cip, const void *plaintext, + int len, int remainder) +{ + struct mbuf *m, *n; + const uint8_t *p = plaintext; + + printf("(packet %d+%d) ", len-remainder, remainder); + + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + KASSERT(m != NULL, ("cannot allocate mbuf!")); + + m->m_data += cip->ic_header; + m_append(m, len-remainder, p); + + if (remainder) { + n = m_get(M_NOWAIT, MT_DATA); + KASSERT(n != NULL, ("cannot split mbuf chain!")); + m_append(n, remainder, p + (len-remainder)); + m->m_next = n; + m->m_pkthdr.len += remainder; + } + + return m; +} + +static int +verifypacket(const struct mbuf *m, const void *data, int len, const char *what) +{ + void *buf; + int ok; + + if (m->m_pkthdr.len != len) { + printf("FAIL: %s botch; length mismatch\n", what); + cmpfail(mtod(m, const void *), m->m_pkthdr.len, data, len); + return 0; + } + + buf = malloc(m->m_pkthdr.len, M_TEMP, M_NOWAIT); + if (buf == NULL) { + printf("ERROR: cannot allocate temp buffer for packet check\n"); + return 0; + } + m_copydata(m, 0, m->m_pkthdr.len, buf); + ok = (memcmp(buf, data, len) == 0); + free(buf, M_TEMP); + if (!ok) { + printf("FAIL: %s does not compare\n", what); + cmpfail(buf, m->m_pkthdr.len, data, len); + } + return ok; +} + struct wep_ctx_hw { /* for use with h/w support */ - struct ieee80211com *wc_ic; /* for diagnostics */ + struct ieee80211vap *wc_vap; /* for diagnostics+statistics */ + struct ieee80211com *wc_ic; u_int32_t wc_iv; /* initial vector for crypto */ }; static int -runtest(struct ieee80211com *ic, struct ciphertest *t) +runtest(struct ieee80211vap *vap, struct ciphertest *t, int remainder) { struct ieee80211_key key; struct mbuf *m = NULL; const struct ieee80211_cipher *cip; - u_int8_t mac[IEEE80211_ADDR_LEN]; + int hdrlen, result = 0; struct wep_ctx_hw *ctx; printf("%s: ", t->name); @@ -199,7 +256,7 @@ memset(&key, 0, sizeof(key)); key.wk_flags = IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV; key.wk_cipher = &ieee80211_cipher_none; - if (!ieee80211_crypto_newkey(ic, t->cipher, + if (!ieee80211_crypto_newkey(vap, t->cipher, IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV, &key)) { printf("FAIL: ieee80211_crypto_newkey failed\n"); goto bad; @@ -207,25 +264,23 @@ memcpy(key.wk_key, t->key, t->key_len); key.wk_keylen = t->key_len; - if (!ieee80211_crypto_setkey(ic, &key, mac)) { + if (!ieee80211_crypto_setkey(vap, &key)) { printf("FAIL: ieee80211_crypto_setkey failed\n"); goto bad; } cip = key.wk_cipher; /* - * Craft frame from plaintext data. + * Craft frame from encrypted data. */ cip = key.wk_cipher; - m = m_getcl(M_NOWAIT, MT_HEADER, M_PKTHDR); - memcpy(mtod(m, void *), t->encrypted, t->encrypted_len); - m->m_len = t->encrypted_len; - m->m_pkthdr.len = m->m_len; + m = formpacket(cip, t->encrypted, t->encrypted_len, remainder); + hdrlen = ieee80211_anyhdrsize(t->encrypted); /* * Decrypt frame. */ - if (!cip->ic_decap(&key, m)) { + if (!cip->ic_decap(&key, m, hdrlen)) { printf("FAIL: wep decap failed\n"); cmpfail(mtod(m, const void *), m->m_pkthdr.len, t->plaintext, t->plaintext_len); @@ -234,17 +289,8 @@ /* * Verify: frame length, frame contents. */ - if (m->m_pkthdr.len != t->plaintext_len) { - printf("FAIL: decap botch; length mismatch\n"); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->plaintext, t->plaintext_len); + if (!verifypacket(m, t->plaintext, t->plaintext_len, "decap")) goto bad; - } else if (memcmp(mtod(m, const void *), t->plaintext, t->plaintext_len)) { - printf("FAIL: decap botch; data does not compare\n"); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->plaintext, sizeof(t->plaintext)); - goto bad; - } /* * Encrypt frame. @@ -258,27 +304,17 @@ /* * Verify: frame length, frame contents. */ - if (m->m_pkthdr.len != t->encrypted_len) { - printf("FAIL: encap data length mismatch\n"); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->encrypted, t->encrypted_len); - goto bad; - } else if (memcmp(mtod(m, const void *), t->encrypted, m->m_pkthdr.len)) { - printf("FAIL: encrypt data does not compare\n"); - cmpfail(mtod(m, const void *), m->m_pkthdr.len, - t->encrypted, t->encrypted_len); + if (!verifypacket(m, t->encrypted, t->encrypted_len, "encrypt data")) { dumpdata("Plaintext", t->plaintext, t->plaintext_len); goto bad; } - m_freem(m); - ieee80211_crypto_delkey(ic, &key); printf("PASS\n"); - return 1; + result = 1; bad: if (m != NULL) m_freem(m); - ieee80211_crypto_delkey(ic, &key); - return 0; + ieee80211_crypto_delkey(vap, &key); + return result; } /* @@ -288,27 +324,98 @@ static int tests = -1; static int debug = 0; +static struct ieee80211vap * +fake_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, + int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) +{ + struct ieee80211vap *vap; + + vap = malloc(sizeof(*vap), M_80211_VAP, M_WAITOK | M_ZERO); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); + ieee80211_vap_attach(vap, + ieee80211_media_change, ieee80211_media_status); + return vap; +} + +static void +fake_vap_delete(struct ieee80211vap *vap) +{ + ieee80211_vap_detach(vap); + free(vap, M_80211_VAP); +} + static int init_crypto_wep_test(void) { #define N(a) (sizeof(a)/sizeof(a[0])) - struct ieee80211com ic; - int i, pass, total; + struct ifnet *ifp, *vifp; + struct ieee80211com *ic; + struct ieee80211_clone_params icp; + char ifname[IFNAMSIZ]; + struct ieee80211vap *vap; + int pass = 0, total = 0, i, error; + uint8_t bands; + + ifp = if_alloc(IFT_IEEE80211); + if (ifp == NULL) { + printf("%s: unable to allocate ifnet!\n", __func__); + return -1; + } + if_initname(ifp, "fake", 0); + ifp->if_snd.ifq_maxlen = ifqmaxlen; + + ic = ifp->if_l2com; + ic->ic_caps = IEEE80211_C_STA; + ic->ic_opmode = IEEE80211_M_STA; + ic->ic_vap_create = fake_vap_create; + ic->ic_vap_delete = fake_vap_delete; + bands = 0; + setbit(&bands, IEEE80211_MODE_11B); + ieee80211_init_channels(ic, NULL, &bands); + ieee80211_ifattach(ic); + + memset(&icp, 0, sizeof(icp)); + strlcpy(icp.icp_parent, ifp->if_xname, sizeof(icp.icp_parent)); + icp.icp_opmode = IEEE80211_M_STA; - memset(&ic, 0, sizeof(ic)); + strlcpy(ifname, "wlan", sizeof(ifname)); + error = if_clone_create_sys(ifname, sizeof(ifname), (caddr_t) &icp); + if (error != 0) { + printf("%s: unable to clone vap (error %d)!\n", + __func__, error); + pass = -1; + goto bad; + } + vifp = ifunit(ifname); + if (vifp == NULL) { + printf("%s: unable to locate vap %s!\n", __func__, ifname); + pass = -1; + goto bad; + } + vap = vifp->if_softc; if (debug) - ic.ic_debug = IEEE80211_MSG_CRYPTO; - ieee80211_crypto_attach(&ic); + vap->iv_debug = IEEE80211_MSG_CRYPTO; + pass = 0; total = 0; for (i = 0; i < N(weptests); i++) if (tests & (1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8F410656E0; Fri, 29 Aug 2008 03:02:26 +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 3B3D2106566B for ; Fri, 29 Aug 2008 03:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C0378FC18 for ; Fri, 29 Aug 2008 03:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T32PGB033801 for ; Fri, 29 Aug 2008 03:02:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T32PPY033799 for perforce@freebsd.org; Fri, 29 Aug 2008 03:02:25 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 03:02:25 GMT Message-Id: <200808290302.m7T32PPY033799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148768 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, 29 Aug 2008 03:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=148768 Change 148768 by sam@sam_ebb on 2008/08/29 03:01:50 fix packet setup Affected files ... .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#8 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#8 (text+ko) ==== @@ -199,8 +199,9 @@ if (remainder) { n = m_get(M_NOWAIT, MT_DATA); KASSERT(n != NULL, ("cannot split mbuf chain!")); - m_append(m, remainder, p + (len-remainder)); + m_append(n, remainder, p + (len-remainder)); m->m_next = n; + m->m_pkthdr.len += remainder; } return m; From owner-p4-projects@FreeBSD.ORG Fri Aug 29 03:02:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DE28106573A; Fri, 29 Aug 2008 03:02:26 +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 5B400106566C for ; Fri, 29 Aug 2008 03:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CF098FC19 for ; Fri, 29 Aug 2008 03:02:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T32QSj033806 for ; Fri, 29 Aug 2008 03:02:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T32Ql5033804 for perforce@freebsd.org; Fri, 29 Aug 2008 03:02:26 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 03:02:26 GMT Message-Id: <200808290302.m7T32Ql5033804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148769 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, 29 Aug 2008 03:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=148769 Change 148769 by sam@sam_ebb on 2008/08/29 03:02:06 fix packet setup Affected files ... .. //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#4 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#4 (text+ko) ==== @@ -611,8 +611,9 @@ if (remainder) { n = m_get(M_NOWAIT, MT_DATA); KASSERT(n != NULL, ("cannot split mbuf chain!")); - m_append(m, remainder, p + (len-remainder)); + m_append(n, remainder, p + (len-remainder)); m->m_next = n; + m->m_pkthdr.len += remainder; } return m; From owner-p4-projects@FreeBSD.ORG Fri Aug 29 03:03:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8F901065674; Fri, 29 Aug 2008 03:03: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 6C0021065671 for ; Fri, 29 Aug 2008 03:03:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 566428FC08 for ; Fri, 29 Aug 2008 03:03:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T33RBx034996 for ; Fri, 29 Aug 2008 03:03:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T33RJ4034994 for perforce@freebsd.org; Fri, 29 Aug 2008 03:03:27 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 03:03:27 GMT Message-Id: <200808290303.m7T33RJ4034994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148770 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, 29 Aug 2008 03:03:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=148770 Change 148770 by sam@sam_ebb on 2008/08/29 03:03:00 change copyright to bsd only; should've happened long ago Affected files ... .. //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#5 edit .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#9 edit .. //depot/projects/vap/tools/regression/net80211/wep/test_wep.c#4 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#5 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#9 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ==== //depot/projects/vap/tools/regression/net80211/wep/test_wep.c#4 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES From owner-p4-projects@FreeBSD.ORG Fri Aug 29 03:19:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A1081065678; Fri, 29 Aug 2008 03:19: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 F0C301065671 for ; Fri, 29 Aug 2008 03:19:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC4638FC1E for ; Fri, 29 Aug 2008 03:19:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T3JhpE036417 for ; Fri, 29 Aug 2008 03:19:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T3JhDS036415 for perforce@freebsd.org; Fri, 29 Aug 2008 03:19:43 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 03:19:43 GMT Message-Id: <200808290319.m7T3JhDS036415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148771 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, 29 Aug 2008 03:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=148771 Change 148771 by sam@sam_ebb on 2008/08/29 03:19:22 use bootverbose to turn on debugging Affected files ... .. //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#6 edit .. //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#10 edit .. //depot/projects/vap/tools/regression/net80211/wep/test_wep.c#5 edit Differences ... ==== //depot/projects/vap/tools/regression/net80211/ccmp/test_ccmp.c#6 (text+ko) ==== @@ -722,7 +722,6 @@ */ static int tests = -1; -static int debug = 0; static struct ieee80211vap * fake_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, @@ -795,7 +794,7 @@ goto bad; } vap = vifp->if_softc; - if (debug) + if (bootverbose) vap->iv_debug = IEEE80211_MSG_CRYPTO; pass = 0; ==== //depot/projects/vap/tools/regression/net80211/tkip/test_tkip.c#10 (text+ko) ==== @@ -355,7 +355,6 @@ * Module glue. */ -static int debug = 0; static int tests = -1; static struct ieee80211vap * @@ -429,7 +428,7 @@ goto bad; } vap = vifp->if_softc; - if (debug) + if (bootverbose) vap->iv_debug = IEEE80211_MSG_CRYPTO; pass = 0; ==== //depot/projects/vap/tools/regression/net80211/wep/test_wep.c#5 (text+ko) ==== @@ -316,7 +316,6 @@ */ static int tests = -1; -static int debug = 0; static struct ieee80211vap * fake_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, @@ -389,7 +388,7 @@ goto bad; } vap = vifp->if_softc; - if (debug) + if (bootverbose) vap->iv_debug = IEEE80211_MSG_CRYPTO; pass = 0; From owner-p4-projects@FreeBSD.ORG Fri Aug 29 04:52:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D8BD1065672; Fri, 29 Aug 2008 04:52:18 +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 20DD4106566C for ; Fri, 29 Aug 2008 04:52:18 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E90C38FC0A for ; Fri, 29 Aug 2008 04:52:17 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T4qHbJ054675 for ; Fri, 29 Aug 2008 04:52:17 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T4qHto054673 for perforce@freebsd.org; Fri, 29 Aug 2008 04:52:17 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 29 Aug 2008 04:52:17 GMT Message-Id: <200808290452.m7T4qHto054673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148775 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, 29 Aug 2008 04:52:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=148775 Change 148775 by ed@ed_dull on 2008/08/29 04:51:45 Small typo in snp -- not really incorrect, but sloppy. Don't use a while-loop to check the value of uio->uio_resid. Reported by: Sam Banks Affected files ... .. //depot/projects/mpsafetty/sys/dev/snp/snp.c#13 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/snp/snp.c#13 (text+ko) ==== @@ -141,7 +141,7 @@ struct snp_softc *ss; struct tty *tp; - while (uio->uio_resid == 0) + if (uio->uio_resid == 0) return (0); error = devfs_get_cdevpriv((void **)&ss); From owner-p4-projects@FreeBSD.ORG Fri Aug 29 05:08:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA3DD106567F; Fri, 29 Aug 2008 05:08: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 7D653106566B for ; Fri, 29 Aug 2008 05:08:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A48D8FC13 for ; Fri, 29 Aug 2008 05:08:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T58YN7057058 for ; Fri, 29 Aug 2008 05:08:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T58YqC057056 for perforce@freebsd.org; Fri, 29 Aug 2008 05:08:34 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Aug 2008 05:08:34 GMT Message-Id: <200808290508.m7T58YqC057056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148776 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, 29 Aug 2008 05:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=148776 Change 148776 by sam@sam_ebb on 2008/08/29 05:07:33 experimental mods to allow ifnet clone operations in-kernel; ugly and likely not going to make the tree but keep for now so I can do more work on the 802.11 crypto regression modules Affected files ... .. //depot/projects/vap/sys/net/if_bridge.c#7 edit .. //depot/projects/vap/sys/net/if_clone.c#7 edit .. //depot/projects/vap/sys/net/if_clone.h#6 edit .. //depot/projects/vap/sys/net/if_disc.c#7 edit .. //depot/projects/vap/sys/net/if_edsc.c#3 edit .. //depot/projects/vap/sys/net/if_enc.c#6 edit .. //depot/projects/vap/sys/net/if_faith.c#8 edit .. //depot/projects/vap/sys/net/if_gif.c#9 edit .. //depot/projects/vap/sys/net/if_gre.c#11 edit .. //depot/projects/vap/sys/net/if_lagg.c#6 edit .. //depot/projects/vap/sys/net/if_loop.c#13 edit .. //depot/projects/vap/sys/net/if_ppp.c#7 edit .. //depot/projects/vap/sys/net/if_stf.c#9 edit .. //depot/projects/vap/sys/net/if_tap.c#8 edit .. //depot/projects/vap/sys/net/if_tun.c#7 edit .. //depot/projects/vap/sys/net/if_vlan.c#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#33 edit Differences ... ==== //depot/projects/vap/sys/net/if_bridge.c#7 (text+ko) ==== @@ -100,6 +100,7 @@ #include #include #include +#include #include #include @@ -227,7 +228,7 @@ uma_zone_t bridge_rtnode_zone; -static int bridge_clone_create(struct if_clone *, int, caddr_t); +static int bridge_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void bridge_clone_destroy(struct ifnet *); static int bridge_ioctl(struct ifnet *, u_long, caddr_t); @@ -546,7 +547,7 @@ * Create a new bridge instance. */ static int -bridge_clone_create(struct if_clone *ifc, int unit, caddr_t params) +bridge_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct bridge_softc *sc, *sc2; struct ifnet *bifp, *ifp; ==== //depot/projects/vap/sys/net/if_clone.c#7 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,7 @@ static void if_clone_free(struct if_clone *ifc); static int if_clone_createif(struct if_clone *ifc, char *name, size_t len, - caddr_t params); + enum uio_seg as, caddr_t params); static int if_clone_destroyif(struct if_clone *ifc, struct ifnet *ifp); static struct mtx if_cloners_mtx; @@ -117,11 +118,8 @@ IF_CLONERS_LOCK_INIT(); } -/* - * Lookup and create a clone network interface. - */ -int -if_clone_create(char *name, size_t len, caddr_t params) +static int +_if_clone_create(char *name, size_t len, enum uio_seg as, caddr_t params) { struct if_clone *ifc; @@ -137,14 +135,35 @@ if (ifc == NULL) return (EINVAL); - return (if_clone_createif(ifc, name, len, params)); + return (if_clone_createif(ifc, name, len, as, params)); +} + +/* + * Lookup and create a clone network interface; + * parameters come from user space. + */ +int +if_clone_create(char *name, size_t len, caddr_t params) +{ + return _if_clone_create(name, len, UIO_USERSPACE, params); +} + +/* + * Lookup and create a clone network interface; + * parameters come from kernel/system space. + */ +int +if_clone_create_sys(char *name, size_t len, void *params) +{ + return _if_clone_create(name, len, UIO_SYSSPACE, params); } /* * Create a clone network interface. */ static int -if_clone_createif(struct if_clone *ifc, char *name, size_t len, caddr_t params) +if_clone_createif(struct if_clone *ifc, char *name, size_t len, + enum uio_seg as, caddr_t params) { int err; struct ifnet *ifp; @@ -152,7 +171,7 @@ if (ifunit(name) != NULL) return (EEXIST); - err = (*ifc->ifc_create)(ifc, name, len, params); + err = (*ifc->ifc_create)(ifc, name, len, as, params); if (!err) { ifp = ifunit(name); @@ -475,7 +494,8 @@ for (unit = 0; unit < ifcs->ifcs_minifs; unit++) { snprintf(name, IFNAMSIZ, "%s%d", ifc->ifc_name, unit); - err = if_clone_createif(ifc, name, IFNAMSIZ, NULL); + err = if_clone_createif(ifc, name, IFNAMSIZ, + UIO_USERSPACE, NULL); KASSERT(err == 0, ("%s: failed to create required interface %s", __func__, name)); @@ -504,7 +524,8 @@ } int -ifc_simple_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) +ifc_simple_create(struct if_clone *ifc, char *name, size_t len, + enum uio_seg as, caddr_t params) { char *dp; int wildcard; @@ -522,7 +543,7 @@ if (err != 0) return (err); - err = ifcs->ifcs_create(ifc, unit, params); + err = ifcs->ifcs_create(ifc, unit, as, params); if (err != 0) { ifc_free_unit(ifc, unit); return (err); ==== //depot/projects/vap/sys/net/if_clone.h#6 (text+ko) ==== @@ -35,6 +35,8 @@ #ifdef _KERNEL +enum uio_seg; + #define IFC_CLONE_INITIALIZER(name, data, maxunit, \ attach, match, create, destroy) \ { { 0 }, name, maxunit, NULL, 0, data, attach, match, create, destroy } @@ -61,7 +63,8 @@ /* (c) Driver specific cloning functions. Called with no locks held. */ void (*ifc_attach)(struct if_clone *); int (*ifc_match)(struct if_clone *, const char *); - int (*ifc_create)(struct if_clone *, char *, size_t, caddr_t); + int (*ifc_create)(struct if_clone *, char *, size_t, + enum uio_seg, caddr_t); int (*ifc_destroy)(struct if_clone *, struct ifnet *); long ifc_refcnt; /* (i) Refrence count. */ @@ -74,6 +77,7 @@ void if_clone_detach(struct if_clone *); int if_clone_create(char *, size_t, caddr_t); +int if_clone_create_sys(char *, size_t, void *); int if_clone_destroy(const char *); int if_clone_list(struct if_clonereq *); @@ -89,7 +93,8 @@ struct ifc_simple_data { int ifcs_minifs; /* minimum number of interfaces */ - int (*ifcs_create)(struct if_clone *, int, caddr_t); + int (*ifcs_create)(struct if_clone *, int, + enum uio_seg, caddr_t); void (*ifcs_destroy)(struct ifnet *); }; @@ -106,7 +111,8 @@ void ifc_simple_attach(struct if_clone *); int ifc_simple_match(struct if_clone *, const char *); -int ifc_simple_create(struct if_clone *, char *, size_t, caddr_t); +int ifc_simple_create(struct if_clone *, char *, size_t, + enum uio_seg, caddr_t); int ifc_simple_destroy(struct if_clone *, struct ifnet *); #endif /* _KERNEL */ ==== //depot/projects/vap/sys/net/if_disc.c#7 (text+ko) ==== @@ -69,7 +69,7 @@ struct sockaddr *, struct rtentry *); static void discrtrequest(int, struct rtentry *, struct rt_addrinfo *); static int discioctl(struct ifnet *, u_long, caddr_t); -static int disc_clone_create(struct if_clone *, int, caddr_t); +static int disc_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void disc_clone_destroy(struct ifnet *); static MALLOC_DEFINE(M_DISC, DISCNAME, "Discard interface"); @@ -77,7 +77,7 @@ IFC_SIMPLE_DECLARE(disc, 0); static int -disc_clone_create(struct if_clone *ifc, int unit, caddr_t params) +disc_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct ifnet *ifp; struct disc_softc *sc; ==== //depot/projects/vap/sys/net/if_edsc.c#3 (text+ko) ==== @@ -67,7 +67,7 @@ * Simple cloning methods. * IFC_SIMPLE_DECLARE() expects precisely these names. */ -static int edsc_clone_create(struct if_clone *, int, caddr_t); +static int edsc_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void edsc_clone_destroy(struct ifnet *); /* @@ -95,7 +95,7 @@ * Create an interface instance. */ static int -edsc_clone_create(struct if_clone *ifc, int unit, caddr_t params) +edsc_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct edsc_softc *sc; struct ifnet *ifp; ==== //depot/projects/vap/sys/net/if_enc.c#6 (text+ko) ==== @@ -86,7 +86,7 @@ static int enc_ioctl(struct ifnet *, u_long, caddr_t); static int enc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt); -static int enc_clone_create(struct if_clone *, int, caddr_t); +static int enc_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void enc_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(enc, 1); @@ -128,7 +128,7 @@ } static int -enc_clone_create(struct if_clone *ifc, int unit, caddr_t params) +enc_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct ifnet *ifp; struct enc_softc *sc; ==== //depot/projects/vap/sys/net/if_faith.c#8 (text+ko) ==== @@ -97,7 +97,7 @@ static MALLOC_DEFINE(M_FAITH, FAITHNAME, "Firewall Assisted Tunnel Interface"); -static int faith_clone_create(struct if_clone *, int, caddr_t); +static int faith_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void faith_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(faith, 0); @@ -143,9 +143,10 @@ MODULE_VERSION(if_faith, 1); static int -faith_clone_create(ifc, unit, params) +faith_clone_create(ifc, unit, as, params) struct if_clone *ifc; int unit; + enum uio_seg as; caddr_t params; { struct ifnet *ifp; ==== //depot/projects/vap/sys/net/if_gif.c#9 (text+ko) ==== @@ -102,7 +102,7 @@ void (*ng_gif_detach_p)(struct ifnet *ifp); static void gif_start(struct ifnet *); -static int gif_clone_create(struct if_clone *, int, caddr_t); +static int gif_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void gif_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(gif, 0); @@ -149,9 +149,10 @@ #endif static int -gif_clone_create(ifc, unit, params) +gif_clone_create(ifc, unit, as, params) struct if_clone *ifc; int unit; + enum uio_seg as; caddr_t params; { struct gif_softc *sc; ==== //depot/projects/vap/sys/net/if_gre.c#11 (text+ko) ==== @@ -105,7 +105,7 @@ struct gre_softc_head gre_softc_list; -static int gre_clone_create(struct if_clone *, int, caddr_t); +static int gre_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void gre_clone_destroy(struct ifnet *); static int gre_ioctl(struct ifnet *, u_long, caddr_t); static int gre_output(struct ifnet *, struct mbuf *, struct sockaddr *, @@ -172,9 +172,10 @@ } static int -gre_clone_create(ifc, unit, params) +gre_clone_create(ifc, unit, as, params) struct if_clone *ifc; int unit; + enum uio_seg as; caddr_t params; { struct gre_softc *sc; ==== //depot/projects/vap/sys/net/if_lagg.c#6 (text+ko) ==== @@ -80,7 +80,7 @@ static struct mtx lagg_list_mtx; eventhandler_tag lagg_detach_cookie = NULL; -static int lagg_clone_create(struct if_clone *, int, caddr_t); +static int lagg_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void lagg_clone_destroy(struct ifnet *); static void lagg_lladdr(struct lagg_softc *, uint8_t *); static void lagg_capabilities(struct lagg_softc *); @@ -197,7 +197,7 @@ DECLARE_MODULE(if_lagg, lagg_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); static int -lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params) +lagg_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct lagg_softc *sc; struct ifnet *ifp; ==== //depot/projects/vap/sys/net/if_loop.c#13 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -93,7 +94,7 @@ static void lortrequest(int, struct rtentry *, struct rt_addrinfo *); int looutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt); -static int lo_clone_create(struct if_clone *, int, caddr_t); +static int lo_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void lo_clone_destroy(struct ifnet *); struct ifnet *loif = NULL; /* Used externally */ @@ -113,7 +114,7 @@ } static int -lo_clone_create(struct if_clone *ifc, int unit, caddr_t params) +lo_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct ifnet *ifp; ==== //depot/projects/vap/sys/net/if_ppp.c#7 (text+ko) ==== @@ -160,7 +160,7 @@ static void ppp_ccp_closed(struct ppp_softc *); static void ppp_inproc(struct ppp_softc *, struct mbuf *); static void pppdumpm(struct mbuf *m0); -static int ppp_clone_create(struct if_clone *, int, caddr_t); +static int ppp_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void ppp_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(ppp, 0); @@ -208,7 +208,7 @@ #endif /* PPP_COMPRESS */ static int -ppp_clone_create(struct if_clone *ifc, int unit, caddr_t params) +ppp_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct ifnet *ifp; struct ppp_softc *sc; ==== //depot/projects/vap/sys/net/if_stf.c#9 (text+ko) ==== @@ -179,7 +179,7 @@ static int stf_ioctl(struct ifnet *, u_long, caddr_t); static int stf_clone_match(struct if_clone *, const char *); -static int stf_clone_create(struct if_clone *, char *, size_t, caddr_t); +static int stf_clone_create(struct if_clone *, char *, size_t, enum uio_seg, caddr_t); static int stf_clone_destroy(struct if_clone *, struct ifnet *); struct if_clone stf_cloner = IFC_CLONE_INITIALIZER(STFNAME, NULL, 0, NULL, stf_clone_match, stf_clone_create, stf_clone_destroy); @@ -198,7 +198,7 @@ } static int -stf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) +stf_clone_create(struct if_clone *ifc, char *name, size_t len, enum uio_seg as, caddr_t params) { int err, unit; struct stf_softc *sc; ==== //depot/projects/vap/sys/net/if_tap.c#8 (text+ko) ==== @@ -94,9 +94,9 @@ static int tapifioctl(struct ifnet *, u_long, caddr_t); static void tapifinit(void *); -static int tap_clone_create(struct if_clone *, int, caddr_t); +static int tap_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void tap_clone_destroy(struct ifnet *); -static int vmnet_clone_create(struct if_clone *, int, caddr_t); +static int vmnet_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void vmnet_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(tap, 0); @@ -176,7 +176,7 @@ DEV_MODULE(if_tap, tapmodevent, NULL); static int -tap_clone_create(struct if_clone *ifc, int unit, caddr_t params) +tap_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct cdev *dev; int i; @@ -204,9 +204,9 @@ /* vmnet devices are tap devices in disguise */ static int -vmnet_clone_create(struct if_clone *ifc, int unit, caddr_t params) +vmnet_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { - return tap_clone_create(ifc, unit, params); + return tap_clone_create(ifc, unit, as, params); } static void ==== //depot/projects/vap/sys/net/if_tun.c#7 (text+ko) ==== @@ -129,7 +129,7 @@ struct rtentry *rt); static void tunstart(struct ifnet *); -static int tun_clone_create(struct if_clone *, int, caddr_t); +static int tun_clone_create(struct if_clone *, int, enum uio_seg, caddr_t); static void tun_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(tun, 0); @@ -174,7 +174,7 @@ }; static int -tun_clone_create(struct if_clone *ifc, int unit, caddr_t params) +tun_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { struct cdev *dev; int i; ==== //depot/projects/vap/sys/net/if_vlan.c#9 (text+ko) ==== @@ -195,7 +195,7 @@ static struct ifnet *vlan_clone_match_ethertag(struct if_clone *, const char *, int *); static int vlan_clone_match(struct if_clone *, const char *); -static int vlan_clone_create(struct if_clone *, char *, size_t, caddr_t); +static int vlan_clone_create(struct if_clone *, char *, size_t, enum uio_seg, caddr_t); static int vlan_clone_destroy(struct if_clone *, struct ifnet *); static void vlan_ifdetach(void *arg, struct ifnet *ifp); @@ -620,7 +620,7 @@ } static int -vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) +vlan_clone_create(struct if_clone *ifc, char *name, size_t len, enum uio_seg as, caddr_t params) { char *dp; int wildcard; @@ -631,7 +631,6 @@ struct ifvlan *ifv; struct ifnet *ifp; struct ifnet *p; - struct vlanreq vlr; static const u_char eaddr[ETHER_ADDR_LEN]; /* 00:00:00:00:00:00 */ /* @@ -644,24 +643,30 @@ * supported for backwards compatibilty. */ if (params) { - error = copyin(params, &vlr, sizeof(vlr)); - if (error) - return error; - p = ifunit(vlr.vlr_parent); + struct vlanreq vlr, *vlrp; + + if (as == UIO_USERSPACE) { + error = copyin(params, &vlr, sizeof(vlr)); + if (error) + return error; + vlrp = &vlr; + } else + vlrp = (struct vlanreq *) params; + p = ifunit(vlrp->vlr_parent); if (p == NULL) return ENXIO; /* * Don't let the caller set up a VLAN tag with * anything except VLID bits. */ - if (vlr.vlr_tag & ~EVL_VLID_MASK) + if (vlrp->vlr_tag & ~EVL_VLID_MASK) return (EINVAL); error = ifc_name2unit(name, &unit); if (error != 0) return (error); ethertag = 1; - tag = vlr.vlr_tag; + tag = vlrp->vlr_tag; wildcard = (unit < 0); } else if ((p = vlan_clone_match_ethertag(ifc, name, &tag)) != NULL) { ethertag = 1; ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#33 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include @@ -94,18 +95,25 @@ } static int -wlan_clone_create(struct if_clone *ifc, int unit, caddr_t params) +wlan_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t params) { - struct ieee80211_clone_params cp; + struct ieee80211_clone_params cp, *icp; struct ieee80211vap *vap; struct ieee80211com *ic; struct ifnet *ifp; int error; - error = copyin(params, &cp, sizeof(cp)); - if (error) - return error; - ifp = ifunit(cp.icp_parent); + if (as == UIO_USERSPACE) { + error = copyin(params, &cp, sizeof(cp)); + if (error) + return error; + icp = &cp; + } else { + if (params == NULL) + return EFAULT; + icp = (struct ieee80211_clone_params *) params; + } + ifp = ifunit(icp->icp_parent); if (ifp == NULL) return ENXIO; /* XXX move printfs to DIAGNOSTIC before release */ @@ -113,21 +121,21 @@ if_printf(ifp, "%s: reject, not an 802.11 device\n", __func__); return ENXIO; } - if (cp.icp_opmode >= IEEE80211_OPMODE_MAX) { + if (icp->icp_opmode >= IEEE80211_OPMODE_MAX) { if_printf(ifp, "%s: invalid opmode %d\n", - __func__, cp.icp_opmode); + __func__, icp->icp_opmode); return EINVAL; } ic = ifp->if_l2com; - if ((ic->ic_caps & ieee80211_opcap[cp.icp_opmode]) == 0) { + if ((ic->ic_caps & ieee80211_opcap[icp->icp_opmode]) == 0) { if_printf(ifp, "%s mode not supported\n", - ieee80211_opmode_name[cp.icp_opmode]); + ieee80211_opmode_name[icp->icp_opmode]); return EOPNOTSUPP; } vap = ic->ic_vap_create(ic, ifc->ifc_name, unit, - cp.icp_opmode, cp.icp_flags, cp.icp_bssid, - cp.icp_flags & IEEE80211_CLONE_MACADDR ? - cp.icp_macaddr : ic->ic_myaddr); + icp->icp_opmode, icp->icp_flags, icp->icp_bssid, + icp->icp_flags & IEEE80211_CLONE_MACADDR ? + icp->icp_macaddr : ic->ic_myaddr); return (vap == NULL ? EIO : 0); } From owner-p4-projects@FreeBSD.ORG Fri Aug 29 10:39:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7971B1065673; Fri, 29 Aug 2008 10:39: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 3D2D8106566B for ; Fri, 29 Aug 2008 10:39:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 122D88FC0A for ; Fri, 29 Aug 2008 10:39:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TAd9Gs098045 for ; Fri, 29 Aug 2008 10:39:09 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7TAd9tB098043 for perforce@freebsd.org; Fri, 29 Aug 2008 10:39:09 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 29 Aug 2008 10:39:09 GMT Message-Id: <200808291039.m7TAd9tB098043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148787 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, 29 Aug 2008 10:39:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=148787 Change 148787 by rpaulo@rpaulo_epsilon on 2008/08/29 10:38:33 Add some new test cases. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/test/Makefile#2 edit .. //depot/projects/soc2008/rpaulo-tcpad/test/freebsd.org-www.cap#1 add .. //depot/projects/soc2008/rpaulo-tcpad/test/synrxmt.cap#1 add Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/test/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -TESTS=synrst.cap fc.cap +TESTS=fc.cap freebsd.org-www.cap synrst.cap synrxmt.cap .SUFFIXES: .cap test: ${TESTS} From owner-p4-projects@FreeBSD.ORG Fri Aug 29 10:40:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A37151065695; Fri, 29 Aug 2008 10:40: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 65B3F1065683 for ; Fri, 29 Aug 2008 10:40:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9498FC17 for ; Fri, 29 Aug 2008 10:40:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TAeB7e098172 for ; Fri, 29 Aug 2008 10:40:11 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7TAeBrH098170 for perforce@freebsd.org; Fri, 29 Aug 2008 10:40:11 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 29 Aug 2008 10:40:11 GMT Message-Id: <200808291040.m7TAeBrH098170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148788 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, 29 Aug 2008 10:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=148788 Change 148788 by rpaulo@rpaulo_epsilon on 2008/08/29 10:39:27 Mention the README directory. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/README#3 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/README#3 (text+ko) ==== @@ -11,4 +11,6 @@ operating system you are analyzing or if it's just a false positive from tcpad. +The 'test' directory contains some test cases for tcpad. + -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Fri Aug 29 12:00:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBE3810656F9; Fri, 29 Aug 2008 12:00: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 8F96510658B4 for ; Fri, 29 Aug 2008 12:00:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D08F8FC1C for ; Fri, 29 Aug 2008 12:00:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TC0W0a008890 for ; Fri, 29 Aug 2008 12:00:32 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7TC0Wii008888 for perforce@freebsd.org; Fri, 29 Aug 2008 12:00:32 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 29 Aug 2008 12:00:32 GMT Message-Id: <200808291200.m7TC0Wii008888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148790 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, 29 Aug 2008 12:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148790 Change 148790 by ed@ed_dull on 2008/08/29 12:00:08 Change the hooks approach we use in ttydisc_getc_uio(). It's much smarter to call ttydisc_getc() here. We'll likely get more hooks in the future to get Netgraph working again, so if we just make it call ttydisc_getc(), we only need to add those hooks at a single location. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#16 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#16 (text+ko) ==== @@ -1121,21 +1121,17 @@ /* * When a TTY hook is attached, we cannot perform unbuffered - * copying to userspace. We just simulate it by copying data to - * a shadow buffer. + * copying to userspace. Just call ttydisc_getc() and + * temporarily store data in a shadow buffer. */ if (ttyhook_hashook(tp, getc_capture)) { while (uio->uio_resid > 0) { /* Read to shadow buffer. */ - len = ttyoutq_read(&tp->t_outq, buf, + len = ttydisc_getc(tp, buf, MIN(uio->uio_resid, sizeof buf)); if (len == 0) break; - /* Process with hook. Handle sudden removal. */ - if (ttyhook_hashook(tp, getc_capture)) - tp->t_hook->th_getc_capture(tp, buf, len); - /* Copy to userspace. */ tty_unlock(tp); error = uiomove(buf, len, uio); @@ -1146,11 +1142,11 @@ } } else { error = ttyoutq_read_uio(&tp->t_outq, tp, uio); + + ttydisc_wakeup_watermark(tp); + atomic_add_long(&tty_nout, obytes - uio->uio_resid); } - ttydisc_wakeup_watermark(tp); - atomic_add_long(&tty_nout, obytes - uio->uio_resid); - return (error); } From owner-p4-projects@FreeBSD.ORG Fri Aug 29 12:14:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86F1A1065679; Fri, 29 Aug 2008 12:14: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 4B0D3106564A for ; Fri, 29 Aug 2008 12:14:47 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 37ED18FC0C for ; Fri, 29 Aug 2008 12:14:47 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TCEk4k011050 for ; Fri, 29 Aug 2008 12:14:46 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7TCEkdM011048 for perforce@freebsd.org; Fri, 29 Aug 2008 12:14:46 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 29 Aug 2008 12:14:46 GMT Message-Id: <200808291214.m7TCEkdM011048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148791 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, 29 Aug 2008 12:14:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=148791 Change 148791 by ed@ed_dull on 2008/08/29 12:14:14 Add proper inline routine for ttyhook calls, just like ttydevsw. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#17 edit .. //depot/projects/mpsafetty/sys/sys/ttyhook.h#5 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#17 (text+ko) ==== @@ -1096,9 +1096,8 @@ len = ttyoutq_read(&tp->t_outq, buf, len); - /* Invoke TTY hooks. XXX: ttyhook_getc_capture()? */ if (ttyhook_hashook(tp, getc_capture)) - tp->t_hook->th_getc_capture(tp, buf, len); + ttyhook_getc_capture(tp, buf, len); ttydisc_wakeup_watermark(tp); atomic_add_long(&tty_nout, len); ==== //depot/projects/mpsafetty/sys/sys/ttyhook.h#5 (text+ko) ==== @@ -52,4 +52,13 @@ #define ttyhook_hashook(tp,hook) ((tp)->t_hook != NULL && \ (tp)->t_hook->th_ ## hook != NULL) +static __inline void +ttyhook_getc_capture(struct tty *tp, const void *buf, size_t len) +{ + tty_lock_assert(tp, MA_OWNED); + MPASS(!tty_gone(tp)); + + tp->t_hook->th_getc_capture(tp, buf, len); +} + #endif /* !_SYS_TTYHOOK_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Aug 29 21:20:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 615EE1065682; Fri, 29 Aug 2008 21:20: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 251891065676 for ; Fri, 29 Aug 2008 21:20:04 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 139188FC0A for ; Fri, 29 Aug 2008 21:20:04 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TLK4B9001854 for ; Fri, 29 Aug 2008 21:20:04 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7TLK3DF001849 for perforce@freebsd.org; Fri, 29 Aug 2008 21:20:03 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 29 Aug 2008 21:20:03 GMT Message-Id: <200808292120.m7TLK3DF001849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148822 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, 29 Aug 2008 21:20:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=148822 Change 148822 by ed@ed_dull on 2008/08/29 21:19:32 IFC. Affected files ... .. //depot/projects/mpsafetty/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/mpsafetty/etc/defaults/rc.conf#7 integrate .. //depot/projects/mpsafetty/etc/rc.d/savecore#2 integrate .. //depot/projects/mpsafetty/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/mpsafetty/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/mpsafetty/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/md/md.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exec.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exit.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_linker.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mib.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_sig.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#18 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_default.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vnode_if.src#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf.c#5 integrate .. //depot/projects/mpsafetty/sys/net/bpf_filter.c#3 integrate .. //depot/projects/mpsafetty/sys/net/bpf_jitter.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if.h#3 integrate .. //depot/projects/mpsafetty/sys/net/if_vlan.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctputil.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/mpsafetty/sys/sys/ioccom.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#6 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#3 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/vm/swap_pager.c#4 integrate .. //depot/projects/mpsafetty/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/mpsafetty/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#4 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/bpf_test.c#4 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0001.h#3 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0002.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0003.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0004.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0005.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0006.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0007.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0008.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0009.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0010.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0011.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0012.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0013.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0014.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0015.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0016.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0017.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0018.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0019.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0020.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0021.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0022.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0023.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0024.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0025.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0026.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0027.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0028.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0029.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0030.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0031.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0032.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0033.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0034.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0035.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0036.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0037.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0038.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0039.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0040.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0041.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0042.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0043.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0044.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0045.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0046.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0047.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0048.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0049.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0050.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0051.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0052.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0053.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0054.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0055.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0056.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0057.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0058.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0059.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0060.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0061.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0062.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0063.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0064.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0065.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0066.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0067.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0068.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0069.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0070.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0071.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0072.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0073.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0074.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0079.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0080.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0081.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0082.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0083.h#1 branch .. //depot/projects/mpsafetty/tools/regression/geom_eli/attach-d.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/configure-b-B.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/delkey.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/detach-l.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/init-B.t#1 branch .. //depot/projects/mpsafetty/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/init-i-P.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/kill.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/nokey.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/readonly.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/geom_eli/setkey.t#2 integrate Differences ... ==== //depot/projects/mpsafetty/contrib/telnet/telnetd/telnetd.8#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)telnetd.8 8.4 (Berkeley) 6/1/94 -.\" $FreeBSD: src/contrib/telnet/telnetd/telnetd.8,v 1.21 2005/01/21 21:57:05 ru Exp $ +.\" $FreeBSD: src/contrib/telnet/telnetd/telnetd.8,v 1.22 2008/08/29 00:04:37 trhodes Exp $ .\" -.Dd January 9, 2005 +.Dd August 28, 2008 .Dt TELNETD 8 .Os .Sh NAME @@ -297,6 +297,15 @@ can be used to temporarily disable a specific authentication type without having to recompile .Nm . +Available +.Ar authtype +values include +.Ar KERBEROS_V4, Ar KERBEROS_V5, Ar SPX, Ar MINK, +and +.Ar SRA . +These options are completely independent of the +.Fl a +option. .El .Pp .Nm Telnetd ==== //depot/projects/mpsafetty/etc/defaults/rc.conf#7 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.343 2008/08/25 16:31:53 des Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.344 2008/08/29 20:30:30 jhb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -539,6 +539,8 @@ dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. +crashinfo_enable="NO" # Automatically generate crash dump summary. +crashinfo_program="/usr/sbin/crashinfo" # Script to generate crash dump summary. quota_enable="NO" # turn on quotas on startup (or NO). check_quotas="YES" # Check quotas on startup (or NO). quotaon_flags="-a" # Turn quotas on for all file systems (if enabled) ==== //depot/projects/mpsafetty/etc/rc.d/savecore#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.16 2008/08/29 20:30:30 jhb Exp $ # # PROVIDE: savecore @@ -65,6 +65,9 @@ if savecore -C "${dumpdir}" "${dev}" >/dev/null; then savecore ${savecore_flags} ${dumpdir} ${dumpdev} + if checkyesno crashinfo_enable; then + ${crashinfo_program} -d ${dumpdir} + fi else [ -z "${rc_quiet}" ] && echo "No core dumps found" fi ==== //depot/projects/mpsafetty/sbin/geom/class/eli/geli.8#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2005-2006 Pawel Jakub Dawidek +.\" Copyright (c) 2005-2008 Pawel Jakub Dawidek .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.23 2008/08/12 19:42:03 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.25 2008/08/29 18:10:18 pjd Exp $ .\" -.Dd September 16, 2006 +.Dd August 29, 2008 .Dt GELI 8 .Os .Sh NAME @@ -53,6 +53,7 @@ .Cm init .Op Fl bPv .Op Fl a Ar aalgo +.Op Fl B Ar backupfile .Op Fl e Ar ealgo .Op Fl i Ar iterations .Op Fl K Ar newkeyfile @@ -206,6 +207,14 @@ Initialize provider which needs to be encrypted. Here you can set up the cryptographic algorithm to use, key length, etc. The last provider's sector is used to store metadata. +The +.Cm init +subcommand also automatically backups metadata in +.Pa /var/backups/.eli +file. +The metadata can be recovered with the +.Cm restore +subcommand described below. .Pp Additional options include: .Bl -tag -width ".Fl a Ar aalgo" @@ -224,6 +233,22 @@ and .Nm HMAC/SHA512 . If the option is not given, there will be no authentication, only encryption. +The recommended algorithm is +.Nm HMAC/SHA256 . +.It Fl b +Ask for the passphrase on boot, before the root partition is mounted. +This makes it possible to use an encrypted root partition. +One will still need bootable unencrypted storage with a +.Pa /boot/ +directory, which can be a CD-ROM disc or USB pen-drive, that can be removed +after boot. +.It Fl B Ar backupfile +File name to use for metadata backup instead of the default +.Pa /var/backups/.eli . +To inhibit backups, you can use +.Pa none +as the +.Ar backupfile . .It Fl e Ar ealgo Encryption algorithm to use. Currently supported algorithms are: @@ -232,15 +257,8 @@ .Nm Camellia and .Nm 3DES . -The default is +The default and recommended algorithm is .Nm AES . -.It Fl b -Ask for the passphrase on boot, before the root partition is mounted. -This makes it possible to use an encrypted root partition. -One will still need bootable unencrypted storage with a -.Pa /boot/ -directory, which can be a CD-ROM disc or USB pen-drive, that can be removed -after boot. .It Fl i Ar iterations Number of iterations to use with PKCS#5v2. If this option is not specified, @@ -267,13 +285,13 @@ .Nm Camellia and 192 for .Nm 3DES . +.It Fl P +Do not use passphrase as the key component. .It Fl s Ar sectorsize Change decrypted provider's sector size. Increasing sector size allows to increase performance, because we need to generate an IV and do encrypt/decrypt for every single sector - less number of sectors means less work to do. -.It Fl P -Do not use passphrase as the key component. .El .It Cm attach Attach the given provider. @@ -296,9 +314,6 @@ option for the .Cm detach subcommand. -.It Fl r -Attach read-only provider. -It will not be opened for writing. .It Fl k Ar keyfile Specifies a file which contains part of the key. For more information see the description of the @@ -308,6 +323,9 @@ subcommand. .It Fl p Do not use passphrase as the key component. +.It Fl r +Attach read-only provider. +It will not be opened for writing. .El .It Cm detach Detach the given providers, which means remove the devfs entry @@ -623,6 +641,30 @@ # newfs /dev/da0.eli # mount /dev/da0.eli /mnt/secret .Ed +.Pp +.Cm geli +backups metadata by default to the +.Pa /var/backups/.eli +file. +If metadata is lost in any way (eg. by accidental overwrite), it can be restored. +Consider the following situation: +.Bd -literal -offset indent +# geli init /dev/da0 +Enter new passphrase: +Reenter new passphrase: + +Metadata backup can be found in /var/backups/da0.eli and +can be restored with the following command: + + # geli restore /var/backups/da0.eli /dev/da0 + +# geli clear /dev/da0 +# geli attach /dev/da0 +geli: Cannot read metadata from /dev/da0: Invalid argument. +# geli restore /var/backups/da0.eli /dev/da0 +# geli attach /dev/da0 +Enter passphrase: +.Ed .Sh DATA AUTHENTICATION .Nm can verify data integrity when an authentication algorithm is specified. ==== //depot/projects/mpsafetty/sbin/geom/class/eli/geom_eli.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2006 Pawel Jakub Dawidek + * Copyright (c) 2004-2008 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.25 2008/08/12 19:42:03 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.26 2008/08/29 18:10:18 pjd Exp $"); #include #include @@ -54,6 +54,8 @@ uint32_t lib_version = G_LIB_VERSION; uint32_t version = G_ELI_VERSION; +#define GELI_BACKUP_DIR "/var/backups/" + static char aalgo[] = "none"; static char ealgo[] = "aes"; static intmax_t keylen = 0; @@ -61,6 +63,7 @@ static intmax_t iterations = -1; static intmax_t sectorsize = 0; static char keyfile[] = "", newkeyfile[] = ""; +static char backupfile[] = ""; static void eli_main(struct gctl_req *req, unsigned flags); static void eli_init(struct gctl_req *req); @@ -74,10 +77,13 @@ static void eli_clear(struct gctl_req *req); static void eli_dump(struct gctl_req *req); +static int eli_backup_create(struct gctl_req *req, const char *prov, + const char *file); + /* * Available commands: * - * init [-bhPv] [-a aalgo] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] prov + * init [-bhPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] prov * label - alias for 'init' * attach [-dprv] [-k keyfile] prov * detach [-fl] prov ... @@ -97,6 +103,7 @@ { { 'a', "aalgo", aalgo, G_TYPE_STRING }, { 'b', "boot", NULL, G_TYPE_BOOL }, + { 'B', "backupfile", backupfile, G_TYPE_STRING }, { 'e', "ealgo", ealgo, G_TYPE_STRING }, { 'i', "iterations", &iterations, G_TYPE_NUMBER }, { 'K', "newkeyfile", newkeyfile, G_TYPE_STRING }, @@ -105,12 +112,13 @@ { 's', "sectorsize", §orsize, G_TYPE_NUMBER }, G_OPT_SENTINEL }, - NULL, "[-bPv] [-a aalgo] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov" + NULL, "[-bPv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] [-s sectorsize] prov" }, { "label", G_FLAG_VERBOSE, eli_main, { { 'a', "aalgo", aalgo, G_TYPE_STRING }, { 'b', "boot", NULL, G_TYPE_BOOL }, + { 'B', "backupfile", backupfile, G_TYPE_STRING }, { 'e', "ealgo", ealgo, G_TYPE_STRING }, { 'i', "iterations", &iterations, G_TYPE_NUMBER }, { 'K', "newkeyfile", newkeyfile, G_TYPE_STRING }, @@ -514,6 +522,7 @@ struct g_eli_metadata md; unsigned char sector[sizeof(struct g_eli_metadata)]; unsigned char key[G_ELI_USERKEYLEN]; + char backfile[MAXPATHLEN]; const char *str, *prov; unsigned secsize; off_t mediasize; @@ -648,6 +657,32 @@ } if (verbose) printf("Metadata value stored on %s.\n", prov); + /* Backup metadata to a file. */ + str = gctl_get_ascii(req, "backupfile"); + if (str[0] != '\0') { + /* Backupfile given be the user, just copy it. */ + strlcpy(backfile, str, sizeof(backfile)); + } else { + /* Generate file name automatically. */ + const char *p = prov; + unsigned int i; + + if (strncmp(p, _PATH_DEV, strlen(_PATH_DEV)) == 0) + p += strlen(_PATH_DEV); + snprintf(backfile, sizeof(backfile), "%s%s.eli", + GELI_BACKUP_DIR, p); + /* Replace all / with _. */ + for (i = strlen(GELI_BACKUP_DIR); backfile[i] != '\0'; i++) { + if (backfile[i] == '/') + backfile[i] = '_'; + } + } + if (strcmp(backfile, "none") != 0 && + eli_backup_create(req, prov, backfile) == 0) { + printf("\nMetadata backup can be found in %s and\n", backfile); + printf("can be restored with the following command:\n"); + printf("\n\t# geli restore %s %s\n\n", backfile, prov); + } } static void @@ -887,6 +922,12 @@ eli_setkey_attached(req, &md); else eli_setkey_detached(req, prov, &md); + + if (req->error == NULL || req->error[0] == '\0') { + printf("Note, that the master key encrypted with old keys " + "and/or passphrase may still exists in a metadata backup " + "file.\n"); + } } static void @@ -1022,24 +1063,16 @@ gctl_issue(req); } -static void -eli_backup(struct gctl_req *req) +static int +eli_backup_create(struct gctl_req *req, const char *prov, const char *file) { struct g_eli_metadata md; - const char *file, *prov; unsigned secsize; unsigned char *sector; off_t mediasize; - int nargs, filefd, provfd; + int filefd, provfd, ret; - nargs = gctl_get_int(req, "nargs"); - if (nargs != 2) { - gctl_error(req, "Invalid number of arguments."); - return; - } - prov = gctl_get_ascii(req, "arg0"); - file = gctl_get_ascii(req, "arg1"); - + ret = -1; provfd = filefd = -1; sector = NULL; secsize = 0; @@ -1092,6 +1125,8 @@ strerror(errno)); goto out; } + /* Success. */ + ret = 0; out: if (provfd > 0) close(provfd); @@ -1101,6 +1136,24 @@ bzero(sector, secsize); free(sector); } + return (ret); +} + +static void +eli_backup(struct gctl_req *req) +{ + const char *file, *prov; + int nargs; + + nargs = gctl_get_int(req, "nargs"); + if (nargs != 2) { + gctl_error(req, "Invalid number of arguments."); + return; + } + prov = gctl_get_ascii(req, "arg0"); + file = gctl_get_ascii(req, "arg1"); + + eli_backup_create(req, prov, file); } static void ==== //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.152 2008/08/27 12:54:29 rpaulo Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.153 2008/08/28 22:13:44 jfv Exp $ .\" .Dd August 27, 2008 .Dt IFCONFIG 8 @@ -402,18 +402,20 @@ is a synonym for enabling all available WOL mechanisms. To disable WOL use .Fl wol . -.It Cm vlanmtu , vlanhwtag +.It Cm vlanmtu , vlanhwtag, vlanhwfilter If the driver offers user-configurable VLAN support, enable -reception of extended frames or tag processing in hardware, +reception of extended frames, tag processing in hardware, or +frame filtering in hardware, respectively. Note that this must be issued on a physical interface associated with .Xr vlan 4 , not on a .Xr vlan 4 interface itself. -.It Fl vlanmtu , vlanhwtag +.It Fl vlanmtu , vlanhwtag, vlanhwfilter If the driver offers user-configurable VLAN support, disable -reception of extended frames or tag processing in hardware, +reception of extended frames, tag processing in hardware, or +frame filtering in hardware, respectively. .It Cm polling Turn on ==== //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.138 2008/08/03 03:36:12 thompsa Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.139 2008/08/28 22:13:44 jfv Exp $"; #endif /* not lint */ #include @@ -776,7 +776,8 @@ #define IFCAPBITS \ "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" \ -"\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" +"\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" \ +"\21VLAN_HWFILTER" /* * Print the status of the interface. If an address family was ==== //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.13 2008/03/31 15:38:07 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.14 2008/08/28 22:13:44 jfv Exp $"; #endif #define NOTAG ((u_short) -1) @@ -180,6 +180,8 @@ DEF_CMD("-vlanmtu", -IFCAP_VLAN_MTU, setifcap), DEF_CMD("vlanhwtag", IFCAP_VLAN_HWTAGGING, setifcap), DEF_CMD("-vlanhwtag", -IFCAP_VLAN_HWTAGGING, setifcap), + DEF_CMD("vlanhwfilter", IFCAP_VLAN_HWFILTER, setifcap), + DEF_CMD("-vlanhwfilter", -IFCAP_VLAN_HWFILTER, setifcap), }; static struct afswtch af_vlan = { .af_name = "af_vlan", ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_da.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.227 2008/07/09 17:00:14 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.228 2008/08/29 04:39:46 scottl Exp $"); #include @@ -674,18 +674,19 @@ softc->disk->d_fwheads = softc->params.heads; softc->disk->d_devstat->block_size = softc->params.secsize; softc->disk->d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE; - } - - if (error == 0) { + if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0 && (softc->quirks & DA_Q_NO_PREVENT) == 0) daprevent(periph, PR_PREVENT); - } else { + } else softc->flags &= ~DA_FLAG_OPEN; + + cam_periph_unhold(periph); + cam_periph_unlock(periph); + + if (error != 0) { cam_periph_release(periph); } - cam_periph_unhold(periph); - cam_periph_unlock(periph); return (error); } ==== //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.4 2008/05/22 08:33:24 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.5 2008/08/29 15:55:49 scottl Exp $ */ /* @@ -65,7 +65,8 @@ */ #define CPUC_SIZE (sizeof (uint16_t) + sizeof (uintptr_t) + \ sizeof (kmutex_t)) -#define CPUC_PADSIZE CPU_CACHE_COHERENCE_SIZE - CPUC_SIZE +#define CPUC_SIZE1 roundup(CPUC_SIZE, CPU_CACHE_COHERENCE_SIZE) +#define CPUC_PADSIZE CPUC_SIZE1 - CPUC_SIZE typedef struct cpu_core { uint16_t cpuc_dtrace_flags; /* DTrace flags */ ==== //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 (text+ko) ==== @@ -3203,7 +3203,7 @@ M"0.@,"T00`'H)`,``X^D`5`PAO__CJ)ciss_dev = dev; /* - * Work out adapter type. - */ - i = ciss_lookup(dev); - if (i < 0) { - ciss_printf(sc, "unknown adapter type\n"); - error = ENXIO; - goto out; - } - if (ciss_vendor_data[i].flags & CISS_BOARD_SA5) { - sc->ciss_interrupt_mask = CISS_TL_SIMPLE_INTR_OPQ_SA5; - } else if (ciss_vendor_data[i].flags & CISS_BOARD_SA5B) { - sc->ciss_interrupt_mask = CISS_TL_SIMPLE_INTR_OPQ_SA5B; - } else { - /* really an error on our part */ - ciss_printf(sc, "unable to determine hardware type\n"); - error = ENXIO; - goto out; - } - - /* * Do PCI-specific init. */ if ((error = ciss_init_pci(sc)) != 0) @@ -579,12 +559,34 @@ { uintptr_t cbase, csize, cofs; uint32_t method, supported_methods; - int error; + int error, sqmask, i; void *intr; debug_called(1); /* + * Work out adapter type. + */ + i = ciss_lookup(sc->ciss_dev); + if (i < 0) { + ciss_printf(sc, "unknown adapter type\n"); + return (ENXIO); + } + + if (ciss_vendor_data[i].flags & CISS_BOARD_SA5) { + sqmask = CISS_TL_SIMPLE_INTR_OPQ_SA5; + } else if (ciss_vendor_data[i].flags & CISS_BOARD_SA5B) { + sqmask = CISS_TL_SIMPLE_INTR_OPQ_SA5B; + } else { + /* + * XXX Big hammer, masks/unmasks all possible interrupts. This should + * work on all hardware variants. Need to add code to handle the + * "controller crashed" interupt bit that this unmasks. + */ + sqmask = ~0; + } + + /* * Allocate register window first (we need this to find the config * struct). */ @@ -729,10 +731,13 @@ sc->ciss_irq_rid[0] = 0; if (method == CISS_TRANSPORT_METHOD_PERF) { ciss_printf(sc, "PERFORMANT Transport\n"); - if ((ciss_force_interrupt != 1) && (ciss_setup_msix(sc) == 0)) + if ((ciss_force_interrupt != 1) && (ciss_setup_msix(sc) == 0)) { intr = ciss_perf_msi_intr; - else + sc->ciss_interrupt_mask = CISS_TL_PERF_INTR_MSI; + } else { intr = ciss_perf_intr; + sc->ciss_interrupt_mask = CISS_TL_PERF_INTR_OPQ; + } } else { ciss_printf(sc, "SIMPLE Transport\n"); /* MSIX doesn't seem to work in SIMPLE mode, only enable if it forced */ @@ -741,6 +746,7 @@ ciss_setup_msix(sc); sc->ciss_perf = NULL; intr = ciss_intr; + sc->ciss_interrupt_mask = sqmask; } /* ==== //depot/projects/mpsafetty/sys/dev/ciss/cissreg.h#4 (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/dev/ciss/cissreg.h,v 1.18 2008/08/02 13:04:26 scottl Exp $ + * $FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.19 2008/08/29 01:23:16 scottl Exp $ */ /* @@ -728,6 +728,9 @@ #define CISS_TL_SIMPLE_POST_CMD(sc, phys) CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IPQ, phys) #define CISS_TL_SIMPLE_FETCH_CMD(sc) CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_OPQ) +#define CISS_TL_PERF_INTR_OPQ (CISS_TL_SIMPLE_INTR_OPQ_SA5 | CISS_TL_SIMPLE_INTR_OPQ_SA5B) +#define CISS_TL_PERF_INTR_MSI 0x01 + #define CISS_TL_PERF_POST_CMD(sc, cr) CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IPQ, CISS_FIND_COMMANDPHYS(cr) | (cr)->cr_sg_tag) #define CISS_TL_PERF_FLUSH_INT(sc) CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_OSR) #define CISS_TL_PERF_CLEAR_INT(sc) CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_ODC, CISS_TL_SIMPLE_ODC_CLEAR) @@ -735,18 +738,12 @@ #define CISS_MSI_COUNT 4 -/* - * XXX Here we effectively trust the BIOS to set the IMR correctly. But if - * we don't trust it, will we get into trouble with wrongly assuming what it - * should be? - */ -#define CISS_TL_SIMPLE_DISABLE_INTERRUPTS(sc) \ - do { \ - (sc)->ciss_interrupt_mask = \ - CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR); \ - CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, ~0); \ - } while (0) -#define CISS_TL_SIMPLE_ENABLE_INTERRUPTS(sc) \ - CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, (sc)->ciss_interrupt_mask) +#define CISS_TL_SIMPLE_DISABLE_INTERRUPTS(sc) \ + CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \ + CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) | (sc)->ciss_interrupt_mask) +#define CISS_TL_SIMPLE_ENABLE_INTERRUPTS(sc) \ + CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \ + CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) & ~(sc)->ciss_interrupt_mask) + #endif /* _KERNEL */ ==== //depot/projects/mpsafetty/sys/dev/dc/if_dc.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.196 2008/08/23 20:57:48 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.197 2008/08/29 20:31:41 marius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -1393,9 +1393,7 @@ __func__); if (!((isr & DC_ISR_RX_STATE) == DC_RXSTATE_STOPPED || (isr & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT) && - !(DC_IS_CENTAUR(sc) || DC_IS_CONEXANT(sc) || - (DC_IS_DAVICOM(sc) && pci_get_revid(sc->dc_dev) >= - DC_REVISION_DM9102A))) + !DC_HAS_BROKEN_RXSTATE(sc)) device_printf(sc->dc_dev, "%s: failed to force rx to idle state\n", __func__); @@ -2884,8 +2882,12 @@ if (sc->dc_link == 0) mii_tick(mii); } else { - r = CSR_READ_4(sc, DC_ISR); - if ((r & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT && + /* + * For NICs which never report DC_RXSTATE_WAIT, we + * have to bite the bullet... + */ + if ((DC_HAS_BROKEN_RXSTATE(sc) || (CSR_READ_4(sc, + DC_ISR) & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT) && sc->dc_cdata.dc_tx_cnt == 0) { mii_tick(mii); if (!(mii->mii_media_status & IFM_ACTIVE)) ==== //depot/projects/mpsafetty/sys/dev/dc/if_dcreg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.55 2008/03/24 17:38:24 marius Exp $ + * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.56 2008/08/29 20:31:41 marius Exp $ */ /* @@ -182,6 +182,10 @@ #define DC_RXSTATE_FLUSH 0x000C0000 /* 110 - flush from FIFO */ #define DC_RXSTATE_DEQUEUE 0x000E0000 /* 111 - dequeue from FIFO */ +#define DC_HAS_BROKEN_RXSTATE(x) \ + (DC_IS_CENTAUR(x) || DC_IS_CONEXANT(x) || (DC_IS_DAVICOM(x) && \ + pci_get_revid((x)->dc_dev) >= DC_REVISION_DM9102A)) + #define DC_TXSTATE_RESET 0x00000000 /* 000 - reset */ #define DC_TXSTATE_FETCH 0x00100000 /* 001 - fetching descriptor */ #define DC_TXSTATE_WAITEND 0x00200000 /* 010 - wait for tx end */ ==== //depot/projects/mpsafetty/sys/dev/e1000/if_igb.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 30 09:24:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9CC8106567E; Sat, 30 Aug 2008 09:24: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 9C7921065671 for ; Sat, 30 Aug 2008 09:24:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 895648FC17 for ; Sat, 30 Aug 2008 09:24:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7U9OO6B004586 for ; Sat, 30 Aug 2008 09:24:24 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7U9OOhb004584 for perforce@freebsd.org; Sat, 30 Aug 2008 09:24:24 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 30 Aug 2008 09:24:24 GMT Message-Id: <200808300924.m7U9OOhb004584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148834 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, 30 Aug 2008 09:24:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=148834 Change 148834 by ed@ed_dull on 2008/08/30 09:23:35 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#36 integrate .. //depot/projects/mpsafetty/sys/kern/tty_inq.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/tty_outq.c#10 integrate .. //depot/projects/mpsafetty/sys/sys/ttyqueue.h#9 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#5 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.10 2008/08/28 06:40:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.11 2008/08/30 05:31:23 kientzle Exp $"); #if ARCHIVE_VERSION_STAMP >= 1009000 @@ -97,8 +97,8 @@ failure("st.st_mode=%o archive_entry_mode(ae)=%o", st.st_mode, archive_entry_mode(ae)); assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); - failure("Old bug: if no atime specified, atime got set to Jan 1, 1970"); - assert(st.st_atime != 0); + failure("No atime was specified, so atime should get set to mtime"); + assertEqualInt(st.st_atime, st.st_mtime); assertEqualInt(st.st_size, sizeof(data)); assertEqualInt(st.st_mtime, 123456789); } ==== //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.8 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.10 2008/08/30 00:53:30 rnoland Exp $"); /** @file drm_drv.c * The catch-all file for DRM device support, including module setup/teardown, @@ -463,7 +463,9 @@ dev->magiclist[i].head = dev->magiclist[i].tail = NULL; } + DRM_UNLOCK(); drm_drawable_free_all(dev); + DRM_LOCK(); /* Clear AGP information */ if ( dev->agp ) { @@ -658,8 +660,11 @@ dev->agp = NULL; } - if (dev->driver.unload != NULL) + if (dev->driver.unload != NULL) { + DRM_LOCK(); dev->driver.unload(dev); + DRM_UNLOCK(); + } delete_unrhdr(dev->drw_unrhdr); ==== //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_lock.c,v 1.3 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_lock.c,v 1.4 2008/08/30 01:00:18 rnoland Exp $"); /** @file drm_lock.c * Implementation of the ioctls and other support code for dealing with the @@ -171,18 +171,23 @@ { drm_lock_t *lock = data; + DRM_DEBUG("%d (pid %d) requests unlock (0x%08x), flags = 0x%08x\n", + lock->context, DRM_CURRENTPID, dev->lock.hw_lock->lock, + lock->flags); + if (lock->context == DRM_KERNEL_CONTEXT) { DRM_ERROR("Process %d using kernel context %d\n", DRM_CURRENTPID, lock->context); return EINVAL; } +#if 0 /* Check that the context unlock being requested actually matches * who currently holds the lock. */ if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) || _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) != lock->context) return EINVAL; - +#endif DRM_SPINLOCK(&dev->tsk_lock); if (dev->locked_task_call != NULL) { dev->locked_task_call(dev); ==== //depot/projects/mpsafetty/sys/kern/tty.c#36 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.285 2008/08/27 19:37:21 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.286 2008/08/30 09:18:27 ed Exp $"); #include "opt_compat.h" ==== //depot/projects/mpsafetty/sys/kern/tty_inq.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_inq.c,v 1.1 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_inq.c,v 1.2 2008/08/30 09:18:27 ed Exp $"); #include #include @@ -108,9 +108,6 @@ tib = uma_zalloc(ttyinq_zone, M_WAITOK); tty_lock(tp); - if (tty_gone(tp)) - return; - TAILQ_INSERT_TAIL(&ti->ti_list, tib, tib_list); ti->ti_nblocks++; } ==== //depot/projects/mpsafetty/sys/kern/tty_outq.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_outq.c,v 1.2 2008/08/23 13:32:21 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_outq.c,v 1.3 2008/08/30 09:18:27 ed Exp $"); #include #include @@ -97,9 +97,6 @@ tob = uma_zalloc(ttyoutq_zone, M_WAITOK); tty_lock(tp); - if (tty_gone(tp)) - return; - STAILQ_INSERT_TAIL(&to->to_list, tob, tob_list); to->to_nblocks++; } ==== //depot/projects/mpsafetty/sys/sys/ttyqueue.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/ttyqueue.h,v 1.1 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/sys/sys/ttyqueue.h,v 1.2 2008/08/30 09:18:27 ed Exp $ */ #ifndef _SYS_TTYQUEUE_H_ ==== //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/tools/regression/bpf/bpf_filter/Makefile,v 1.10 2008/08/29 20:20:30 jkim Exp $ +# $FreeBSD: src/tools/regression/bpf/bpf_filter/Makefile,v 1.11 2008/08/29 20:58:01 jkim Exp $ TEST_CASES?= test0001 test0002 test0003 test0004 \ test0005 test0006 test0007 test0008 \ @@ -20,7 +20,7 @@ test0069 test0070 test0071 test0072 \ test0073 test0074 test0075 test0076 \ test0077 test0078 test0079 test0080 \ - test0081 test0082 + test0081 test0082 test0083 SYSDIR?= ${.CURDIR}/../../../../sys From owner-p4-projects@FreeBSD.ORG Sat Aug 30 09:25:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23B581065749; Sat, 30 Aug 2008 09:25:26 +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 DCFD91065745 for ; Sat, 30 Aug 2008 09:25:25 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0D448FC2F for ; Sat, 30 Aug 2008 09:25:25 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7U9PPYo004711 for ; Sat, 30 Aug 2008 09:25:25 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7U9PPF0004709 for perforce@freebsd.org; Sat, 30 Aug 2008 09:25:25 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 30 Aug 2008 09:25:25 GMT Message-Id: <200808300925.m7U9PPF0004709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148835 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, 30 Aug 2008 09:25:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=148835 Change 148835 by ed@ed_dull on 2008/08/30 09:25:20 Remove unneeded whitespace diff against SVN. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_outq.c#11 integrate Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_outq.c#11 (text+ko) ==== @@ -263,6 +263,7 @@ error = uiomove(ob, clen, uio); tty_lock(tp); } + if (error != 0) return (error); } From owner-p4-projects@FreeBSD.ORG Sat Aug 30 09:40:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9C681065674; Sat, 30 Aug 2008 09:40:41 +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 6DC721065671 for ; Sat, 30 Aug 2008 09:40:41 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4251E8FC20 for ; Sat, 30 Aug 2008 09:40:41 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7U9efqE005907 for ; Sat, 30 Aug 2008 09:40:41 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7U9efuC005905 for perforce@freebsd.org; Sat, 30 Aug 2008 09:40:41 GMT (envelope-from marius@freebsd.org) Date: Sat, 30 Aug 2008 09:40:41 GMT Message-Id: <200808300940.m7U9efuC005905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 148836 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, 30 Aug 2008 09:40:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=148836 Change 148836 by marius@flak on 2008/08/30 09:40:12 Add the beginnings of cas(4). Affected files ... .. //depot/projects/usiii/dev/cas/if_casreg.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 30 14:13:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C063B106567E; Sat, 30 Aug 2008 14:13: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 82DDA1065676 for ; Sat, 30 Aug 2008 14:13:53 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D9648FC0A for ; Sat, 30 Aug 2008 14:13:53 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7UEDrlh044644 for ; Sat, 30 Aug 2008 14:13:53 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7UEDIrr044611 for perforce@freebsd.org; Sat, 30 Aug 2008 14:13:18 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 Aug 2008 14:13:18 GMT Message-Id: <200808301413.m7UEDIrr044611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148845 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, 30 Aug 2008 14:13:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=148845 Change 148845 by trasz@trasz_traszkan on 2008/08/30 14:13:12 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/options.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpcap/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/mips/_setjmp.S#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping6/ping6.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping6/ping6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/wi.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/md/md.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_outq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wi/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_filter.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_jitter.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/ethernet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_options.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ioccom.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydisc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/swap_pager.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vnode_pager.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/getopts2.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/getopts2.0.stdout#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/bpf_test.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0001.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0002.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0003.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0004.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0005.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0006.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0007.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0008.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0009.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0010.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0011.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0012.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0013.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0014.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0015.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0016.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0017.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0018.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0019.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0020.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0021.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0022.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0023.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0024.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0025.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0026.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0027.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0028.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0029.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0030.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0031.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0032.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0033.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0034.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0035.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0036.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0037.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0038.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0039.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0040.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0041.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0042.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0043.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0044.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0045.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0046.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0047.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0048.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0049.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0050.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0051.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0052.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0053.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0054.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0055.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0056.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0057.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0058.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0059.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0060.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0061.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0062.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0063.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0064.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0065.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0066.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0067.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0068.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0069.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0070.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0071.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0072.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0073.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0074.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0079.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0080.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0081.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0082.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0083.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/attach-d.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/configure-b-B.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/delkey.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/detach-l.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/init-B.t#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/init-a.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/init-i-P.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/integrity-copy.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/integrity-data.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/integrity-hmac.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/kill.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/nokey.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/readonly.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/geom_eli/setkey.t#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.27 2008/08/27 20:16:06 stefanf Exp $"); #include #include @@ -338,6 +338,7 @@ shellparam.malloc = 1; shellparam.nparam = nparam; shellparam.p = newparam; + shellparam.reset = 1; shellparam.optnext = NULL; } @@ -405,7 +406,6 @@ if (*argptr != NULL) { setparam(argptr); } - shellparam.reset = 1; INTON; return 0; } ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -356,7 +356,7 @@ #define VOP_CLOSE(vp, f, c, o, cr) 0 #define VOP_PUTPAGE(vp, of, sz, fl, cr) 0 -#define VOP_GETATTR(vp, vap, fl, cr) ((vap)->va_size = (vp)->v_size, 0) +#define VOP_GETATTR(vp, vap, fl) ((vap)->va_size = (vp)->v_size, 0) #define VOP_FSYNC(vp, f, cr) fsync((vp)->v_fd) ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,9 +1,13 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.34 2007/11/05 00:21:32 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.35 2008/08/28 06:20:43 gshapiro Exp $ -sendmail 8.14.2 +sendmail 8.14.3 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ -For the import of sendmail, the following files were removed: +For the import of sendmail, the following directories were renamed: + + sendmail -> src + +For the merge of sendmail, the following files were removed: Build cf/cf/Build @@ -15,23 +19,32 @@ sendmail/makesendmail sendmail/sysexits.h -The following directories were renamed: +Imported using the instructions at: - sendmail -> src +http://wiki.freebsd.org/SubversionPrimer/VendorImports -Imported using: +Then merged using: - cvs import -m 'Import sendmail 8.14.2' \ - src/contrib/sendmail SENDMAIL v8_14_2 +% set FSVN=svn+ssh://svn.freebsd.org/base +% svn checkout $FSVN/head/contrib/sendmail head +% cd head +% svn merge --accept=postpone $FSVN/vendor/sendmail/dist . +% svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build +% svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h +% svn propset -R svn:keywords FreeBSD=%H . +% svn propdel svn:keywords libmilter/docs/*.jpg +% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. +% svn status +% svn diff +% svn commit After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: - cvs commit -f src/etc/sendmail/freebsd*mc + (svn command TBD) cvs commit -f src/etc/sendmail/freebsd*mc -To make local changes to sendmail, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) -branch. +To make local changes to sendmail, simply patch and commit to the head. +Never make local changes in the vendor area (/vendor/sendmail/). All local changes should be submitted to the Sendmail Consortium for inclusion in the next vendor release. @@ -97,4 +110,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -04-November-2007 +27-August-2008 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/KNOWNBUGS#2 (text+ko) ==== @@ -47,6 +47,17 @@ but some characters might be lost. Fix: obey RFC (2)822 and do not send lines that are longer than 1000 characters. +* milter communication fails if a single header is larger than 64K. + + If a single header is larger than 64KB (which is not possible in the + default configuration) then it cannot be transferred in one block to + libmilter and hence the communication fails. This can be avoided by + increasing the constant MILTER_CHUNK_SIZE in + include/libmilter/mfdef.h and recompiling sendmail, libmilter, and + all (statically linked) milters (or by using an undocumented compile + time option: _FFR_MAXDATASIZE; you have to read the source code in + order to use this properly). + * Sender addresses whose domain part cause a temporary A record lookup failure but have a valid MX record will be temporarily rejected in the default configuration. Solution: fix the DNS at the sender side. @@ -247,4 +258,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $ +$Revision: 8.60 $, Last updated $Date: 2007/12/04 01:16:50 $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/PGPKEYS#2 (text+ko) ==== @@ -142,6 +142,69 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0xF6B30729 2008-01-18 ---------- RSA Sign & Encrypt +f16 Fingerprint16 = 07 FB 9A F9 F7 94 4B E4 0F 28 D1 8E 23 6F A2 B0 +uid Sendmail Signing Key/2008 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.8 (Darwin) + +mQCNA0eP9NsAAAEEAM5xPc5UXm01Mnqad8NPc5RkbeWcotxNOZXwrz4qQM6sr/E2 +lEMGgo5FOjWJX3tjtys8gfXZJihz3XMD5RleniW3RIhc2tbTJotNq9Qq9+LmiuBs +lT32O3ZSKsQtHQSfZ0j2bIabC/aQ4Dhfz13wz7x6VvRGwDbX3Niq8Mr2swcpAAUR +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDA4IDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQCVAwUQR4/029iq8Mr2swcpAQGa3QP+O6q/DvRLzM03AwIrEPRjdswejima +4BjKYYVQ1Qa7m4pyQeY/0CJScqu5A7p+kCrLqznmHu5aeezvjZy1mW7OCScPrCN9 +yC3IJdu7oX6mGZwPdUnsEyJvtHmiRXkumJtncmhcTZyplmt9ZDHVADQUQWRnyuex +oToSOeMPjS8YBpSJAJUDBRBHj/Xol0MBGHCTuEEBAYnzBAC5U2c8RtxNwwV4wh7V +Q4isNyXcYqUlUL5ZjtsP5+vuHz4d1CtT/tD4jGagy6J30xUuwUcF7AlNLIcn4z98 +GqF/aMCANut3dpGbzzvLYg+SkKkrZKH6fF4QPbdotp8NWKeiihoqD+hD6sVNc3zZ +/JymsmD1T346VpRTwKf4JzkJG4kAlQMFEEeP9hEee7PIr5WWJQEBP1sD/3I5VeiC +lW9fmwaAyOt/BrPIfsieL2TLysXCQbXFObNqqdR9APPlmQAtFdERjopQZu+VKvZd +pInWGaIegibPr4ZyGHmGxmJwYyHCt0MNvjY2oA1WPVRvXz2dno7Q5SFDR0sQaFKe +4knKfzGu8fngy//R1vlO+UE3vTQ3cgTaIpDsiQCVAwUQR4/2GXCgJE0e+ZJRAQEH +6QP9FVDSFnXCSPy+tNFlLhtpjVOEqREG30iezAVZlx+yJVSb3/sG0LRCvXB1w3td +jzW7A1iCvEQVb1yuNSFPb6Dq7TKoSpS8XZyCIetCpzab06D319Ubfcs2lHaDioY6 +ibSaysDrBDETyXg1eQBIUQ+9iltfkI6HRpm5vgz8d4iwieqJAJUDBRBHj/YgyNXt +KZX2F3EBASjtBACNzoDfjET153Zd3PQlj2X6b9BzjS8XHsjMuo+F04u9o3g78MSt ++g2HW5Xi1ORh/LFSrkK7Qi9jLREr3dKQM9jjhfvxidN80H8jNyUIUJ3d1/K123rP +z7GuXhXCfDCq/tjveUiVkoxQ1Q5h2OsXKqC0p7C7qpXKTg2CHLdbYTg/rIkAlQMF +EEeP9mAhg+GxOW8HiQEBRpAEAI9MQwE6xoG08vdkrn8/tZEfK/h3zc3UgT5sjME3 +NPbWD9o0W/KlIA7JKIpIYbX1M3GgGU5rlWmFyuRD5XVvu4NJ761PXAHenhg3wEk9 +TySAwH7Edlhr0M1goALxpjiAzrh+hc0x2rz2jMcuRQlSh19MMe9sc9pDgUaXl7QJ +Z51oiQCVAwUQR4/2colpYrhnjAoDAQHWPAP6AlqqzMhKJtWxVP4k10r06MwuUkOn +tAeuPL4semoKb8lTtuBG14vADXsoavifuq2iv4KQCncGn3yWglCUjG46DKLluZyG +uWjE44PEEiIs1zYzWo9F1Nw2C5VDR41/rzLqNctqr+bXac0lO3aRLgW1SkqJLI41 +M+yXMYkf99dM4cuJAJUDBRBHj/Z6OCLbR8w3Ty0BAUwaBACH9QViBa/sejJULNu8 +3i8B5tq0HOKvAzAQp/a79MxdFnhL8XrIhsTrprh3+/JvljrWLkfMe2tsVBTdTMJf +snjjCijgtuCKaR5ESyu1Kl2E8mhp1A032LWRYYrxSyJqklqNem4HeZAN4N1CzMoS +Iw5ELNeocuNmkBQn1xmkMYXiC4kAlQMFEEeP9pKcHL3i41xWNQEBqjgD/i9sEpQo +0YTW77za+n2rQD3141UZwql/F4cO0ds4sLSwJ3h4Ba8OkATHU1W2LbpogvpfvL6B +1H+4D7vo/VY/fSiNGUb8TjZfcj65ACToYokxK6PwBHL85jaWGh83kMS8pYDBL7zP +sJ3sCyayKwAXOFpT7doaZU5FsC7tNMwlnRCuiQCVAwUQR4/2t29Sk9ijm6ZVAQGP +TQP/Qbj1ZsqZfQn+7SXPmW0Y9+xUUQ351ecD1UX3yhuL195djP/O7ebeTiCBFkaG +gWfMZtNCtaPQr1BhXBF9Xkum4IseUlRz1mTsdrhbAVtL6mGWMYcxQFTx13pHiGYS +IaJhc+XQIxc7wmfW2LjOZpcHi0E2dhcjMEoWZGyEzKI/cJ2JAJUDBRBHj/bE71iW +ZNQy4Z0BAe8aA/4oiv/MRmiRdDrVY8kTIZWb4whGYLqKEScOEuqir0PrMtyEUkzP +YpkM1u3Cf4+zbtmgN16sx6DfyHAVGyI0U14hvnQhuVrrBs23dxGj2iciu14BvNJU +YVaAoAWSp8qA14fDOAGd1H/InQmDZJrAiH61wQwjLrU1oI44Dr+55KHgO4kAlQMF +EEeP9s3BnB0lEtNGHQEBxk4D/2WTAGSVuwDUGeIaHM1NVrgRcFFqrz37farxYNKx +7jZ1EqJXZXTqtSAUVc5LB8ko7V0P8w7CLso3Jj3hvFdYOt+6howpI/FO1Ur6RbTC +ik6RUMbHRvIxpcTzZvRmWlMGcMdJFcCxsliOG7cyjpeuisaGJFIhyqfpAdqMKRn2 +jOrqiQCVAwUQR4/5GcApykAW9MzpAQFuCgQAjaPwttPvJNegPa/KqZFVVO/VDaRm +9Aeiktw8lWlTE7BJ9SIePdsTEbKIzER/gVt85bOptJo6xpXaodoIjXWiSD+PHbdz +tuEp88zv0B0mJcKSRIPt/u+baAgR2dKR1jlNvEjbpCm9rei+vqRNREpdrk32ls5d +VwtrkbnFDuzLcgKJAJUDBRBHj/r11uCh/k++Kt0BAQvcBACq594Jrh+y+Pqf4bCL +8LrBqspvPL9MTMWDdwWvT7Yoaa+cyApuUWqpkyh8alWAwxnJmyw9I14zBr219862 +0Rb1oCo2TDL/pMz8WVpyjD0RIxs4FcoJODD52kYxhLadKk0OrCXfrpWvIcp4sRJa +kOWK3QzpD/0NtFJLZ+BnNq39h4kAlQMFEEeP+wK92o/WP+p9/QEBtVID/1AxNsk7 +/ktDwz/khcTsCLILgtuKh+7jZa6K8FhhoqNXbjyUhZYjGne6No72KJ52P6P7iPLu +SPDOmhu+z0kNTTm0KsWRSzQeUD08qyoB3qNcdxcRgAOJHl0MCXUwSxumfBb4iJq2 +5282RCnsKroyWAhV8KjoJer1hTKCsu58Lqrv +=jDs3 +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits KeyID Created Expires Algorithm Use pub 1024 0x7093B841 2006-12-16 ---------- RSA Sign & Encrypt f16 Fingerprint16 = D9 FD C5 6B EE 1E 7A A8 CE 27 D9 B9 55 8B 56 B6 uid Sendmail Signing Key/2007 @@ -1729,4 +1792,4 @@ =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.25 $, Last updated $Date: 2007/01/02 22:38:08 $ +$Revision: 8.26 $, Last updated $Date: 2008/01/22 06:20:27 $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/README#2 (text+ko) ==== @@ -312,7 +312,7 @@ are installed in a location other than those which your compiler searches, you will need to provide that directory when building: - Build -I/path/to/include/directory + ./Build -I/path/to/include/directory If you are using Berkeley DB versions 1.85 or 1.86, you are *strongly* urged to upgrade to DB version 2 or later, available from @@ -464,4 +464,4 @@ test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.93 $, Last updated $Date: 2005/09/16 20:08:50 $ +$Revision: 8.94 $, Last updated $Date: 2008/02/12 16:40:05 $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ==== @@ -1,11 +1,47 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1909 2007/10/31 16:04:13 ca Exp $ + $Id: RELEASE_NOTES,v 8.1926 2008/05/03 03:34:26 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.3/8.14.3 2008/05/03 + During ruleset processing the generation of a key for a map + lookup and the parsing of the default value was broken + for some macros, e.g., $|, which caused the BlankSub + character to be inserted into the workspace and thus + failures, e.g., rules that should have matched did not. + 8.14.2 caused a regression: it accessed (macro) storage which was + freed before. First instance of the problem reported by + Matthew Dillon of DragonFlyBSD; variations of the same + bug reported by Todd C. Miller of OpenBSD, Moritz + Jodeit, and Dave Hayes. + Improve pathname length checks for persistent host status. Patch + from Joerg Sonnenberger of DragonFlyBSD. + Reword misleading SMTP reply text for FEATURE(`badmx'). Problem + noted by Beth Halsema. + The read timeout was fixed to be Timeout.datablock if STARTTLS + was activated. This may cause problems if that value + is lowered from its default. Problem noted by Jens Elkner. + CONFIG: Using LOCAL_TLS_CLIENT caused the tls_client ruleset + to operate incorrectly. Problem found by Werner Wiethege. + LIBMILTER: Omitting some protocol steps via the xxfi_negotiate() + callback did not work properly. The patchlevel of + libmilter has been set to 1 so a milter can determine + whether libmilter contains this fix. + MAKEMAP: If a delimiter is specified (-t) use that also when + dumping a map. Patch from Todd C. Miller of OpenBSD. + Portability: + Add support for Darwin 9.x (Mac OS X 10.5). + Support shared libraries in Darwin 8 and 9. Patch from + Chris Behrens of Concentric. + Add support for SCO OpenServer 6, patch from Boyd Gerber. + DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing path. + Added Files: + devtools/OS/Darwin.9.x + devtools/OS/OSR.i386 + 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 @@ -24,7 +60,7 @@ 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 + 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. ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/README#2 (text+ko) ==== @@ -1008,7 +1008,9 @@ MASQUERADE_DOMAIN_FILE, see below). If VIRTUSER_DOMAIN or VIRTUSER_DOMAIN_FILE is used, then the entries of class {VirtHost} are added to class {R}, i.e., relaying is allowed - to (and from) those domains. The default map definition is: + to (and from) those domains, which by default includes also + all subdomains (see relay_hosts_only). The default map + definition is: hash /etc/mail/virtusertable @@ -4699,4 +4701,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.722 $, Last updated $Date: 2007/04/03 21:26:58 $ +$Revision: 8.724 $, Last updated $Date: 2008/02/15 23:05:32 $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ==== @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### 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 +##### built by ca@wiz.smi.sendmail.com on Fri May 2 20:39:00 PDT 2008 +##### in /extra/home/ca/sm-8.14.3/OpenSource/sendmail-8.14.3/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.732 2007/04/20 00:53:30 ca Exp $ ##### +##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ ##### # level 10 config file format V10/Berkeley @@ -114,7 +114,7 @@ # Configuration version number -DZ8.14.2/Submit +DZ8.14.3/Submit ############### ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/m4/proto.m4#2 (text+ko) ==== @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -1956,7 +1956,7 @@ # Recursively run badmx check on each mx. R<$*><:$+:$*><:$*> <$1><:$3><: $4 $(badmx $2 $):> # See if any of them fail. -R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Illegal MX record for recipient host "$1 +R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Illegal MX record for host "$1 # Reverse the mxlists so we can use the same argument order again. R<$*><$*><$*> $:<$1><$3><$2> R<$*><:$+:$*><:$*> <$1><:$3><:$4 $(dnsA $2 $) :> @@ -1965,7 +1965,7 @@ R<$*><$*><$*> $:<$1><$3><$2> R<$*><:$+:$*><:$*> <$1><:$3><:$4 $(BadMXIP $2 $) :> -R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Invalid MX record for recipient host "$1', +R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Invalid MX record for host "$1', `dnl') @@ -2686,9 +2686,9 @@ dnl STARTTLS: called from smtp() after STARTTLS has been accepted Stls_client ifdef(`_LOCAL_TLS_CLIENT_', `dnl -R$* $: $1 $| $>"Local_tls_client" $1 -R$* $| $#$* $#$2 -R$* $| $* $: $1', `dnl') +R$* $: $1 $>"Local_tls_client" $1 +R$* $#$* $#$2 +R$* $* $: $1', `dnl') ifdef(`_ACCESS_TABLE_', `dnl dnl store name of other side R$* $: $(macro {TLS_Name} $@ $&{server_name} $) $1 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/cf/m4/version.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2007 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2008 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.195 2008/04/17 17:04:30 ca Exp $') # divert(0) # Configuration version number -DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.14.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/include/libmilter/mfapi.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -7,7 +7,7 @@ * the sendmail distribution. * * - * $Id: mfapi.h,v 8.77 2006/11/02 02:44:07 ca Exp $ + * $Id: mfapi.h,v 8.78 2008/02/27 22:30:34 ca Exp $ */ /* @@ -18,7 +18,7 @@ # define _LIBMILTER_MFAPI_H 1 #ifndef SMFI_VERSION -# define SMFI_VERSION 0x01000000 /* libmilter version number */ +# define SMFI_VERSION 0x01000001 /* libmilter version number */ #endif /* ! SMFI_VERSION */ #define SM_LM_VRS_MAJOR(v) (((v) & 0x7f000000) >> 24) ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/Makefile.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.78 2007/02/05 19:21:29 ca Exp $ +dnl $Id: Makefile.m4,v 8.80 2008/04/08 05:23:44 ca Exp $ include(confBUILDTOOLSDIR`/M4/switch.m4') dnl only required for compilation of EXTRAS ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 (text+ko) ==== @@ -2,7 +2,7 @@ smfi_opensocket

    smfi_opensocket

    @@ -24,16 +24,21 @@
    + + +
    - Trusty + Trusty
    @@ -100,6 +109,9 @@ +
    ==== //depot/projects/trustedbsd/www/privileges.page#4 (text+ko) ==== @@ -24,12 +24,12 @@ SUCH DAMAGE. --> - + TrustedBSD POSIX.1e Privileges - $P4: //depot/projects/trustedbsd/www/privileges.page#3 $ + $P4: //depot/projects/trustedbsd/www/privileges.page#4 $ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 19:58:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134191065671; Mon, 25 Aug 2008 19:58: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 CAF2C106566B for ; Mon, 25 Aug 2008 19:58:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ACB6F8FC1A for ; Mon, 25 Aug 2008 19:58:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PJwbZN080053 for ; Mon, 25 Aug 2008 19:58:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PJwbNi080051 for perforce@freebsd.org; Mon, 25 Aug 2008 19:58:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 19:58:37 GMT Message-Id: <200808251958.m7PJwbNi080051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148429 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, 25 Aug 2008 19:58:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=148429 Change 148429 by rwatson@rwatson_fledge on 2008/08/25 19:57:39 Add specific pages for extended attributes / UFS2, GEOM, and OpenPAM, rather than just documenting them on the components page. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#12 edit .. //depot/projects/trustedbsd/www/extattr.page#1 add .. //depot/projects/trustedbsd/www/geom.page#1 add .. //depot/projects/trustedbsd/www/heading.xsl#7 edit .. //depot/projects/trustedbsd/www/news-selected.png#1 add .. //depot/projects/trustedbsd/www/news.page#13 edit .. //depot/projects/trustedbsd/www/news.png#1 add .. //depot/projects/trustedbsd/www/openpam.page#1 add .. //depot/projects/trustedbsd/www/sidebar.xml#12 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#12 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#11 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#12 $ STYLESHEET= page.xsl @@ -37,11 +37,14 @@ SRCS+= legal.page SRCS+= beastie.page SRCS+= developers.page +SRCS+= extattr.page +SRCS+= geom.page SRCS+= mailinglists.page SRCS+= components.page SRCS+= docs.page SRCS+= mac.page SRCS+= openbsm.page +SRCS+= openpam.page SRCS+= sebsd.page SRCS+= sedarwin.page SRCS+= audit.page @@ -61,7 +64,9 @@ IMGS+= horizontalbar1.gif IMGS+= mac.png mac-selected.png IMGS+= mailinglists.png mailinglists-selected.png -IMGS+= minipemaquidlight.jpg pemaquidlight.jpg powerlogo.gif +IMGS+= minipemaquidlight.jpg +IMGS+= news.png news-selected.png +IMGS+= pemaquidlight.jpg powerlogo.gif IMGS+= openbsm.png openbsm-selected.png IMGS+= openpam.png openpam-selected.png IMGS+= privileges.png privileges-selected.png ==== //depot/projects/trustedbsd/www/heading.xsl#7 (text+ko) ==== @@ -113,9 +113,9 @@ - + - + ==== //depot/projects/trustedbsd/www/news.page#13 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#12 $ + $P4: //depot/projects/trustedbsd/www/news.page#13 $ ==== //depot/projects/trustedbsd/www/sidebar.xml#12 (text+ko) ==== @@ -1,5 +1,5 @@ - +
      From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:13:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A76810656D6; Mon, 25 Aug 2008 20:13: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 3E03310656C4 for ; Mon, 25 Aug 2008 20:13:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FE8E8FC24 for ; Mon, 25 Aug 2008 20:13:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKDrkJ082434 for ; Mon, 25 Aug 2008 20:13:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKDrfa082432 for perforce@freebsd.org; Mon, 25 Aug 2008 20:13:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:13:53 GMT Message-Id: <200808252013.m7PKDrfa082432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148431 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, 25 Aug 2008 20:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=148431 Change 148431 by rwatson@rwatson_fledge on 2008/08/25 20:13:28 Rather than using a mini-database of developers, e-mail addresses, and interests, just list them by name in a table. Add some new names. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#13 edit .. //depot/projects/trustedbsd/www/dev-stylesheet.xsl#4 delete .. //depot/projects/trustedbsd/www/developers.dev#4 delete .. //depot/projects/trustedbsd/www/developers.page#1 add Differences ... ==== //depot/projects/trustedbsd/www/Makefile#13 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#12 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#13 $ STYLESHEET= page.xsl @@ -87,7 +87,6 @@ GLOBAL_XML= sidebar.xml -STYLESHEETS= dev # Developers' listing. STYLESHEETS+= bib # Bibliography. INDEXLINK= home.html From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:21:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AF891065673; Mon, 25 Aug 2008 20:21: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 17B8C10656F0 for ; Mon, 25 Aug 2008 20:21:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED2058FC23 for ; Mon, 25 Aug 2008 20:21:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKL357083096 for ; Mon, 25 Aug 2008 20:21:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKL3Eu083094 for perforce@freebsd.org; Mon, 25 Aug 2008 20:21:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:21:03 GMT Message-Id: <200808252021.m7PKL3Eu083094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148435 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, 25 Aug 2008 20:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=148435 Change 148435 by rwatson@rwatson_fledge on 2008/08/25 20:20:16 Enhanced use of paragraph break. Affected files ... .. //depot/projects/trustedbsd/www/legal.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/legal.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/legal.page#2 $ + $P4: //depot/projects/trustedbsd/www/legal.page#3 $ @@ -52,8 +52,9 @@ by the authors of the component in question. This license permits both commercial and non-commercial use of the code, providing that the copyright is observed and documented, and that the authors may - not be held liable for damages associated with use of the code. - Generally speaking, this places few if any restrictions on any + not be held liable for damages associated with use of the code.

      + +

      Generally speaking, this places few (if any) restrictions on any real-world use, and legally consumers of the code are under no obligation to provide compensation to the authors. However, machinery is in place to accept donations to the TrustedBSD project to allow From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:37:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC921065687; Mon, 25 Aug 2008 20:37: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 23A68106567B for ; Mon, 25 Aug 2008 20:37:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 048B58FC08 for ; Mon, 25 Aug 2008 20:37:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKbLTL089900 for ; Mon, 25 Aug 2008 20:37:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKbLNv089898 for perforce@freebsd.org; Mon, 25 Aug 2008 20:37:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:37:21 GMT Message-Id: <200808252037.m7PKbLNv089898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148438 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, 25 Aug 2008 20:37:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=148438 Change 148438 by rwatson@rwatson_fledge on 2008/08/25 20:37:21 Add legal page to button bar. Add source code information page, which pulls most of the remaining useful information off of the old components page. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#14 edit .. //depot/projects/trustedbsd/www/heading.xsl#8 edit .. //depot/projects/trustedbsd/www/legal-selected.png#1 add .. //depot/projects/trustedbsd/www/legal.page#4 edit .. //depot/projects/trustedbsd/www/legal.png#1 add .. //depot/projects/trustedbsd/www/sourcecode-selected.png#1 add .. //depot/projects/trustedbsd/www/sourcecode.page#1 add .. //depot/projects/trustedbsd/www/sourcecode.png#1 add Differences ... ==== //depot/projects/trustedbsd/www/Makefile#14 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#13 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#14 $ STYLESHEET= page.xsl @@ -49,6 +49,7 @@ SRCS+= sedarwin.page SRCS+= audit.page SRCS+= privileges.page +SRCS+= sourcecode.page SRCS+= acls.page SRCS+= bsmtrace.page @@ -62,6 +63,7 @@ IMGS+= geom.png geom-selected.png IMGS+= home.png home-selected.png IMGS+= horizontalbar1.gif +IMGS+= legal.png legal-selected.png IMGS+= mac.png mac-selected.png IMGS+= mailinglists.png mailinglists-selected.png IMGS+= minipemaquidlight.jpg @@ -73,6 +75,7 @@ IMGS+= resources.gif trustydibmed2.jpg trustyshadow.gif IMGS+= sebsd.png sebsd-selected.png IMGS+= sedarwin.png sedarwin-selected.png +IMGS+= sourcecode.png sourcecode-selected.png IMGS+= trustyteenie.gif verticalbar1.gif wwwheader.gif IMGS+= trustyheader.png ==== //depot/projects/trustedbsd/www/heading.xsl#8 (text+ko) ==== @@ -62,6 +62,14 @@ + + + + + + + + @@ -121,6 +129,14 @@ + + + + + + + + ==== //depot/projects/trustedbsd/www/legal.page#4 (text+ko) ==== @@ -32,12 +32,12 @@ SUCH DAMAGE. --> - - Legal + + Legal Information - $P4: //depot/projects/trustedbsd/www/legal.page#3 $ + $P4: //depot/projects/trustedbsd/www/legal.page#4 $ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:39:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A832A106567A; Mon, 25 Aug 2008 20:39: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 6BA611065678 for ; Mon, 25 Aug 2008 20:39:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32AD18FC21 for ; Mon, 25 Aug 2008 20:39:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKdOqS090033 for ; Mon, 25 Aug 2008 20:39:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKdOUI090031 for perforce@freebsd.org; Mon, 25 Aug 2008 20:39:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:39:24 GMT Message-Id: <200808252039.m7PKdOUI090031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148439 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, 25 Aug 2008 20:39:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=148439 Change 148439 by rwatson@rwatson_fledge on 2008/08/25 20:39:19 Don't limit size of framing table to 800 pixels. Requested by: bz Affected files ... .. //depot/projects/trustedbsd/www/page.xsl#10 edit Differences ... ==== //depot/projects/trustedbsd/www/page.xsl#10 (text+ko) ==== @@ -27,7 +27,7 @@ - +
      + + OS-versie + STP-modi + Standaard modus + + + + + + &os; 5.4—&os; 6.2 + STP + STP + + + + &os; 6.3+ + RSTP of STP + STP + + + + &os; 7.0+ + RSTP of STP + RSTP + + + + + + Spanning Tree kan op lid-interfaces worden geactiveerd met + het commando stp. Voor een bridge met + fxp0 en fxp1 + ale huidige interfaces, wordt STP met het volgende geactiveerd: + + + &prompt.root; ifconfig bridge0 stp fxp0 stp fxp1 +bridge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + ether d6:cf:d5:a0:94:6d + id 00:01:02:4b:d4:50 priority 32768 hellotime 2 fwddelay 15 + maxage 20 holdcnt 6 proto rstp maxaddr 100 timeout 1200 + root id 00:01:02:4b:d4:50 priority 32768 ifcost 0 port 0 + member: fxp0 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 3 priority 128 path cost 200000 proto rstp + role designated state forwarding + member: fxp1 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 4 priority 128 path cost 200000 proto rstp + role designated state forwarding + + De bridge heeft spanning tree ID + 00:01:02:4b:d4:50 en prioriteit + 32768. Aangezien het + root id hetzelfde is geeft dit aan dat dit de + hoofd-bridge voor de boom is. + + Een andere bridge in het netwerk heeft spanning tree ook + geactiveerd: + + bridge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + ether 96:3d:4b:f1:79:7a + id 00:13:d4:9a:06:7a priority 32768 hellotime 2 fwddelay 15 + maxage 20 holdcnt 6 proto rstp maxaddr 100 timeout 1200 + root id 00:01:02:4b:d4:50 priority 32768 ifcost 400000 port 4 + member: fxp0 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 4 priority 128 path cost 200000 proto rstp + role root state forwarding + member: fxp1 flags=1c7<LEARNING,DISCOVER,STP,AUTOEDGE,PTP,AUTOPTP> + port 5 priority 128 path cost 200000 proto rstp + role designated state forwarding + + De reegl root id 00:01:02:4b:d4:50 priority 32768 + ifcost 400000 port 4 geeft aan dat de hoofd-bridge + 00:01:02:4b:d4:50 is zoals boven en dat de + padkosten 400000 zijn vanaf deze bridge, het + pad naar de hoofd-bridge gaat via port 4 + welke fxp0 is. + + + + Geavanceerd bridgen - De netwerkkaart selecteren + Verkeersstromen reconstrueren + + De bridge ondersteunt monitor-modus, waarin de pakketten + worden verwijderd nadat ze door &man.bpf.4; zijn verwerkt, + en ze niet verder verwerkt of doorgestuurd worden. Dit kan + worden gebruikt om de invoer van twee of meer interfaces naar + een enkele &man.bpf.4;-stroom te multiplexen. Dit is nuttig + voor het reconstrueren van het verkeer voor netwerktaps welke + de RX/TX-signalen over twee verschillende interfaces uitzenden + . - Een bridge heeft minstens twee netwerkkaarten nodig om te - functioneren. Helaas ondersteunen niet alle netwerkkaarten - bridging. Raadpleeg &man.bridge.4; voor details over de - ondersteunde kaarten. + Om de invoer van vier netwerkinterfaces als + één stroom te lezen: - Installeer en test de twee netwerkkaarten alvorens verder - te gaan. + &prompt.root; ifconfig bridge0 addm fxp0 addmfxp1 addm fxp2 addm fxp3 monitor up +&prompt.root; tcpdump -i bridge0 - Kernelinstellingen wijzigingen + SPAN poorten - - kernelopties + Van elk Ethernet-frame dat door de bridge wordt ontvangen + wordt er een kopie naar de aangewezen SPAN-poort verstuurd. + Het aantal geconfigureerde SPAN-poorten op een bridge is + onbeperkt, indien een interface aangewezen is als SPAN-poort + kan het niet ook als gewone bridge-poort gebruikt worden. Dit + is het nuttigste voor het passief afluisteren van een + gebridged netwerk op een andere host die met een van de + SPAN-poorten van de brdige verbonden is. - BRIDGE - + Om een kopie van alle frames naar het interface + fxp4 te versturen: - Om kernelondersteuning voor bridging aan te zetten, dient - de volgende regel aan het kernelinstellingenbestand toegevoegd - te worden: + &prompt.root; ifconfig bridge0 span fxp4 + - options BRIDGE + + Privé-interfaces - Hierna dient de kernel opnieuw gebouwd te worden. + Een privé-interface stuurt geen verkeer door naar + poorten die niet ook een privé-interface zijn. Het + verkeer wordt onvoorwaardelijk geblokkeerd, dus worden er + geen Ethernet-frames doorgestuurd, inclusief ARP. Indien + verkeer selectief dient te worden geblokkeerd dient er in + plaats hiervan een firewall gebruikt te worden. - Firewall-ondersteuning + Klevende interfaces + + Indien een lid-interface van een bridge als klevend is + gemarkeerd worden dynamisch geleerde adresregels als statisch + behandelt wanneer ze in de doorstuurcache komen. Klevende + interfaces vallen nooit uit de cache en worden nooit vervangen + , zelfs niet als het adres op een andere interface wordt + gezien. Dit biedt het voordeel van statische adresregels + zonder dat de doorstuurtabel van te voren gevuld hoeft te + worden, cliënten die geleerd zijn op een bepaald segment + van de bridge kunnen niet roamen naar een ander segment. + + + Een ander voorbeeld voor het gebruik van klevende adressen + zou het combineren van de bridge met VLANs zijn om een router + te creëren waar klantnetwerken geïsoleerd zijn + zonder dat IP-adresruimte verspild wordt. Neem aan dat + KlantA op + vlan100 zit en KlantB op + vlan101. De bridge heeft het adres + 192.168.0.1 en is tevens een + internet-router. + + &prompt.root; ifconfig bridge0 addm vlan100 sticky vlan100 addm vlan101 sticky vlan101 +&prompt.root; ifconfig bridge0 inet 192.168.0.1/24 + + Beide cliënten zien 192.168.0.1 als hun standaard gateway + en aangezien de bridge-cache kleverig is kunnen ze niet het + MAC-adres van de andere klant spoofen om hun verkeer op te + vangen. - firewall + Alle communicatie tussen de VLANs kan geblokkeerd worden + door het gebruik van privé-interfaces (of een firewall) + : - Indien de bridge als firewall gebruikt gaat worden, dient - ook de optie IPFIREWALL toegevoegd te - worden. Raadpleeg voor algemene - informatie over het instellen van de bridge als firewall. + &prompt.root; ifconfig bridge0 private vlan100 private vlan101 - Indien het nodig is om niet-IP-pakketten (zoals ARP) door - de bridge moeten stromen, dient dit in de firewall ingesteld - te worden. De optie IPFIREWALL_DEFAULT_TO_ACCEPT - dient hiervoor. Merk op dat dit de standaardregel van de - firewall zo verandert dat het elk pakket accepteert. Ben er - zeker van de betekenis van deze verandering op de - regelverzameling voordat deze optie wordt ingesteld. + De klanten zijn compleet geïsoleerd van elkaar, het + volledige /24 adresruimte kan + zonder subnetten toegewezen worden. - Bandbreedtebeheersing ondersteuning + Adresbeperkingen + + Het aantal unieke bron-MAC-adressen achter een interface + kan beperkt zijn. Wanneer de limiet bereikt is worden + pakketten met een onbekend bronadres gedropt totdat een + bestaande ingang in de host-cache vervalt of wordt verwijderd. + + + Het volgende voorbeeld stelt het maximum aantal + Ethernet-apparaten voor KlantA op + vlan100 in op 10. - Indien het gewenst is om de bridge als beheerder voor de - bandbreedte te gebruikken, dient de optie - DUMMYNET aan de kernelinstellingen te - worden toegevoegd. Raadpleeg &man.dummynet.4; voor meer - informatie. + &prompt.root; ifconfig bridge0 ifmaxaddr vlan100 10 - - - De bridge inschakelen + + SNMP-monitoring - Voeg de volgende regel aan /etc/sysctl.conf - toe om de bridge op runtime aan te zetten: + De bridge-interface en STP-parameters kunnen gemonitord + worden via het SNMP-daemon dat met het basis &os;-systeem + wordt meegeleverd. De geëxporteerde bridge-MIBs houden + zich an de standaarden van de IETF zodat elke SNMP-cliënt + of monitorpakket kan worden gebruikt om de gegevens te + verzamelen. - net.link.ether.bridge.enable=1 + Op de bridge-machine dient de regel + begemotSnmpdModulePath."bridge" = + "/usr/lib/snmp_bridge.so" van + /etc/snmp.config geactiveerd te worden en + het daemon bsnmpd gestart te worden + . Andere instellingen zoals gemeenschapsnamen en + toegangslijsten dienen eventueel aangepast te worden. Zie + &man.bsnmpd.1; en &man.snmp.bridge.3; voor meer informatie. + - en de volgende regel om bridging op de gespecificeerde - interfaces aan te zetten (vervang if1 - en if2 met de namen van de twee - netwerkkaarten): + Het volgende voorbeeld gebruikt de software + Net-SNMP (net-mgmt/net-snmp om een bridge te + ondervragen, de port net-mgmt/bsnmptools kan ook worden + gebruikt. Voeg de volgende regels toe aan + $HOME/.snmp/snmp.conf op de + SNMP-cliënt-host om de MIB-definities van de bridge in + Net-SNMP te importeren: - net.link.ether.bridge.config=if1,if2 + mibdirs +/usr/share/snmp/mibs +mibs +BRIDGE-MIB:RSTP-MIB:BEGEMOT-MIB:BEGEMOT-BRIDGE-MIB - Indien het gewenst is om de gebridgede pakketten te filteren - met &man.ipfw.8;, dient het volgende toegevoegd te worden: + Om een enkele bridge via de IETF BRIDGE-MIB (RFC4188) te + monitoren: - net.link.ether.bridge.ipfw=1 + &prompt.user; snmpwalk -v 2c -c public bridge1.example.com mib-2.dot1dBridge +BRIDGE-MIB::dot1dBaseBridgeAddress.0 = STRING: 66:fb:9b:6e:5c:44 +BRIDGE-MIB::dot1dBaseNumPorts.0 = INTEGER: 1 ports +BRIDGE-MIB::dot1dStpTimeSinceTopologyChange.0 = Timeticks: (189959) 0:31:39.59 centi-seconds +BRIDGE-MIB::dot1dStpTopChanges.0 = Counter32: 2 +BRIDGE-MIB::dot1dStpDesignatedRoot.0 = Hex-STRING: 80 00 00 01 02 4B D4 50 +... +BRIDGE-MIB::dot1dStpPortState.3 = INTEGER: forwarding(5) +BRIDGE-MIB::dot1dStpPortEnable.3 = INTEGER: enabled(1) +BRIDGE-MIB::dot1dStpPortPathCost.3 = INTEGER: 200000 +BRIDGE-MIB::dot1dStpPortDesignatedRoot.3 = Hex-STRING: 80 00 00 01 02 4B D4 50 +BRIDGE-MIB::dot1dStpPortDesignatedCost.3 = INTEGER: 0 +BRIDGE-MIB::dot1dStpPortDesignatedBridge.3 = Hex-STRING: 80 00 00 01 02 4B D4 50 +BRIDGE-MIB::dot1dStpPortDesignatedPort.3 = Hex-STRING: 03 80 +BRIDGE-MIB::dot1dStpPortForwardTransitions.3 = Counter32: 1 +RSTP-MIB::dot1dStpVersion.0 = INTEGER: rstp(2) - Voor versies lager dan &os; 5.2-RELEASE dienen echter - de volgende regels gebruikt te worden: + De waarde dot1dStpTopChanges.0 is twee + wat betekent dat de topologie van de STP-bridge twee maal + veranderd is, een topologieverandering houdt in dat + één of meerdere links in het netwerk zijn + veranderd of hebben gefaald en dat er een nieuwe boom is + berekend. De waarde + dot1dStpTimeSinceTopologyChange.0 laat zien + wanneer dit gebeurde. - net.link.ether.bridge=1 -net.link.ether.bridge_cfg=if1,if2 -net.link.ether.bridge_ipfw=1 - + Om meerdere bridge-interfaces te monitoren kan men het + privé BEGEMOT-BRIDGE-MIB gebruiken: - - Overige informatie + &prompt.user; snmpwalk -v 2c -c public bridge1.example.com +enterprises.fokus.begemot.begemotBridge +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge0" = STRING: bridge0 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge2" = STRING: bridge2 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge0" = STRING: e:ce:3b:5a:9e:13 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge2" = STRING: 12:5e:4d:74:d:fc +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge0" = INTEGER: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge2" = INTEGER: 1 +... +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge0" = Timeticks: (116927) 0:19:29.27 centi-seconds +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge2" = Timeticks: (82773) 0:13:47.73 centi-seconds +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge0" = Counter32: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge2" = Counter32: 1 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge0" = Hex-STRING: 80 00 00 40 95 30 5E 31 +BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge2" = Hex-STRING: 80 00 00 50 8B B8 C6 A9 - Indien het gewenst is om de bridge met &man.ssh.1; over het - netwerk te benaderen, is het juist om aan één van - de netwerkkaarten een IP-adres toe te kennen. De algemene - gedachte is dat het toekennen van een IP-adres aan beide kaarten - een slecht idee is. + Om de bridge-interface die via de subboom + mib-2.dot1dBridge wordt gemonitord te + veranderen: - Indien er meerdere bridges in het netwerk aanwezig zijn, kan - er niet meer dan één pad zijn tussen twee - willekeurige werkstations. Technisch gezien betekent dit dat er - geen ondersteuning is voor het koppelen van opspannende bomen. - - Een bridge kan latency toevoegen aan de tijden van - &man.ping.8;, in het bijzonder voor verkeer dat van het ene naar - het andere segment gaat. + &prompt.user; snmpset -v 2c -c private bridge1.example.com +BEGEMOT-BRIDGE-MIB::begemotBridgeDefaultBridgeIf.0 s bridge2 + @@ -3150,8 +3474,8 @@ - De poort Etherboot ( - net/etherboot) maakt + De poort Etherboot + (net/etherboot) maakt code aan dat naar een ROM geschreven kan worden en dat kernels over het netwerk opstart. De code kan òfwel naar een opstart-PROM op een netwerkkaart @@ -3164,8 +3488,8 @@ - Een voorbeeldscript ( - /usr/share/examples/diskless/cone_root) + Een voorbeeldscript + (/usr/share/examples/diskless/cone_root) vergemakkelijkt het aanmaken en beheren van het root bestandssysteem van het werkstation op de server. Het kan nodig zijn dat het script wat aangepast moet worden, maar het @@ -3273,8 +3597,8 @@ DHCP biedt echter een aantal voordelen boven BOOTP (fijnere instellingsbestanden, mogelijkheid om PXE te gebruiken, en vele - anderen die niet direct verband houden met schijfloos werken - ), er zal hoofdzakelijk een opstelling met + anderen die niet direct verband houden met schijfloos + werken), er zal hoofdzakelijk een opstelling met DHCP worden beschreven, met analoge voorbeelden voor &man.bootpd.8; indien mogelijk. De voorbeeldopstelling zal het softwarepakket van @@ -3439,8 +3763,8 @@ pxeboot en niet de kernel laadt. Er zijn andere interessante mogelijkheden, zoals het laden van pxeboot vanuit de map /boot van een &os; CD-ROM ( - aangezien &man.pxeboot.8; een GENERIC + class="directory">/boot van een &os; CD-ROM + (aangezien &man.pxeboot.8; de GENERIC kernel kan laden, bestaat de mogelijkheid om PXE te gebruiken om van een CDROM op afstand op te starten. @@ -3515,8 +3839,8 @@ role="package">net/etherboot geïnstalleerd te worden. - De instellingen van Etherboot ( - i.e. om TFTP in plaats van + De instellingen van Etherboot + (i.e. om TFTP in plaats van NFS te gebruiken) kunnen gewijzigd worden door het bestand Config in de bronmap van Etherboot te bewerken. From owner-p4-projects@FreeBSD.ORG Tue Aug 26 08:14:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B41391065739; Tue, 26 Aug 2008 08:14: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 75C031065678 for ; Tue, 26 Aug 2008 08:14:38 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F2B78FC25 for ; Tue, 26 Aug 2008 08:14:38 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q8EcSQ098617 for ; Tue, 26 Aug 2008 08:14:38 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q8EcMe098615 for perforce@freebsd.org; Tue, 26 Aug 2008 08:14:38 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 Aug 2008 08:14:38 GMT Message-Id: <200808260814.m7Q8EcMe098615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148497 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, 26 Aug 2008 08:14:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=148497 Change 148497 by trasz@trasz_traszkan on 2008/08/26 08:13:40 Update TODO. Performance problems seem to be fixed. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#47 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#47 (text+ko) ==== @@ -6,9 +6,6 @@ to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. -- Do not store trivial ACLs. That should fix a massive (~4x) - slowdown observed when untarring ports tree. - - Make 'struct acl' variable size. - Benchmark things. From owner-p4-projects@FreeBSD.ORG Tue Aug 26 10:03:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77F9C10656FC; Tue, 26 Aug 2008 10:03: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 30A4110656D8 for ; Tue, 26 Aug 2008 10:03:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29A0B8FC1D for ; Tue, 26 Aug 2008 10:03:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QA3T25022277 for ; Tue, 26 Aug 2008 10:03:29 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QA3TKo022275 for perforce@freebsd.org; Tue, 26 Aug 2008 10:03:29 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 Aug 2008 10:03:29 GMT Message-Id: <200808261003.m7QA3TKo022275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148502 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, 26 Aug 2008 10:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=148502 Change 148502 by trasz@trasz_traszkan on 2008/08/26 10:03:16 Fix flags handling, _again_ ;-/ With this change, the kernel passes the fstest. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#17 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#17 (text+ko) ==== @@ -320,7 +320,7 @@ * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. */ - if (mode & (VWRITE | VAPPEND)) { + if (mode & VMODIFY_PERMS) { switch (vp->v_type) { case VDIR: case VLNK: @@ -333,8 +333,13 @@ } } - /* If immutable bit set, nobody gets to write it. */ - if ((mode & (VWRITE | VAPPEND)) && (ip->i_flags & (IMMUTABLE | SF_SNAPSHOT))) + /* + * If immutable bit set, nobody gets to write it. + * "& ~VADMIN_PERMS" is here, because without it, + * it would be impossible to remove the IMMUTABLE flag. + */ + if ((mode & (VMODIFY_PERMS & ~VADMIN_PERMS)) && + (ip->i_flags & (IMMUTABLE | SF_SNAPSHOT))) return (EPERM); #ifdef UFS_ACL From owner-p4-projects@FreeBSD.ORG Tue Aug 26 10:52:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E9801065672; Tue, 26 Aug 2008 10:52: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 4E13910656D0 for ; Tue, 26 Aug 2008 10:52:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48FCB8FC14 for ; Tue, 26 Aug 2008 10:52:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QAqTJL026501 for ; Tue, 26 Aug 2008 10:52:29 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QAqI8j026491 for perforce@freebsd.org; Tue, 26 Aug 2008 10:52:18 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 Aug 2008 10:52:18 GMT Message-Id: <200808261052.m7QAqI8j026491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148505 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, 26 Aug 2008 10:52:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=148505 Change 148505 by trasz@trasz_traszkan on 2008/08/26 10:51:33 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/miscbltin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/stty/modes.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/stty/print.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/stty/stty.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/common.opt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/CommitLog#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/INSTALL#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/NEWS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/README.bk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/README.patches#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/README.versions#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/TODO#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/bootstrap#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/build#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/compile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/config.guess#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/config.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/config.sub#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/configure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/configure.ac#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/configure.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/depcomp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/flock-build#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/config.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/groups.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/index.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/patches.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/porting.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/quick.html#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/release.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/include/version.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/install-sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/missing#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/genver#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/compile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/util/tg.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/version#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ntp/version.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/readconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/devfs.rules#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.amd64/ttys#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.arm/ttys#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.i386/ttys#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.ia64/ttys#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.mips/ttys#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/freebsd-update.conf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/login.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/security/550.ipfwlimit#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/kernel#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.firewall#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/random/random.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/random/randomize_fd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/random/randomize_fd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/complex.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_ustar_filenames.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbluetooth/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbluetooth/bluetooth.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Symbol.map#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/grantpt.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/grantpt.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/ptsname.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/ptsname.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/posix_openpt.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/setfib.2#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/uuid/uuid.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/uuid/uuid_stream.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_cptime.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_getcptime.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_getpcpu.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_pcpu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpcap/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/thread_db.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_class.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/Symbol.map#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/man/cimag.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_asinf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_cimag.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_cimagf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_cimagl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_conj.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_conjf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_conjl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_cproj.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_cprojf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_cprojl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/s_csqrtl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/pt_chown/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/libexec/pt_chown/pt_chown.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/virstor/geom_virstor.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/regdomain.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_aiboost.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_asus.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_fujitsu.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_ibm.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_panasonic.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_sony.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_toshiba.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ata.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bpf.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/et.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ichwd.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/io.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/linux.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_aiboost.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_asus.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_fujitsu.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_ibm.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_panasonic.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_sony.4#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/acpi_toshiba.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/dpms.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/glxsb.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/ichwd.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/io.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/linux.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/ndis.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/miibus.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ndis.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/pts.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/pty.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/rum.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snp.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/tcp.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/termios.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/uipaq.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/upgt.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/condvar.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/device_get_children.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sleep.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/Theory#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/northamerica#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/endian.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.i386#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.sparc64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aha/aha.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ad7418.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds1339.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/io/iodev.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/led/led.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/mii.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snp/snp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sym/sym_hipd.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 10:54:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAE931065687; Tue, 26 Aug 2008 10:54: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 7E9011065684 for ; Tue, 26 Aug 2008 10:54:31 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A8AF8FC12 for ; Tue, 26 Aug 2008 10:54:31 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QAsVu4026638 for ; Tue, 26 Aug 2008 10:54:31 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QAsVT1026636 for perforce@freebsd.org; Tue, 26 Aug 2008 10:54:31 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 Aug 2008 10:54:31 GMT Message-Id: <200808261054.m7QAsVT1026636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148506 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, 26 Aug 2008 10:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=148506 Change 148506 by trasz@trasz_traszkan on 2008/08/26 10:53:54 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tsec/if_tsec_ocp.c#1 branch Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#3 (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.powerpc,v 1.79 2008/06/07 22:58:32 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.80 2008/08/26 10:41:49 raj Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -44,6 +44,7 @@ dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc dev/tsec/if_tsec.c optional tsec +dev/tsec/if_tsec_ocp.c optional tsec mpc85xx dev/uart/uart_bus_ocp.c optional uart mpc85xx dev/uart/uart_cpu_powerpc.c optional uart kern/syscalls.c optional ktr ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tsec/if_tsec.c#3 (text+ko) ==== @@ -1,9 +1,8 @@ /*- - * Copyright (C) 2006-2008 Semihalf + * Copyright (C) 2007-2008 Semihalf, Rafal Jaworowski + * Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski * All rights reserved. * - * Written by: Piotr Kruszynski - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -12,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,171 +28,270 @@ * Freescale integrated Three-Speed Ethernet Controller (TSEC) driver. */ #include -__FBSDID("$FreeBSD: src/sys/dev/tsec/if_tsec.c,v 1.4 2008/08/26 09:38:28 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tsec/if_tsec.c,v 1.5 2008/08/26 10:41:49 raj Exp $"); #include #include +#include #include #include #include #include #include +#include #include +#include +#include #include +#include #include #include +#include +#include -#include -#include -#include #include -#include -#include - -#include -#include -#include -#include - #include #include -#include - #include #include -#include "miibus_if.h" - -#define TSEC_DEBUG - -#ifdef TSEC_DEBUG -#define PDEBUG(a) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");} -#else -#define PDEBUG(a) /* nop */ -#endif - -static int tsec_probe(device_t dev); -static int tsec_attach(device_t dev); -static int tsec_setup_intr(device_t dev, struct resource **ires, - void **ihand, int *irid, driver_intr_t handler, const char *iname); -static void tsec_release_intr(device_t dev, struct resource *ires, - void *ihand, int irid, const char *iname); +static int tsec_alloc_dma_desc(device_t dev, bus_dma_tag_t *dtag, + bus_dmamap_t *dmap, bus_size_t dsize, void **vaddr, void *raddr, + const char *dname); +static void tsec_dma_ctl(struct tsec_softc *sc, int state); +static int tsec_encap(struct tsec_softc *sc, struct mbuf *m_head); static void tsec_free_dma(struct tsec_softc *sc); -static int tsec_detach(device_t dev); -static void tsec_shutdown(device_t dev); -static int tsec_suspend(device_t dev); /* XXX */ -static int tsec_resume(device_t dev); /* XXX */ - -static void tsec_init(void *xsc); -static void tsec_init_locked(struct tsec_softc *sc); -static void tsec_set_mac_address(struct tsec_softc *sc); -static void tsec_dma_ctl(struct tsec_softc *sc, int state); -static void tsec_intrs_ctl(struct tsec_softc *sc, int state); -static void tsec_reset_mac(struct tsec_softc *sc); - -static void tsec_watchdog(struct tsec_softc *sc); -static void tsec_start(struct ifnet *ifp); -static void tsec_start_locked(struct ifnet *ifp); -static int tsec_encap(struct tsec_softc *sc, - struct mbuf *m_head); -static void tsec_setfilter(struct tsec_softc *sc); -static int tsec_ioctl(struct ifnet *ifp, u_long command, - caddr_t data); +static void tsec_free_dma_desc(bus_dma_tag_t dtag, bus_dmamap_t dmap, void *vaddr); static int tsec_ifmedia_upd(struct ifnet *ifp); static void tsec_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int tsec_new_rxbuf(bus_dma_tag_t tag, bus_dmamap_t map, struct mbuf **mbufp, uint32_t *paddr); static void tsec_map_dma_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error); -static int tsec_alloc_dma_desc(device_t dev, bus_dma_tag_t *dtag, - bus_dmamap_t *dmap, bus_size_t dsize, void **vaddr, void *raddr, - const char *dname); -static void tsec_free_dma_desc(bus_dma_tag_t dtag, bus_dmamap_t dmap, - void *vaddr); +static void tsec_intrs_ctl(struct tsec_softc *sc, int state); +static void tsec_init(void *xsc); +static void tsec_init_locked(struct tsec_softc *sc); +static int tsec_ioctl(struct ifnet *ifp, u_long command, caddr_t data); +static void tsec_reset_mac(struct tsec_softc *sc); +static void tsec_setfilter(struct tsec_softc *sc); +static void tsec_set_mac_address(struct tsec_softc *sc); +static void tsec_start(struct ifnet *ifp); +static void tsec_start_locked(struct ifnet *ifp); +static void tsec_stop(struct tsec_softc *sc); +static void tsec_tick(void *arg); +static void tsec_watchdog(struct tsec_softc *sc); + +struct tsec_softc *tsec0_sc = NULL; /* XXX ugly hack! */ + +devclass_t tsec_devclass; +DRIVER_MODULE(miibus, tsec, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(tsec, ether, 1, 1, 1); +MODULE_DEPEND(tsec, miibus, 1, 1, 1); + +int +tsec_attach(struct tsec_softc *sc) +{ + uint8_t hwaddr[ETHER_ADDR_LEN]; + struct ifnet *ifp; + bus_dmamap_t *map_ptr; + bus_dmamap_t **map_pptr; + int error = 0; + int i; + + /* Reset all TSEC counters */ + TSEC_TX_RX_COUNTERS_INIT(sc); + + /* Stop DMA engine if enabled by firmware */ + tsec_dma_ctl(sc, 0); + + /* Reset MAC */ + tsec_reset_mac(sc); + + /* Disable interrupts for now */ + tsec_intrs_ctl(sc, 0); + + /* Allocate a busdma tag and DMA safe memory for TX descriptors. */ + error = tsec_alloc_dma_desc(sc->dev, &sc->tsec_tx_dtag, &sc->tsec_tx_dmap, + sizeof(*sc->tsec_tx_vaddr) * TSEC_TX_NUM_DESC, + (void **)&sc->tsec_tx_vaddr, &sc->tsec_tx_raddr, "TX"); + if (error) { + tsec_detach(sc); + return (ENXIO); + } + + /* Allocate a busdma tag and DMA safe memory for RX descriptors. */ + error = tsec_alloc_dma_desc(sc->dev, &sc->tsec_rx_dtag, &sc->tsec_rx_dmap, + sizeof(*sc->tsec_rx_vaddr) * TSEC_RX_NUM_DESC, + (void **)&sc->tsec_rx_vaddr, &sc->tsec_rx_raddr, "RX"); + if (error) { + tsec_detach(sc); + return (ENXIO); + } + + /* Allocate a busdma tag for TX mbufs. */ + error = bus_dma_tag_create(NULL, /* parent */ + TSEC_TXBUFFER_ALIGNMENT, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filtfunc, filtfuncarg */ + MCLBYTES * (TSEC_TX_NUM_DESC - 1),/* maxsize */ + TSEC_TX_NUM_DESC - 1, /* nsegments */ + MCLBYTES, 0, /* maxsegsz, flags */ + NULL, NULL, /* lockfunc, lockfuncarg */ + &sc->tsec_tx_mtag); /* dmat */ + if (error) { + device_printf(sc->dev, "failed to allocate busdma tag(tx mbufs)\n"); + tsec_detach(sc); + return (ENXIO); + } + + /* Allocate a busdma tag for RX mbufs. */ + error = bus_dma_tag_create(NULL, /* parent */ + TSEC_RXBUFFER_ALIGNMENT, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filtfunc, filtfuncarg */ + MCLBYTES, /* maxsize */ + 1, /* nsegments */ + MCLBYTES, 0, /* maxsegsz, flags */ + NULL, NULL, /* lockfunc, lockfuncarg */ + &sc->tsec_rx_mtag); /* dmat */ + if (error) { + device_printf(sc->dev, "failed to allocate busdma tag(rx mbufs)\n"); + tsec_detach(sc); + return (ENXIO); + } + + /* Create TX busdma maps */ + map_ptr = sc->tx_map_data; + map_pptr = sc->tx_map_unused_data; -static void tsec_stop(struct tsec_softc *sc); + for (i = 0; i < TSEC_TX_NUM_DESC; i++) { + map_pptr[i] = &map_ptr[i]; + error = bus_dmamap_create(sc->tsec_tx_mtag, 0, map_pptr[i]); + if (error) { + device_printf(sc->dev, "failed to init TX ring\n"); + tsec_detach(sc); + return (ENXIO); + } + } -static void tsec_receive_intr(void *arg); -static void tsec_transmit_intr(void *arg); -static void tsec_error_intr(void *arg); + /* Create RX busdma maps and zero mbuf handlers */ + for (i = 0; i < TSEC_RX_NUM_DESC; i++) { + error = bus_dmamap_create(sc->tsec_rx_mtag, 0, &sc->rx_data[i].map); + if (error) { + device_printf(sc->dev, "failed to init RX ring\n"); + tsec_detach(sc); + return (ENXIO); + } + sc->rx_data[i].mbuf = NULL; + } -static void tsec_tick(void *arg); -static int tsec_miibus_readreg(device_t dev, int phy, int reg); -static void tsec_miibus_writereg(device_t dev, int phy, int reg, int value); -static void tsec_miibus_statchg(device_t dev); + /* Create mbufs for RX buffers */ + for (i = 0; i < TSEC_RX_NUM_DESC; i++) { + error = tsec_new_rxbuf(sc->tsec_rx_mtag, sc->rx_data[i].map, + &sc->rx_data[i].mbuf, &sc->rx_data[i].paddr); + if (error) { + device_printf(sc->dev, "can't load rx DMA map %d, error = " + "%d\n", i, error); + tsec_detach(sc); + return (error); + } + } -static struct tsec_softc *tsec0_sc = NULL; /* XXX ugly hack! */ + /* Create network interface for upper layers */ + ifp = sc->tsec_ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + device_printf(sc->dev, "if_alloc() failed\n"); + tsec_detach(sc); + return (ENOMEM); + } -static device_method_t tsec_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, tsec_probe), - DEVMETHOD(device_attach, tsec_attach), - DEVMETHOD(device_detach, tsec_detach), - DEVMETHOD(device_shutdown, tsec_shutdown), - DEVMETHOD(device_suspend, tsec_suspend), - DEVMETHOD(device_resume, tsec_resume), + ifp->if_softc = sc; + if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev)); + ifp->if_mtu = ETHERMTU; + ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; + ifp->if_init = tsec_init; + ifp->if_start = tsec_start; + ifp->if_ioctl = tsec_ioctl; - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), + IFQ_SET_MAXLEN(&ifp->if_snd, TSEC_TX_NUM_DESC - 1); + ifp->if_snd.ifq_drv_maxlen = TSEC_TX_NUM_DESC - 1; + IFQ_SET_READY(&ifp->if_snd); - /* MII interface */ - DEVMETHOD(miibus_readreg, tsec_miibus_readreg), - DEVMETHOD(miibus_writereg, tsec_miibus_writereg), - DEVMETHOD(miibus_statchg, tsec_miibus_statchg), - { 0, 0 } -}; + /* XXX No special features of TSEC are supported currently */ + ifp->if_capabilities = 0; + ifp->if_capenable = ifp->if_capabilities; -static driver_t tsec_driver = { - "tsec", - tsec_methods, - sizeof(struct tsec_softc), -}; + /* Probe PHY(s) */ + error = mii_phy_probe(sc->dev, &sc->tsec_miibus, tsec_ifmedia_upd, + tsec_ifmedia_sts); + if (error) { + device_printf(sc->dev, "MII failed to find PHY!\n"); + if_free(ifp); + sc->tsec_ifp = NULL; + tsec_detach(sc); + return (error); + } + sc->tsec_mii = device_get_softc(sc->tsec_miibus); -static devclass_t tsec_devclass; + /* Set MAC address */ + tsec_get_hwaddr(sc, hwaddr); + ether_ifattach(ifp, hwaddr); -DRIVER_MODULE(tsec, ocpbus, tsec_driver, tsec_devclass, 0, 0); -DRIVER_MODULE(miibus, tsec, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(tsec, ether, 1, 1, 1); -MODULE_DEPEND(tsec, miibus, 1, 1, 1); + return (0); +} -static void -tsec_get_hwaddr(struct tsec_softc *sc, uint8_t *addr) +int +tsec_detach(struct tsec_softc *sc) { - union { - uint32_t reg[2]; - uint8_t addr[6]; - } curmac; - uint32_t a[6]; - device_t parent; - uintptr_t macaddr; - int i; + + /* Stop TSEC controller and free TX queue */ + if (sc->sc_rres && sc->tsec_ifp) + tsec_shutdown(sc->dev); - parent = device_get_parent(sc->dev); - if (BUS_READ_IVAR(parent, sc->dev, OCPBUS_IVAR_MACADDR, - &macaddr) == 0) { - bcopy((uint8_t *)macaddr, addr, 6); - return; + /* Detach network interface */ + if (sc->tsec_ifp) { + ether_ifdetach(sc->tsec_ifp); + if_free(sc->tsec_ifp); + sc->tsec_ifp = NULL; } - /* - * Fall back -- use the currently programmed address in the hope that - * it was set be firmware... - */ - curmac.reg[0] = TSEC_READ(sc, TSEC_REG_MACSTNADDR1); - curmac.reg[1] = TSEC_READ(sc, TSEC_REG_MACSTNADDR2); - for (i = 0; i < 6; i++) - a[5-i] = curmac.addr[i]; + /* Free DMA resources */ + tsec_free_dma(sc); + + return (0); +} + +void +tsec_shutdown(device_t dev) +{ + struct tsec_softc *sc; + + sc = device_get_softc(dev); + + TSEC_GLOBAL_LOCK(sc); + tsec_stop(sc); + TSEC_GLOBAL_UNLOCK(sc); +} + +int +tsec_suspend(device_t dev) +{ + + /* TODO not implemented! */ + return (0); +} + +int +tsec_resume(device_t dev) +{ - addr[0] = a[0]; - addr[1] = a[1]; - addr[2] = a[2]; - addr[3] = a[3]; - addr[4] = a[4]; - addr[5] = a[5]; + /* TODO not implemented! */ + return (0); } static void @@ -327,16 +423,16 @@ for (i = 0; i < TSEC_TX_NUM_DESC; i++) { tx_desc[i].bufptr = 0; tx_desc[i].length = 0; - tx_desc[i].flags = ((i == TSEC_TX_NUM_DESC-1) ? TSEC_TXBD_W : 0); + tx_desc[i].flags = ((i == TSEC_TX_NUM_DESC - 1) ? TSEC_TXBD_W : 0); } - bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, BUS_DMASYNC_PREREAD | - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); for (i = 0; i < TSEC_RX_NUM_DESC; i++) { rx_desc[i].bufptr = sc->rx_data[i].paddr; rx_desc[i].length = 0; rx_desc[i].flags = TSEC_RXBD_E | TSEC_RXBD_I | - ((i == TSEC_RX_NUM_DESC-1) ? TSEC_RXBD_W : 0); + ((i == TSEC_RX_NUM_DESC - 1) ? TSEC_RXBD_W : 0); } bus_dmamap_sync(sc->tsec_rx_dtag, sc->tsec_rx_dmap, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); @@ -382,15 +478,14 @@ tsec_set_mac_address(struct tsec_softc *sc) { uint32_t macbuf[2] = { 0, 0 }; - int i; char *macbufp; char *curmac; + int i; TSEC_GLOBAL_LOCK_ASSERT(sc); KASSERT((ETHER_ADDR_LEN <= sizeof(macbuf)), - ("tsec_set_mac_address: (%d <= %d", - ETHER_ADDR_LEN, sizeof(macbuf))); + ("tsec_set_mac_address: (%d <= %d", ETHER_ADDR_LEN, sizeof(macbuf))); macbufp = (char *)macbuf; curmac = (char *)IF_LLADDR(sc->tsec_ifp); @@ -478,13 +573,10 @@ TSEC_WRITE(sc, TSEC_REG_IMASK, 0); break; case 1: - TSEC_WRITE(sc, TSEC_REG_IMASK, TSEC_IMASK_BREN | - TSEC_IMASK_RXCEN | TSEC_IMASK_BSYEN | - TSEC_IMASK_EBERREN | TSEC_IMASK_BTEN | - TSEC_IMASK_TXEEN | TSEC_IMASK_TXBEN | - TSEC_IMASK_TXFEN | TSEC_IMASK_XFUNEN | - TSEC_IMASK_RXFEN - ); + TSEC_WRITE(sc, TSEC_REG_IMASK, TSEC_IMASK_BREN | TSEC_IMASK_RXCEN | + TSEC_IMASK_BSYEN | TSEC_IMASK_EBERREN | TSEC_IMASK_BTEN | + TSEC_IMASK_TXEEN | TSEC_IMASK_TXBEN | TSEC_IMASK_TXFEN | + TSEC_IMASK_XFUNEN | TSEC_IMASK_RXFEN); break; default: device_printf(dev, "tsec_intrs_ctl(): unknown state value: %d\n", @@ -555,8 +647,8 @@ if (sc->tsec_link == 0) return; - bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, BUS_DMASYNC_POSTREAD | + BUS_DMASYNC_POSTWRITE); for (;;) { /* Get packet from the queue */ @@ -576,8 +668,8 @@ queued++; BPF_MTAP(ifp, m0); } - bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, BUS_DMASYNC_PREREAD | + BUS_DMASYNC_PREWRITE); if (queued) { /* Enable transmitter and watchdog timer */ @@ -610,7 +702,7 @@ /* Create mapping in DMA memory */ error = bus_dmamap_load_mbuf_sg(sc->tsec_tx_mtag, - *mapp, m0, segs, &nsegs, BUS_DMA_NOWAIT); + *mapp, m0, segs, &nsegs, BUS_DMA_NOWAIT); if (error != 0 || nsegs > TSEC_FREE_TX_DESC(sc) || nsegs <= 0) { bus_dmamap_unload(sc->tsec_tx_mtag, *mapp); TSEC_FREE_TX_MAP(sc, mapp); @@ -677,22 +769,19 @@ TSEC_GLOBAL_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - if ((sc->tsec_if_flags ^ ifp->if_flags) & - IFF_PROMISC) + if ((sc->tsec_if_flags ^ ifp->if_flags) & IFF_PROMISC) tsec_setfilter(sc); } else tsec_init_locked(sc); - } else { - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - tsec_stop(sc); - } + } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) + tsec_stop(sc); + sc->tsec_if_flags = ifp->if_flags; TSEC_GLOBAL_UNLOCK(sc); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: - error = ifmedia_ioctl(ifp, ifr, &sc->tsec_mii->mii_media, - command); + error = ifmedia_ioctl(ifp, ifr, &sc->tsec_mii->mii_media, command); break; default: error = ether_ioctl(ifp, command, data); @@ -738,7 +827,7 @@ static int tsec_new_rxbuf(bus_dma_tag_t tag, bus_dmamap_t map, struct mbuf **mbufp, - uint32_t *paddr) + uint32_t *paddr) { struct mbuf *new_mbuf; bus_dma_segment_t seg[1]; @@ -758,7 +847,7 @@ } error = bus_dmamap_load_mbuf_sg(tag, map, new_mbuf, seg, &nsegs, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT); KASSERT(nsegs == 1, ("Too many segments returned!")); if (nsegs != 1 || error) panic("tsec_new_rxbuf(): nsegs(%d), error(%d)", nsegs, error); @@ -817,10 +906,10 @@ } error = bus_dmamem_alloc(*dtag, vaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, - dmap); + dmap); if (error) { device_printf(dev, "failed to allocate %s DMA safe memory\n", - dname); + dname); bus_dma_tag_destroy(*dtag); (*vaddr) = NULL; return (ENXIO); @@ -858,300 +947,6 @@ bus_dma_tag_destroy(dtag); } -static int -tsec_probe(device_t dev) -{ - struct tsec_softc *sc; - device_t parent; - uintptr_t devtype; - int error; - uint32_t id; - - parent = device_get_parent(dev); - - error = BUS_READ_IVAR(parent, dev, OCPBUS_IVAR_DEVTYPE, &devtype); - if (error) - return (error); - if (devtype != OCPBUS_DEVTYPE_TSEC) - return (ENXIO); - - sc = device_get_softc(dev); - - sc->sc_rrid = 0; - sc->sc_rres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_rrid, - 0ul, ~0ul, TSEC_IO_SIZE, RF_ACTIVE); - if (sc->sc_rres == NULL) - return (ENXIO); - - sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); - sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - - /* Check that we actually have a TSEC at this address */ - id = TSEC_READ(sc, TSEC_REG_ID) | TSEC_READ(sc, TSEC_REG_ID2); - - bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rrid, sc->sc_rres); - - if (id == 0) - return (ENXIO); - - device_set_desc(dev, "Three-Speed Ethernet Controller"); - return (BUS_PROBE_DEFAULT); -} - -static int -tsec_attach(device_t dev) -{ - uint8_t hwaddr[ETHER_ADDR_LEN]; - struct tsec_softc *sc; - struct ifnet *ifp; - bus_dmamap_t *map_ptr; - bus_dmamap_t **map_pptr; - int error = 0; - int i; - - sc = device_get_softc(dev); - sc->dev = dev; - - if (device_get_unit(dev) == 0) - tsec0_sc = sc; /* XXX */ - - callout_init(&sc->tsec_callout, 1); - mtx_init(&sc->transmit_lock, device_get_nameunit(dev), "TSEC TX lock", - MTX_DEF); - mtx_init(&sc->receive_lock, device_get_nameunit(dev), "TSEC RX lock", - MTX_DEF); - - /* Reset all TSEC counters */ - TSEC_TX_RX_COUNTERS_INIT(sc); - - /* Allocate IO memory for TSEC registers */ - sc->sc_rrid = 0; - sc->sc_rres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_rrid, - 0ul, ~0ul, TSEC_IO_SIZE, RF_ACTIVE); - if (sc->sc_rres == NULL) { - device_printf(dev, "could not allocate IO memory range!\n"); - tsec_detach(dev); - return (ENXIO); - } - sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); - sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - - /* Stop DMA engine if enabled by firmware */ - tsec_dma_ctl(sc, 0); - - /* Reset MAC */ - tsec_reset_mac(sc); - - /* Disable interrupts for now */ - tsec_intrs_ctl(sc, 0); - - /* Allocate a busdma tag and DMA safe memory for TX descriptors. */ - error = tsec_alloc_dma_desc(dev, &sc->tsec_tx_dtag, &sc->tsec_tx_dmap, - sizeof(*sc->tsec_tx_vaddr) * TSEC_TX_NUM_DESC, - (void **)&sc->tsec_tx_vaddr, &sc->tsec_tx_raddr, "TX"); - if (error) { - tsec_detach(dev); - return (ENXIO); - } - - /* Allocate a busdma tag and DMA safe memory for RX descriptors. */ - error = tsec_alloc_dma_desc(dev, &sc->tsec_rx_dtag, &sc->tsec_rx_dmap, - sizeof(*sc->tsec_rx_vaddr) * TSEC_RX_NUM_DESC, - (void **)&sc->tsec_rx_vaddr, &sc->tsec_rx_raddr, "RX"); - if (error) { - tsec_detach(dev); - return (ENXIO); - } - - /* Allocate a busdma tag for TX mbufs. */ - error = bus_dma_tag_create(NULL, /* parent */ - TSEC_TXBUFFER_ALIGNMENT, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filtfunc, filtfuncarg */ - MCLBYTES * (TSEC_TX_NUM_DESC - 1), /* maxsize */ - TSEC_TX_NUM_DESC - 1, /* nsegments */ - MCLBYTES, 0, /* maxsegsz, flags */ - NULL, NULL, /* lockfunc, lockfuncarg */ - &sc->tsec_tx_mtag); /* dmat */ - if (error) { - device_printf(dev, "failed to allocate busdma tag(tx mbufs)\n"); - tsec_detach(dev); - return (ENXIO); - } - - /* Allocate a busdma tag for RX mbufs. */ - error = bus_dma_tag_create(NULL, /* parent */ - TSEC_RXBUFFER_ALIGNMENT, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filtfunc, filtfuncarg */ - MCLBYTES, /* maxsize */ - 1, /* nsegments */ - MCLBYTES, 0, /* maxsegsz, flags */ - NULL, NULL, /* lockfunc, lockfuncarg */ - &sc->tsec_rx_mtag); /* dmat */ - if (error) { - device_printf(dev, "failed to allocate busdma tag(rx mbufs)\n"); - tsec_detach(dev); - return (ENXIO); - } - - /* Create TX busdma maps */ - map_ptr = sc->tx_map_data; - map_pptr = sc->tx_map_unused_data; - - for (i = 0; i < TSEC_TX_NUM_DESC; i++) { - map_pptr[i] = &map_ptr[i]; - error = bus_dmamap_create(sc->tsec_tx_mtag, 0, - map_pptr[i]); - if (error) { - device_printf(dev, "failed to init TX ring\n"); - tsec_detach(dev); - return (ENXIO); - } - } - - /* Create RX busdma maps and zero mbuf handlers */ - for (i = 0; i < TSEC_RX_NUM_DESC; i++) { - error = bus_dmamap_create(sc->tsec_rx_mtag, 0, - &sc->rx_data[i].map); - if (error) { - device_printf(dev, "failed to init RX ring\n"); - tsec_detach(dev); - return (ENXIO); - } - sc->rx_data[i].mbuf = NULL; - } - - /* Create mbufs for RX buffers */ - for (i = 0; i < TSEC_RX_NUM_DESC; i++) { - error = tsec_new_rxbuf(sc->tsec_rx_mtag, sc->rx_data[i].map, - &sc->rx_data[i].mbuf, &sc->rx_data[i].paddr); - if (error) { - device_printf(dev, "can't load rx DMA map %d, error = " - "%d\n", i, error); - tsec_detach(dev); - return (error); - } - } - - /* Create network interface for upper layers */ - ifp = sc->tsec_ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - device_printf(dev, "if_alloc() failed\n"); - tsec_detach(dev); - return (ENOMEM); - } - - ifp->if_softc = sc; - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; - ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; - ifp->if_init = tsec_init; - ifp->if_start = tsec_start; - ifp->if_ioctl = tsec_ioctl; - - IFQ_SET_MAXLEN(&ifp->if_snd, TSEC_TX_NUM_DESC - 1); - ifp->if_snd.ifq_drv_maxlen = TSEC_TX_NUM_DESC - 1; - IFQ_SET_READY(&ifp->if_snd); - - /* XXX No special features of TSEC are supported currently */ - ifp->if_capabilities = 0; - ifp->if_capenable = ifp->if_capabilities; - - /* Probe PHY(s) */ - error = mii_phy_probe(dev, &sc->tsec_miibus, tsec_ifmedia_upd, - tsec_ifmedia_sts); - if (error) { - device_printf(dev, "MII failed to find PHY!\n"); - if_free(ifp); - sc->tsec_ifp = NULL; - tsec_detach(dev); - return (error); - } - sc->tsec_mii = device_get_softc(sc->tsec_miibus); - - tsec_get_hwaddr(sc, hwaddr); - ether_ifattach(ifp, hwaddr); - - /* Interrupts configuration (TX/RX/ERR) */ - sc->sc_transmit_irid = OCP_TSEC_RID_TXIRQ; - error = tsec_setup_intr(dev, &sc->sc_transmit_ires, - &sc->sc_transmit_ihand, &sc->sc_transmit_irid, - tsec_transmit_intr, "TX"); - if (error) { - tsec_detach(dev); - return (error); - } - - sc->sc_receive_irid = OCP_TSEC_RID_RXIRQ; - error = tsec_setup_intr(dev, &sc->sc_receive_ires, - &sc->sc_receive_ihand, &sc->sc_receive_irid, - tsec_receive_intr, "RX"); - if (error) { - tsec_detach(dev); - return (error); - } - - sc->sc_error_irid = OCP_TSEC_RID_ERRIRQ; - error = tsec_setup_intr(dev, &sc->sc_error_ires, - &sc->sc_error_ihand, &sc->sc_error_irid, - tsec_error_intr, "ERR"); - if (error) { - tsec_detach(dev); - return (error); - } - - return (0); -} - -static int -tsec_setup_intr(device_t dev, struct resource **ires, void **ihand, int *irid, - driver_intr_t handler, const char *iname) -{ - struct tsec_softc *sc; - int error; - - sc = device_get_softc(dev); - - (*ires) = bus_alloc_resource_any(dev, SYS_RES_IRQ, irid, RF_ACTIVE); - if ((*ires) == NULL) { - device_printf(dev, "could not allocate %s IRQ\n", iname); - return (ENXIO); - } - error = bus_setup_intr(dev, *ires, INTR_TYPE_NET | INTR_MPSAFE, - NULL, handler, sc, ihand); - if (error) { - device_printf(dev, "failed to set up %s IRQ\n", iname); - if (bus_release_resource(dev, SYS_RES_IRQ, *irid, *ires)) - device_printf(dev, "could not release %s IRQ\n", iname); - (*ires) = NULL; - return (error); - } - return (0); -} - -static void -tsec_release_intr(device_t dev, struct resource *ires, void *ihand, int irid, - const char *iname) -{ - int error; - - if (ires == NULL) - return; - - error = bus_teardown_intr(dev, ires, ihand); - if (error) - device_printf(dev, "bus_teardown_intr() failed for %s intr" - ", error %d\n", iname, error); - - error = bus_release_resource(dev, SYS_RES_IRQ, irid, ires); - if (error) - device_printf(dev, "bus_release_resource() failed for %s intr" - ", error %d\n", iname, error); -} - static void tsec_free_dma(struct tsec_softc *sc) { @@ -1160,8 +955,7 @@ /* Free TX maps */ for (i = 0; i < TSEC_TX_NUM_DESC; i++) if (sc->tx_map_data[i] != NULL) - bus_dmamap_destroy(sc->tsec_tx_mtag, - sc->tx_map_data[i]); + bus_dmamap_destroy(sc->tsec_tx_mtag, sc->tx_map_data[i]); /* Destroy tag for Tx mbufs */ bus_dma_tag_destroy(sc->tsec_tx_mtag); @@ -1191,82 +985,6 @@ sc->tsec_rx_vaddr); } -static int -tsec_detach(device_t dev) -{ - struct tsec_softc *sc; - int error; - - sc = device_get_softc(dev); - - /* Stop TSEC controller and free TX queue */ - if (sc->sc_rres && sc->tsec_ifp) - tsec_shutdown(dev); - - /* Wait for stopping TSEC ticks */ - callout_drain(&sc->tsec_callout); - - /* Stop and release all interrupts */ - tsec_release_intr(dev, sc->sc_transmit_ires, sc->sc_transmit_ihand, - sc->sc_transmit_irid, "TX"); - tsec_release_intr(dev, sc->sc_receive_ires, sc->sc_receive_ihand, - sc->sc_receive_irid, "RX"); - tsec_release_intr(dev, sc->sc_error_ires, sc->sc_error_ihand, - sc->sc_error_irid, "ERR"); - - /* Detach network interface */ - if (sc->tsec_ifp) { - ether_ifdetach(sc->tsec_ifp); - if_free(sc->tsec_ifp); - sc->tsec_ifp = NULL; - } - - /* Free DMA resources */ - tsec_free_dma(sc); - - /* Free IO memory handler */ - if (sc->sc_rres) { - error = bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rrid, - sc->sc_rres); - if (error) - device_printf(dev, "bus_release_resource() failed for" - " IO memory, error %d\n", error); - } - - /* Destroy locks */ - mtx_destroy(&sc->receive_lock); - mtx_destroy(&sc->transmit_lock); - return (0); -} - -static void -tsec_shutdown(device_t dev) -{ - struct tsec_softc *sc; - - sc = device_get_softc(dev); - - TSEC_GLOBAL_LOCK(sc); - tsec_stop(sc); - TSEC_GLOBAL_UNLOCK(sc); -} - -static int -tsec_suspend(device_t dev) -{ - - /* TODO not implemented! */ - return (ENODEV); -} - -static int -tsec_resume(device_t dev) -{ - - /* TODO not implemented! */ - return (ENODEV); -} - static void tsec_stop(struct tsec_softc *sc) { @@ -1309,7 +1027,7 @@ DELAY(10); } -static void +void tsec_receive_intr(void *arg) { struct mbuf *rcv_mbufs[TSEC_RX_NUM_DESC]; @@ -1360,9 +1078,10 @@ if (flags & (TSEC_RXBD_LG | TSEC_RXBD_SH | TSEC_RXBD_NO | >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 12:50:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BA111065682; Tue, 26 Aug 2008 12:50:33 +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 C3670106567D for ; Tue, 26 Aug 2008 12:50:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9EB58FC13 for ; Tue, 26 Aug 2008 12:50:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QCoWRQ047898 for ; Tue, 26 Aug 2008 12:50:32 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QCoWnk047896 for perforce@freebsd.org; Tue, 26 Aug 2008 12:50:32 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 Aug 2008 12:50:32 GMT Message-Id: <200808261250.m7QCoWnk047896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148515 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, 26 Aug 2008 12:50:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148515 Change 148515 by trasz@trasz_traszkan on 2008/08/26 12:50:08 Drop unneeded file. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/uthread/uthread_facl.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 26 13:08:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF9651065677; Tue, 26 Aug 2008 13:08:51 +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 833BA1065670 for ; Tue, 26 Aug 2008 13:08:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4795A8FC08 for ; Tue, 26 Aug 2008 13:08:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QD8pi3050443 for ; Tue, 26 Aug 2008 13:08:51 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QD8p0K050441 for perforce@freebsd.org; Tue, 26 Aug 2008 13:08:51 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 Aug 2008 13:08:51 GMT Message-Id: <200808261308.m7QD8p0K050441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148516 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, 26 Aug 2008 13:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148516 Change 148516 by trasz@trasz_traszkan on 2008/08/26 13:08:49 Compilation fix. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#29 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ static acl_t _nfs4_acl_strip_np(const acl_t aclp, int recalculate_mask) { - int error; acl_t newacl; mode_t mode; @@ -53,11 +52,7 @@ _acl_brand_as(newacl, ACL_BRAND_NFS4); acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl)); - error = acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1); - if (error) { - errno = EINVAL; - return (NULL); - } + acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1); return (newacl); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#29 (text+ko) ==== @@ -989,6 +989,7 @@ return (1); } +#ifdef _KERNEL /* * This routine is used to determine whether to remove extended attribute * that stores ACL contents. @@ -1021,6 +1022,7 @@ return (trivial); } +#endif int acl_nfs4_check(const struct acl *aclp, int is_directory) From owner-p4-projects@FreeBSD.ORG Tue Aug 26 17:58:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 483DB106566C; Tue, 26 Aug 2008 17:58: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 0C687106564A for ; Tue, 26 Aug 2008 17:58:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E88748FC16 for ; Tue, 26 Aug 2008 17:58:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QHwmHH091466 for ; Tue, 26 Aug 2008 17:58:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QHwmPD091464 for perforce@freebsd.org; Tue, 26 Aug 2008 17:58:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Aug 2008 17:58:48 GMT Message-Id: <200808261758.m7QHwmPD091464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148534 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, 26 Aug 2008 17:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=148534 Change 148534 by rwatson@rwatson_freebsd_capabilities on 2008/08/26 17:58:27 Add a new todo: fexecve(2) in capability mode shouldn't allow lookup and use of an interpreter from the global namespace. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#9 (text+ko) ==== @@ -45,3 +45,7 @@ maxprot. - MAC control of capability facility. + +- fxecve(2) may allow eluding capability mode control due to evaluating + script interpreter entries on script file descriptors; when in capability + mode we must disallow script behavior. From owner-p4-projects@FreeBSD.ORG Tue Aug 26 18:06:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B51F410656FD; Tue, 26 Aug 2008 18:06: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 787D010656F9 for ; Tue, 26 Aug 2008 18:06:57 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46BC28FC23 for ; Tue, 26 Aug 2008 18:06:57 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QI6vjK093400 for ; Tue, 26 Aug 2008 18:06:57 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QI6vPD093398 for perforce@freebsd.org; Tue, 26 Aug 2008 18:06:57 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 26 Aug 2008 18:06:57 GMT Message-Id: <200808261806.m7QI6vPD093398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148535 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, 26 Aug 2008 18:06:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=148535 Change 148535 by konrad@vspredator on 2008/08/26 18:05:57 New program for testing/debuggin - analyzes a given line ouputting unicode codepoints and UTF-8 encoding. Also greps the charmap file to show the name of the last analyzed symbol/character. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/analyze/Makefile#1 add .. //depot/projects/soc2008/konrad_collation/test/analyze/analyze.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 26 18:34:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 921511065699; Tue, 26 Aug 2008 18:34: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 560EA1065693 for ; Tue, 26 Aug 2008 18:34:25 +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 3A90F8FC27 for ; Tue, 26 Aug 2008 18:34:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QIYPqn095783 for ; Tue, 26 Aug 2008 18:34:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QIYP7e095779 for perforce@freebsd.org; Tue, 26 Aug 2008 18:34:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 26 Aug 2008 18:34:25 GMT Message-Id: <200808261834.m7QIYP7e095779@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 148537 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, 26 Aug 2008 18:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=148537 Change 148537 by hselasky@hselasky_laptop001 on 2008/08/26 18:34:01 Get the musbotg driver to a state where it actually works. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#7 (text+ko) ==== @@ -99,45 +99,14 @@ /* * Here is a configuration that the chip supports. */ -static const struct usb2_hw_ep_profile musbotg_ep_profile[4] = { +static const struct usb2_hw_ep_profile musbotg_ep_profile[1] = { [0] = { - .max_frame_size = 64, /* fixed */ + .max_in_frame_size = 64,/* fixed */ + .max_out_frame_size = 64, /* fixed */ .is_simplex = 1, .support_control = 1, - }, - - [1] = { - .max_frame_size = (3 * 1024), - .is_simplex = 0, /* duplex */ - .support_multi_buffer = 1, - .support_bulk = 1, - .support_interrupt = 1, - .support_isochronous = 1, - .support_in = 1, - .support_out = 1, - }, - - - [2] = { - .max_frame_size = (3 * 1024), - .is_simplex = 1, /* simplex */ - .support_multi_buffer = 1, - .support_bulk = 1, - .support_interrupt = 1, - .support_isochronous = 1, - .support_in = 1, - }, - - [3] = { - .max_frame_size = (3 * 1024), - .is_simplex = 1, /* simplex */ - .support_multi_buffer = 1, - .support_bulk = 1, - .support_interrupt = 1, - .support_isochronous = 1, - .support_out = 1, - }, + } }; static void @@ -152,14 +121,8 @@ /* control endpoint */ *ppf = musbotg_ep_profile; } else if (ep_addr <= sc->sc_ep_max) { - /* non-control duplex endpoints */ - *ppf = musbotg_ep_profile + 1; - } else if (ep_addr <= sc->sc_ep_tx_max) { - /* non-control simplex TX endpoints */ - *ppf = musbotg_ep_profile + 2; - } else if (ep_addr <= sc->sc_ep_rx_max) { - /* non-control simplex RX endpoints */ - *ppf = musbotg_ep_profile + 3; + /* other endpoints */ + *ppf = sc->sc_hw_ep_profile + ep_addr; } else { *ppf = NULL; } @@ -1386,6 +1349,8 @@ musbotg_clear_stall_sub(struct musbotg_softc *sc, uint16_t wMaxPacket, uint8_t ep_no, uint8_t ep_type, uint8_t ep_dir) { + uint16_t mps; + uint16_t temp; uint8_t csr; if (ep_type == UE_CONTROL) { @@ -1395,6 +1360,19 @@ /* select endpoint */ MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, ep_no); + /* compute max frame size */ + mps = wMaxPacket & 0x7FF; + switch ((wMaxPacket >> 11) & 3) { + case 1: + mps *= 2; + break; + case 2: + mps *= 3; + break; + default: + break; + } + if (ep_dir == UE_DIR_IN) { /* Configure endpoint */ @@ -1437,6 +1415,18 @@ MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL, 0); csr = MUSB2_READ_1(sc, MUSB2_REG_TXCSRL); + /* set double/single buffering */ + temp = MUSB2_READ_2(sc, MUSB2_REG_TXDBDIS); + if (mps <= (sc->sc_hw_ep_profile[ep_no]. + max_in_frame_size / 2)) { + /* double buffer */ + temp &= ~(1 << ep_no); + } else { + /* single buffer */ + temp |= (1 << ep_no); + } + MUSB2_WRITE_2(sc, MUSB2_REG_TXDBDIS, temp); + /* clear sent stall */ if (csr & MUSB2_MASK_CSRL_TXSENTSTALL) { MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL, 0); @@ -1466,7 +1456,6 @@ } /* Need to flush twice in case of double bufring */ - csr = MUSB2_READ_1(sc, MUSB2_REG_RXCSRL); if (csr & MUSB2_MASK_CSRL_RXPKTRDY) { MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRL, @@ -1484,6 +1473,18 @@ MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRL, 0); csr = MUSB2_READ_1(sc, MUSB2_REG_RXCSRL); + /* set double/single buffering */ + temp = MUSB2_READ_2(sc, MUSB2_REG_RXDBDIS); + if (mps <= (sc->sc_hw_ep_profile[ep_no]. + max_out_frame_size / 2)) { + /* double buffer */ + temp &= ~(1 << ep_no); + } else { + /* single buffer */ + temp |= (1 << ep_no); + } + MUSB2_WRITE_2(sc, MUSB2_REG_RXDBDIS, temp); + /* clear sent stall */ if (csr & MUSB2_MASK_CSRL_RXSENTSTALL) { MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRL, 0); @@ -1525,9 +1526,13 @@ usb2_error_t musbotg_init(struct musbotg_softc *sc) { + struct usb2_hw_ep_profile *pf; uint8_t nrx; uint8_t ntx; uint8_t temp; + uint8_t fsize; + uint8_t frx; + uint8_t ftx; DPRINTFN(1, "start\n"); @@ -1558,11 +1563,10 @@ /* wait a little bit (10ms) */ usb2_pause_mtx(&sc->sc_bus.mtx, 10); - /* enable double packet buffering */ + /* disable double packet buffering */ + MUSB2_WRITE_2(sc, MUSB2_REG_RXDBDIS, 0xFFFF); + MUSB2_WRITE_2(sc, MUSB2_REG_TXDBDIS, 0xFFFF); - MUSB2_WRITE_2(sc, MUSB2_REG_RXDBDIS, 0); - MUSB2_WRITE_2(sc, MUSB2_REG_TXDBDIS, 0); - /* enable HighSpeed and ISO Update flags */ MUSB2_WRITE_1(sc, MUSB2_REG_POWER, @@ -1600,10 +1604,10 @@ DPRINTFN(2, "RX/TX endpoints: %u/%u\n", nrx, ntx); - sc->sc_ep_max = (nrx < ntx) ? nrx : ntx; - sc->sc_ep_rx_max = nrx; - sc->sc_ep_tx_max = ntx; - + sc->sc_ep_max = (nrx > ntx) ? nrx : ntx; + if (sc->sc_ep_max == 0) { + DPRINTFN(2, "ERROR: Looks like the clocks are off!\n"); + } /* read out configuration data */ sc->sc_conf_data = MUSB2_READ_1(sc, MUSB2_REG_CONFDATA); @@ -1614,6 +1618,51 @@ DPRINTFN(2, "HW version: 0x%04x\n", MUSB2_READ_1(sc, MUSB2_REG_HWVERS)); + /* initialise endpoint profiles */ + + for (temp = 1; temp <= sc->sc_ep_max; temp++) { + pf = sc->sc_hw_ep_profile + temp; + + /* select endpoint */ + MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, temp); + + fsize = MUSB2_READ_1(sc, MUSB2_REG_FSIZE); + frx = (fsize & MUSB2_MASK_RX_FSIZE) / 16;; + ftx = (fsize & MUSB2_MASK_TX_FSIZE); + + DPRINTF("Endpoint %u FIFO size: IN=%u, OUT=%u\n", + temp, pf->max_in_frame_size, + pf->max_out_frame_size); + + if (frx && ftx && (temp <= nrx) && (temp <= ntx)) { + pf->max_in_frame_size = 1 << ftx; + pf->max_out_frame_size = 1 << frx; + pf->is_simplex = 0; /* duplex */ + pf->support_multi_buffer = 1; + pf->support_bulk = 1; + pf->support_interrupt = 1; + pf->support_isochronous = 1; + pf->support_in = 1; + pf->support_out = 1; + } else if (frx && (temp <= nrx)) { + pf->max_out_frame_size = 1 << frx; + pf->is_simplex = 1; /* simplex */ + pf->support_multi_buffer = 1; + pf->support_bulk = 1; + pf->support_interrupt = 1; + pf->support_isochronous = 1; + pf->support_out = 1; + } else if (ftx && (temp <= ntx)) { + pf->max_in_frame_size = 1 << ftx; + pf->is_simplex = 1; /* simplex */ + pf->support_multi_buffer = 1; + pf->support_bulk = 1; + pf->support_interrupt = 1; + pf->support_isochronous = 1; + pf->support_in = 1; + } + } + /* turn on default interrupts */ MUSB2_WRITE_1(sc, MUSB2_REG_INTUSBE, ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#3 (text+ko) ==== @@ -353,6 +353,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; + struct usb2_hw_ep_profile sc_hw_ep_profile[16]; struct resource *sc_io_res; struct resource *sc_irq_res; @@ -366,10 +367,6 @@ void *sc_clocks_arg; uint8_t sc_ep_max; /* maximum number of duplex endpoints */ - uint8_t sc_ep_rx_max; /* maximum number of simplex RX - * endpoints */ - uint8_t sc_ep_tx_max; /* maximum number of simplex TX - * endpoints */ uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ uint8_t sc_conf; /* root HUB config */ From owner-p4-projects@FreeBSD.ORG Tue Aug 26 18:35:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 029FF1065677; Tue, 26 Aug 2008 18:35: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 BA2CB106564A for ; Tue, 26 Aug 2008 18:35:26 +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 9EB678FC1D for ; Tue, 26 Aug 2008 18:35:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QIZQTo095927 for ; Tue, 26 Aug 2008 18:35:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QIZQPh095925 for perforce@freebsd.org; Tue, 26 Aug 2008 18:35:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 26 Aug 2008 18:35:26 GMT Message-Id: <200808261835.m7QIZQPh095925@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 148538 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, 26 Aug 2008 18:35:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=148538 Change 148538 by hselasky@hselasky_laptop001 on 2008/08/26 18:34:51 Device Side driver related change: Allow different IN and OUT endpoint buffer sizes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#10 (text+ko) ==== @@ -131,12 +131,14 @@ at91dci_ep_profile[AT91_UDP_EP_MAX] = { [0] = { - .max_frame_size = 8, + .max_in_frame_size = 8, + .max_out_frame_size = 8, .is_simplex = 1, .support_control = 1, }, [1] = { - .max_frame_size = 64, + .max_in_frame_size = 64, + .max_out_frame_size = 64, .is_simplex = 1, .support_multi_buffer = 1, .support_bulk = 1, @@ -146,7 +148,8 @@ .support_out = 1, }, [2] = { - .max_frame_size = 64, + .max_in_frame_size = 64, + .max_out_frame_size = 64, .is_simplex = 1, .support_multi_buffer = 1, .support_bulk = 1, @@ -157,14 +160,16 @@ }, [3] = { /* can also do BULK */ - .max_frame_size = 8, + .max_in_frame_size = 8, + .max_out_frame_size = 8, .is_simplex = 1, .support_interrupt = 1, .support_in = 1, .support_out = 1, }, [4] = { - .max_frame_size = 256, + .max_in_frame_size = 256, + .max_out_frame_size = 256, .is_simplex = 1, .support_multi_buffer = 1, .support_bulk = 1, @@ -174,7 +179,8 @@ .support_out = 1, }, [5] = { - .max_frame_size = 256, + .max_in_frame_size = 256, + .max_out_frame_size = 256, .is_simplex = 1, .support_multi_buffer = 1, .support_bulk = 1, ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#3 (text+ko) ==== @@ -103,7 +103,8 @@ * endpoint supports. */ struct usb2_hw_ep_profile { - uint16_t max_frame_size; + uint16_t max_in_frame_size; /* IN-token direction */ + uint16_t max_out_frame_size; /* OUT-token direction */ uint8_t is_simplex:1; uint8_t support_multi_buffer:1; uint8_t support_bulk:1; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#9 (text+ko) ==== @@ -107,12 +107,14 @@ uss820dci_ep_profile[] = { [0] = { - .max_frame_size = 32, + .max_in_frame_size = 32, + .max_out_frame_size = 32, .is_simplex = 0, .support_control = 1, }, [1] = { - .max_frame_size = 64, + .max_in_frame_size = 64, + .max_out_frame_size = 64, .is_simplex = 0, .support_multi_buffer = 1, .support_bulk = 1, @@ -121,7 +123,8 @@ .support_out = 1, }, [2] = { - .max_frame_size = 8, + .max_in_frame_size = 8, + .max_out_frame_size = 8, .is_simplex = 0, .support_multi_buffer = 1, .support_bulk = 1, @@ -130,7 +133,8 @@ .support_out = 1, }, [3] = { - .max_frame_size = 256, + .max_in_frame_size = 256, + .max_out_frame_size = 256, .is_simplex = 0, .support_multi_buffer = 1, .support_isochronous = 1, @@ -1437,16 +1441,21 @@ uss820dci_get_hw_ep_profile(NULL, &pf, n); + /* the maximum frame sizes should be the same */ + if (pf->max_in_frame_size != pf->max_out_frame_size) { + DPRINTF("Max frame size mismatch %u != %u\n", + pf->max_in_frame_size, pf->max_out_frame_size); + } if (pf->support_isochronous) { - if (pf->max_frame_size <= 64) { + if (pf->max_in_frame_size <= 64) { temp = (USS820_TXCON_FFSZ_16_64 | USS820_TXCON_TXISO | USS820_TXCON_ATM); - } else if (pf->max_frame_size <= 256) { + } else if (pf->max_in_frame_size <= 256) { temp = (USS820_TXCON_FFSZ_64_256 | USS820_TXCON_TXISO | USS820_TXCON_ATM); - } else if (pf->max_frame_size <= 512) { + } else if (pf->max_in_frame_size <= 512) { temp = (USS820_TXCON_FFSZ_8_512 | USS820_TXCON_TXISO | USS820_TXCON_ATM); @@ -1456,14 +1465,14 @@ USS820_TXCON_ATM); } } else { - if ((pf->max_frame_size <= 8) && + if ((pf->max_in_frame_size <= 8) && (sc->sc_flags.mcsr_feat)) { temp = (USS820_TXCON_FFSZ_8_512 | USS820_TXCON_ATM); - } else if (pf->max_frame_size <= 16) { + } else if (pf->max_in_frame_size <= 16) { temp = (USS820_TXCON_FFSZ_16_64 | USS820_TXCON_ATM); - } else if ((pf->max_frame_size <= 32) && + } else if ((pf->max_in_frame_size <= 32) && (sc->sc_flags.mcsr_feat)) { temp = (USS820_TXCON_FFSZ_32_1024 | USS820_TXCON_ATM); ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#6 (text+ko) ==== @@ -492,6 +492,7 @@ const struct usb2_hw_ep_profile *pf; uint16_t distance; uint16_t temp; + uint16_t max_frame_size; uint8_t n; uint8_t best_n; uint8_t dir_in; @@ -547,8 +548,15 @@ /* mismatch */ continue; } - if (pf->max_frame_size >= ep->max_frame_size) { - temp = (pf->max_frame_size - ep->max_frame_size); + /* get maximum frame size */ + if (dir_in) + max_frame_size = pf->max_in_frame_size; + else + max_frame_size = pf->max_out_frame_size; + + /* check if we have a matching profile */ + if (max_frame_size >= ep->max_frame_size) { + temp = (max_frame_size - ep->max_frame_size); if (distance > temp) { distance = temp; best_n = n; @@ -557,7 +565,7 @@ } else if ((ep->needs_ep_type == UE_BULK) || (ep->needs_ep_type == UE_CONTROL)) { /* frame size is not so important */ - temp = (ep->max_frame_size - pf->max_frame_size); + temp = (ep->max_frame_size - max_frame_size); if (distance > temp) { distance = temp; best_n = n; @@ -571,6 +579,12 @@ /* get the correct profile */ pf = ep->pf; + /* get maximum frame size */ + if (dir_in) + max_frame_size = pf->max_in_frame_size; + else + max_frame_size = pf->max_out_frame_size; + /* reserve IN-endpoint */ if (dir_in || pf->is_simplex) { ues->bmInAlloc[best_n / 8] |= @@ -588,8 +602,8 @@ * Frame Size than we wanted, we need to update the Maximum * Frame Size ! */ - if (ep->max_frame_size > pf->max_frame_size) { - ep->max_frame_size = pf->max_frame_size; + if (ep->max_frame_size > max_frame_size) { + ep->max_frame_size = max_frame_size; } return (0); /* got a match */ } @@ -809,7 +823,7 @@ */ while (1) { /* check if "mps" is ok */ - if (pf->max_frame_size >= mps) { + if (pf->max_in_frame_size >= mps) { break; } /* reduce maximum packet size */ @@ -829,7 +843,7 @@ mps = 512; } /* Check if we support the specified wMaxPacketSize */ - if (pf->max_frame_size < mps) { + if (pf->max_in_frame_size < mps) { return (USB_ERR_INVAL); } } From owner-p4-projects@FreeBSD.ORG Tue Aug 26 19:07:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6154106564A; Tue, 26 Aug 2008 19: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 445811065678 for ; Tue, 26 Aug 2008 19:07:05 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 238278FC13 for ; Tue, 26 Aug 2008 19:07:05 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QJ7593099889 for ; Tue, 26 Aug 2008 19:07:05 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QJ740E099871 for perforce@freebsd.org; Tue, 26 Aug 2008 19:07:04 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 26 Aug 2008 19:07:04 GMT Message-Id: <200808261907.m7QJ740E099871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 148540 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, 26 Aug 2008 19:07:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=148540 Change 148540 by nwhitehorn@nwhitehorn_trantor on 2008/08/26 19:07:00 Initial import for a PPC G5 branch. Affected files ... .. //depot/projects/ppc-g5/COPYRIGHT#1 branch .. //depot/projects/ppc-g5/LOCKS#1 branch .. //depot/projects/ppc-g5/MAINTAINERS#1 branch .. //depot/projects/ppc-g5/Makefile#1 branch .. //depot/projects/ppc-g5/Makefile.inc1#1 branch .. //depot/projects/ppc-g5/ObsoleteFiles.inc#1 branch .. //depot/projects/ppc-g5/README#1 branch .. //depot/projects/ppc-g5/UPDATING#1 branch .. //depot/projects/ppc-g5/bin/Makefile#1 branch .. //depot/projects/ppc-g5/bin/Makefile.inc#1 branch .. //depot/projects/ppc-g5/bin/cat/Makefile#1 branch .. //depot/projects/ppc-g5/bin/cat/cat.1#1 branch .. //depot/projects/ppc-g5/bin/cat/cat.c#1 branch .. //depot/projects/ppc-g5/bin/chflags/Makefile#1 branch .. //depot/projects/ppc-g5/bin/chflags/chflags.1#1 branch .. //depot/projects/ppc-g5/bin/chflags/chflags.c#1 branch .. //depot/projects/ppc-g5/bin/chio/Makefile#1 branch .. //depot/projects/ppc-g5/bin/chio/chio.1#1 branch .. //depot/projects/ppc-g5/bin/chio/chio.c#1 branch .. //depot/projects/ppc-g5/bin/chio/defs.h#1 branch .. //depot/projects/ppc-g5/bin/chio/pathnames.h#1 branch .. //depot/projects/ppc-g5/bin/chmod/Makefile#1 branch .. //depot/projects/ppc-g5/bin/chmod/chmod.1#1 branch .. //depot/projects/ppc-g5/bin/chmod/chmod.c#1 branch .. //depot/projects/ppc-g5/bin/cp/Makefile#1 branch .. //depot/projects/ppc-g5/bin/cp/cp.1#1 branch .. //depot/projects/ppc-g5/bin/cp/cp.c#1 branch .. //depot/projects/ppc-g5/bin/cp/extern.h#1 branch .. //depot/projects/ppc-g5/bin/cp/utils.c#1 branch .. //depot/projects/ppc-g5/bin/csh/Makefile#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/ppc-g5/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/ppc-g5/bin/csh/config.h#1 branch .. //depot/projects/ppc-g5/bin/csh/config_p.h#1 branch .. //depot/projects/ppc-g5/bin/csh/host.defs#1 branch .. //depot/projects/ppc-g5/bin/csh/iconv.h#1 branch .. //depot/projects/ppc-g5/bin/csh/iconv_stub.c#1 branch .. //depot/projects/ppc-g5/bin/date/Makefile#1 branch .. //depot/projects/ppc-g5/bin/date/date.1#1 branch .. //depot/projects/ppc-g5/bin/date/date.c#1 branch .. //depot/projects/ppc-g5/bin/date/extern.h#1 branch .. //depot/projects/ppc-g5/bin/date/netdate.c#1 branch .. //depot/projects/ppc-g5/bin/date/vary.c#1 branch .. //depot/projects/ppc-g5/bin/date/vary.h#1 branch .. //depot/projects/ppc-g5/bin/dd/Makefile#1 branch .. //depot/projects/ppc-g5/bin/dd/args.c#1 branch .. //depot/projects/ppc-g5/bin/dd/conv.c#1 branch .. //depot/projects/ppc-g5/bin/dd/conv_tab.c#1 branch .. //depot/projects/ppc-g5/bin/dd/dd.1#1 branch .. //depot/projects/ppc-g5/bin/dd/dd.c#1 branch .. //depot/projects/ppc-g5/bin/dd/dd.h#1 branch .. //depot/projects/ppc-g5/bin/dd/extern.h#1 branch .. //depot/projects/ppc-g5/bin/dd/gen.c#1 branch .. //depot/projects/ppc-g5/bin/dd/misc.c#1 branch .. //depot/projects/ppc-g5/bin/dd/position.c#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.ascii#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.ebcdic#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.ibm#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.lcase#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.oldascii#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.oldibm#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.pareven#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.parnone#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.parodd#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.parset#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.swab#1 branch .. //depot/projects/ppc-g5/bin/dd/ref.ucase#1 branch .. //depot/projects/ppc-g5/bin/df/Makefile#1 branch .. //depot/projects/ppc-g5/bin/df/df.1#1 branch .. //depot/projects/ppc-g5/bin/df/df.c#1 branch .. //depot/projects/ppc-g5/bin/domainname/Makefile#1 branch .. //depot/projects/ppc-g5/bin/domainname/domainname.1#1 branch .. //depot/projects/ppc-g5/bin/domainname/domainname.c#1 branch .. //depot/projects/ppc-g5/bin/echo/Makefile#1 branch .. //depot/projects/ppc-g5/bin/echo/echo.1#1 branch .. //depot/projects/ppc-g5/bin/echo/echo.c#1 branch .. //depot/projects/ppc-g5/bin/ed/Makefile#1 branch .. //depot/projects/ppc-g5/bin/ed/POSIX#1 branch .. //depot/projects/ppc-g5/bin/ed/README#1 branch .. //depot/projects/ppc-g5/bin/ed/buf.c#1 branch .. //depot/projects/ppc-g5/bin/ed/cbc.c#1 branch .. //depot/projects/ppc-g5/bin/ed/ed.1#1 branch .. //depot/projects/ppc-g5/bin/ed/ed.h#1 branch .. //depot/projects/ppc-g5/bin/ed/glbl.c#1 branch .. //depot/projects/ppc-g5/bin/ed/io.c#1 branch .. //depot/projects/ppc-g5/bin/ed/main.c#1 branch .. //depot/projects/ppc-g5/bin/ed/re.c#1 branch .. //depot/projects/ppc-g5/bin/ed/sub.c#1 branch .. //depot/projects/ppc-g5/bin/ed/test/=.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/Makefile#1 branch .. //depot/projects/ppc-g5/bin/ed/test/README#1 branch .. //depot/projects/ppc-g5/bin/ed/test/TODO#1 branch .. //depot/projects/ppc-g5/bin/ed/test/a.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/a.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/a.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/a1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/a2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/addr.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/addr.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/addr.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/addr1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/addr2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/ppc-g5/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/ppc-g5/bin/ed/test/ascii.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/bang1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/bang1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/bang1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/bang1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/bang2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/c.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/c.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/c.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/c1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/c2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/ppc-g5/bin/ed/test/d.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/d.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/d.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/d.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e2.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e2.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e2.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e3.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e3.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e3.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e3.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e4.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e4.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/e4.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/f1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/f2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g2.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g2.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g2.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g3.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g3.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g3.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g3.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g4.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g4.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g4.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g5.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g5.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/g5.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/h.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/i.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/i.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/i.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/i1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/i2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/i3.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/j.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/j.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/j.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k3.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/k4.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/l.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/l.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/l.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/m.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/m.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/m.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/m.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/ppc-g5/bin/ed/test/n.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/n.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/n.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl2.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl2.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/nl2.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/p.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/p.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/p.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/q.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/q.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/q.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/q1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r2.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r2.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r2.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r3.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r3.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/r3.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s10.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s2.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s2.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s2.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s3.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s3.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s3.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s3.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s4.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s5.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s6.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s7.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s8.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/s9.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t1.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t1.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t1.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t2.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t2.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/t2.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/u.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/u.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/u.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/u.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/v.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/v.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/v.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/w.d#1 branch .. //depot/projects/ppc-g5/bin/ed/test/w.r#1 branch .. //depot/projects/ppc-g5/bin/ed/test/w.t#1 branch .. //depot/projects/ppc-g5/bin/ed/test/w1.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/w2.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/w3.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/x.err#1 branch .. //depot/projects/ppc-g5/bin/ed/test/z.err#1 branch .. //depot/projects/ppc-g5/bin/ed/undo.c#1 branch .. //depot/projects/ppc-g5/bin/expr/Makefile#1 branch .. //depot/projects/ppc-g5/bin/expr/expr.1#1 branch .. //depot/projects/ppc-g5/bin/expr/expr.y#1 branch .. //depot/projects/ppc-g5/bin/getfacl/Makefile#1 branch .. //depot/projects/ppc-g5/bin/getfacl/getfacl.1#1 branch .. //depot/projects/ppc-g5/bin/getfacl/getfacl.c#1 branch .. //depot/projects/ppc-g5/bin/hostname/Makefile#1 branch .. //depot/projects/ppc-g5/bin/hostname/hostname.1#1 branch .. //depot/projects/ppc-g5/bin/hostname/hostname.c#1 branch .. //depot/projects/ppc-g5/bin/kenv/Makefile#1 branch .. //depot/projects/ppc-g5/bin/kenv/kenv.1#1 branch .. //depot/projects/ppc-g5/bin/kenv/kenv.c#1 branch .. //depot/projects/ppc-g5/bin/kill/Makefile#1 branch .. //depot/projects/ppc-g5/bin/kill/kill.1#1 branch .. //depot/projects/ppc-g5/bin/kill/kill.c#1 branch .. //depot/projects/ppc-g5/bin/ln/Makefile#1 branch .. //depot/projects/ppc-g5/bin/ln/ln.1#1 branch .. //depot/projects/ppc-g5/bin/ln/ln.c#1 branch .. //depot/projects/ppc-g5/bin/ln/symlink.7#1 branch .. //depot/projects/ppc-g5/bin/ls/Makefile#1 branch .. //depot/projects/ppc-g5/bin/ls/cmp.c#1 branch .. //depot/projects/ppc-g5/bin/ls/extern.h#1 branch .. //depot/projects/ppc-g5/bin/ls/ls.1#1 branch .. //depot/projects/ppc-g5/bin/ls/ls.c#1 branch .. //depot/projects/ppc-g5/bin/ls/ls.h#1 branch .. //depot/projects/ppc-g5/bin/ls/print.c#1 branch .. //depot/projects/ppc-g5/bin/ls/util.c#1 branch .. //depot/projects/ppc-g5/bin/mkdir/Makefile#1 branch .. //depot/projects/ppc-g5/bin/mkdir/mkdir.1#1 branch .. //depot/projects/ppc-g5/bin/mkdir/mkdir.c#1 branch .. //depot/projects/ppc-g5/bin/mv/Makefile#1 branch .. //depot/projects/ppc-g5/bin/mv/mv.1#1 branch .. //depot/projects/ppc-g5/bin/mv/mv.c#1 branch .. //depot/projects/ppc-g5/bin/pax/Makefile#1 branch .. //depot/projects/ppc-g5/bin/pax/ar_io.c#1 branch .. //depot/projects/ppc-g5/bin/pax/ar_subs.c#1 branch .. //depot/projects/ppc-g5/bin/pax/buf_subs.c#1 branch .. //depot/projects/ppc-g5/bin/pax/cache.c#1 branch .. //depot/projects/ppc-g5/bin/pax/cache.h#1 branch .. //depot/projects/ppc-g5/bin/pax/cpio.1#1 branch .. //depot/projects/ppc-g5/bin/pax/cpio.c#1 branch .. //depot/projects/ppc-g5/bin/pax/cpio.h#1 branch .. //depot/projects/ppc-g5/bin/pax/extern.h#1 branch .. //depot/projects/ppc-g5/bin/pax/file_subs.c#1 branch .. //depot/projects/ppc-g5/bin/pax/ftree.c#1 branch .. //depot/projects/ppc-g5/bin/pax/ftree.h#1 branch .. //depot/projects/ppc-g5/bin/pax/gen_subs.c#1 branch .. //depot/projects/ppc-g5/bin/pax/getoldopt.c#1 branch .. //depot/projects/ppc-g5/bin/pax/options.c#1 branch .. //depot/projects/ppc-g5/bin/pax/options.h#1 branch .. //depot/projects/ppc-g5/bin/pax/pat_rep.c#1 branch .. //depot/projects/ppc-g5/bin/pax/pat_rep.h#1 branch .. //depot/projects/ppc-g5/bin/pax/pax.1#1 branch .. //depot/projects/ppc-g5/bin/pax/pax.c#1 branch .. //depot/projects/ppc-g5/bin/pax/pax.h#1 branch .. //depot/projects/ppc-g5/bin/pax/sel_subs.c#1 branch .. //depot/projects/ppc-g5/bin/pax/sel_subs.h#1 branch .. //depot/projects/ppc-g5/bin/pax/tables.c#1 branch .. //depot/projects/ppc-g5/bin/pax/tables.h#1 branch .. //depot/projects/ppc-g5/bin/pax/tar.1#1 branch .. //depot/projects/ppc-g5/bin/pax/tar.c#1 branch .. //depot/projects/ppc-g5/bin/pax/tar.h#1 branch .. //depot/projects/ppc-g5/bin/pax/tty_subs.c#1 branch .. //depot/projects/ppc-g5/bin/ps/Makefile#1 branch .. //depot/projects/ppc-g5/bin/ps/extern.h#1 branch .. //depot/projects/ppc-g5/bin/ps/fmt.c#1 branch .. //depot/projects/ppc-g5/bin/ps/keyword.c#1 branch .. //depot/projects/ppc-g5/bin/ps/nlist.c#1 branch .. //depot/projects/ppc-g5/bin/ps/print.c#1 branch .. //depot/projects/ppc-g5/bin/ps/ps.1#1 branch .. //depot/projects/ppc-g5/bin/ps/ps.c#1 branch .. //depot/projects/ppc-g5/bin/ps/ps.h#1 branch .. //depot/projects/ppc-g5/bin/pwd/Makefile#1 branch .. //depot/projects/ppc-g5/bin/pwd/pwd.1#1 branch .. //depot/projects/ppc-g5/bin/pwd/pwd.c#1 branch .. //depot/projects/ppc-g5/bin/rcp/Makefile#1 branch .. //depot/projects/ppc-g5/bin/rcp/extern.h#1 branch .. //depot/projects/ppc-g5/bin/rcp/rcp.1#1 branch .. //depot/projects/ppc-g5/bin/rcp/rcp.c#1 branch .. //depot/projects/ppc-g5/bin/rcp/util.c#1 branch .. //depot/projects/ppc-g5/bin/realpath/Makefile#1 branch .. //depot/projects/ppc-g5/bin/realpath/realpath.1#1 branch .. //depot/projects/ppc-g5/bin/realpath/realpath.c#1 branch .. //depot/projects/ppc-g5/bin/rm/Makefile#1 branch .. //depot/projects/ppc-g5/bin/rm/rm.1#1 branch .. //depot/projects/ppc-g5/bin/rm/rm.c#1 branch .. //depot/projects/ppc-g5/bin/rmail/Makefile#1 branch .. //depot/projects/ppc-g5/bin/rmdir/Makefile#1 branch .. //depot/projects/ppc-g5/bin/rmdir/rmdir.1#1 branch .. //depot/projects/ppc-g5/bin/rmdir/rmdir.c#1 branch .. //depot/projects/ppc-g5/bin/setfacl/Makefile#1 branch .. //depot/projects/ppc-g5/bin/setfacl/file.c#1 branch .. //depot/projects/ppc-g5/bin/setfacl/mask.c#1 branch .. //depot/projects/ppc-g5/bin/setfacl/merge.c#1 branch .. //depot/projects/ppc-g5/bin/setfacl/remove.c#1 branch .. //depot/projects/ppc-g5/bin/setfacl/setfacl.1#1 branch .. //depot/projects/ppc-g5/bin/setfacl/setfacl.c#1 branch .. //depot/projects/ppc-g5/bin/setfacl/setfacl.h#1 branch .. //depot/projects/ppc-g5/bin/setfacl/util.c#1 branch .. //depot/projects/ppc-g5/bin/sh/Makefile#1 branch .. //depot/projects/ppc-g5/bin/sh/TOUR#1 branch .. //depot/projects/ppc-g5/bin/sh/alias.c#1 branch .. //depot/projects/ppc-g5/bin/sh/alias.h#1 branch .. //depot/projects/ppc-g5/bin/sh/arith.h#1 branch .. //depot/projects/ppc-g5/bin/sh/arith.y#1 branch .. //depot/projects/ppc-g5/bin/sh/arith_lex.l#1 branch .. //depot/projects/ppc-g5/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/ppc-g5/bin/sh/bltin/echo.1#1 branch .. //depot/projects/ppc-g5/bin/sh/bltin/echo.c#1 branch .. //depot/projects/ppc-g5/bin/sh/builtins.def#1 branch .. //depot/projects/ppc-g5/bin/sh/cd.c#1 branch .. //depot/projects/ppc-g5/bin/sh/cd.h#1 branch .. //depot/projects/ppc-g5/bin/sh/error.c#1 branch .. //depot/projects/ppc-g5/bin/sh/error.h#1 branch .. //depot/projects/ppc-g5/bin/sh/eval.c#1 branch .. //depot/projects/ppc-g5/bin/sh/eval.h#1 branch .. //depot/projects/ppc-g5/bin/sh/exec.c#1 branch .. //depot/projects/ppc-g5/bin/sh/exec.h#1 branch .. //depot/projects/ppc-g5/bin/sh/expand.c#1 branch .. //depot/projects/ppc-g5/bin/sh/expand.h#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/cmv#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/dirs#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/kill#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/login#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/newgrp#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/popd#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/pushd#1 branch .. //depot/projects/ppc-g5/bin/sh/funcs/suspend#1 branch .. //depot/projects/ppc-g5/bin/sh/histedit.c#1 branch .. //depot/projects/ppc-g5/bin/sh/init.h#1 branch .. //depot/projects/ppc-g5/bin/sh/input.c#1 branch .. //depot/projects/ppc-g5/bin/sh/input.h#1 branch .. //depot/projects/ppc-g5/bin/sh/jobs.c#1 branch .. //depot/projects/ppc-g5/bin/sh/jobs.h#1 branch .. //depot/projects/ppc-g5/bin/sh/mail.c#1 branch .. //depot/projects/ppc-g5/bin/sh/mail.h#1 branch .. //depot/projects/ppc-g5/bin/sh/main.c#1 branch .. //depot/projects/ppc-g5/bin/sh/main.h#1 branch .. //depot/projects/ppc-g5/bin/sh/memalloc.c#1 branch .. //depot/projects/ppc-g5/bin/sh/memalloc.h#1 branch .. //depot/projects/ppc-g5/bin/sh/miscbltin.c#1 branch .. //depot/projects/ppc-g5/bin/sh/mkbuiltins#1 branch .. //depot/projects/ppc-g5/bin/sh/mkinit.c#1 branch .. //depot/projects/ppc-g5/bin/sh/mknodes.c#1 branch .. //depot/projects/ppc-g5/bin/sh/mksyntax.c#1 branch .. //depot/projects/ppc-g5/bin/sh/mktokens#1 branch .. //depot/projects/ppc-g5/bin/sh/myhistedit.h#1 branch .. //depot/projects/ppc-g5/bin/sh/mystring.c#1 branch .. //depot/projects/ppc-g5/bin/sh/mystring.h#1 branch .. //depot/projects/ppc-g5/bin/sh/nodes.c.pat#1 branch .. //depot/projects/ppc-g5/bin/sh/nodetypes#1 branch .. //depot/projects/ppc-g5/bin/sh/options.c#1 branch .. //depot/projects/ppc-g5/bin/sh/options.h#1 branch .. //depot/projects/ppc-g5/bin/sh/output.c#1 branch .. //depot/projects/ppc-g5/bin/sh/output.h#1 branch .. //depot/projects/ppc-g5/bin/sh/parser.c#1 branch .. //depot/projects/ppc-g5/bin/sh/parser.h#1 branch .. //depot/projects/ppc-g5/bin/sh/redir.c#1 branch .. //depot/projects/ppc-g5/bin/sh/redir.h#1 branch .. //depot/projects/ppc-g5/bin/sh/sh.1#1 branch .. //depot/projects/ppc-g5/bin/sh/shell.h#1 branch .. //depot/projects/ppc-g5/bin/sh/show.c#1 branch .. //depot/projects/ppc-g5/bin/sh/show.h#1 branch .. //depot/projects/ppc-g5/bin/sh/trap.c#1 branch .. //depot/projects/ppc-g5/bin/sh/trap.h#1 branch .. //depot/projects/ppc-g5/bin/sh/var.c#1 branch .. //depot/projects/ppc-g5/bin/sh/var.h#1 branch .. //depot/projects/ppc-g5/bin/sleep/Makefile#1 branch .. //depot/projects/ppc-g5/bin/sleep/sleep.1#1 branch .. //depot/projects/ppc-g5/bin/sleep/sleep.c#1 branch .. //depot/projects/ppc-g5/bin/stty/Makefile#1 branch .. //depot/projects/ppc-g5/bin/stty/cchar.c#1 branch .. //depot/projects/ppc-g5/bin/stty/extern.h#1 branch .. //depot/projects/ppc-g5/bin/stty/gfmt.c#1 branch .. //depot/projects/ppc-g5/bin/stty/key.c#1 branch .. //depot/projects/ppc-g5/bin/stty/modes.c#1 branch .. //depot/projects/ppc-g5/bin/stty/print.c#1 branch .. //depot/projects/ppc-g5/bin/stty/stty.1#1 branch .. //depot/projects/ppc-g5/bin/stty/stty.c#1 branch .. //depot/projects/ppc-g5/bin/stty/stty.h#1 branch .. //depot/projects/ppc-g5/bin/stty/util.c#1 branch .. //depot/projects/ppc-g5/bin/sync/Makefile#1 branch .. //depot/projects/ppc-g5/bin/sync/sync.8#1 branch .. //depot/projects/ppc-g5/bin/sync/sync.c#1 branch .. //depot/projects/ppc-g5/bin/test/Makefile#1 branch .. //depot/projects/ppc-g5/bin/test/TEST.README#1 branch .. //depot/projects/ppc-g5/bin/test/TEST.csh#1 branch .. //depot/projects/ppc-g5/bin/test/TEST.sh#1 branch .. //depot/projects/ppc-g5/bin/test/test.1#1 branch .. //depot/projects/ppc-g5/bin/test/test.c#1 branch .. //depot/projects/ppc-g5/bin/uuidgen/Makefile#1 branch .. //depot/projects/ppc-g5/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/ppc-g5/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/ppc-g5/cddl/Makefile#1 branch .. //depot/projects/ppc-g5/cddl/Makefile.inc#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 19:51:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8779E1065675; Tue, 26 Aug 2008 19:51: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 288131065672 for ; Tue, 26 Aug 2008 19:51:56 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06E3A8FC15 for ; Tue, 26 Aug 2008 19:51:56 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QJptrQ003725 for ; Tue, 26 Aug 2008 19:51:55 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QJpt3b003723 for perforce@freebsd.org; Tue, 26 Aug 2008 19:51:55 GMT (envelope-from andenore@FreeBSD.org) Date: Tue, 26 Aug 2008 19:51:55 GMT Message-Id: <200808261951.m7QJpt3b003723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 148544 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, 26 Aug 2008 19:51:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=148544 Change 148544 by andenore@andenore_laptop on 2008/08/26 19:51:46 Fixed problem with large packages download status in url.c Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#13 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#7 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/show.c#10 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#12 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#7 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#13 (text+ko) ==== @@ -52,7 +52,7 @@ - A @comment DATE:YYYY-MM-DD hh:mm:ss has been added (affects add/create/info/lib) -Fixed bugs in -CURRENT: +Fixed bugs which exists in -CURRENT and possibly earlier versions: - Fixed a bug with the oldstyle -W handling of empty @cwd's, which leads to a number of files installed by packages not beeing recognized. - pkg_add -r of two packages (or more I assume) where the first depends on ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ struct reqr_by_head *rb_list; if (MatchType != MATCH_EXACT) { - matched = matchinstalled(MatchType, pkgs, &errcode); + matched = matchinstalled(MatchType * (DateMatch ? 10 : 1), pkgs, &errcode); if (errcode != 0) return 1; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/show.c#10 (text+ko) ==== @@ -198,6 +198,10 @@ "\tPackage origin: %s\n", p->name); break; + case PLIST_DATE: + printf(Quiet ? "$comment DATE:%s\n" : "\tInstalldate: %s", p->name); + break; + default: cleanup(0); errx(2, "%s: unknown command type %d (%s)", ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#12 (text+ko) ==== @@ -271,7 +271,7 @@ void read_plist(Package *pkg, FILE *fp) { - char *cp, date[20], time[20], pline[FILENAME_MAX]; + char *cp, pline[FILENAME_MAX]; int cmd, major, minor; pkg->fmtver_maj = 1; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ char * fileGetURL(const char *base, const char *spec, int keep_package) { - char *cp, *rp, *tmp; + char *cp, *rp, *tmp, *strippedName; char fname[FILENAME_MAX]; char pen[FILENAME_MAX]; char pkg[FILENAME_MAX]; @@ -51,9 +51,10 @@ Boolean gotStat = FALSE; struct timeval oldtime, newtime; struct ttysize ws; - int cols = 80, dspeed = 0, acc = 0, fileSize, count=0; + int cols = 80, dspeed = 0, acc = 0; + off_t count = 0, fileSize = 0; double time = 0; - char tmpString[512]; + char tmpString[512], sFileSize[10]; bzero(&oldtime, sizeof(oldtime)); @@ -121,7 +122,8 @@ warn("Error: Could not get filestat for url: %s", fname); } else { gotStat = TRUE; - fileSize = (int)ustat.size; + fileSize = ustat.size; + snprintf(sFileSize, sizeof(sFileSize), "%s", (char *)getHumanReadable(fileSize)); } if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) { @@ -132,7 +134,7 @@ if (isatty(0) || Verbose) { printf("Fetching %s from %s...\n", - gotStat ? (char *)getHumanReadable(fileSize) : "", fname); + gotStat ? sFileSize : "", fname); fflush(stdout); } pen[0] = '\0'; @@ -197,16 +199,14 @@ count += r; acc += r; - char *strippedName = strrchr(fname, '/'); - char progress[64]; - + strippedName = strrchr(fname, '/'); if (strippedName) strippedName++; - snprintf(progress, sizeof(progress), "%s", (char *)getHumanReadable(count)); - int perc = (int)count*100 / fileSize; + + int perc = (count*100) / fileSize; snprintf(tmpString, sizeof(tmpString), "%3i%% of %*s %*sps", - gotStat ? perc : 100, 9, progress, 9, + gotStat ? perc : 100, 9, sFileSize, 9, (char *)getHumanReadable(dspeed ? dspeed : acc)); if (isatty(0) || Verbose) From owner-p4-projects@FreeBSD.ORG Tue Aug 26 19:56:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D6C71065678; Tue, 26 Aug 2008 19:56: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 C59971065674 for ; Tue, 26 Aug 2008 19:56:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A18988FC1A for ; Tue, 26 Aug 2008 19:56:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QJu0UP004110 for ; Tue, 26 Aug 2008 19:56:00 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QJu09K004108 for perforce@freebsd.org; Tue, 26 Aug 2008 19:56:00 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 26 Aug 2008 19:56:00 GMT Message-Id: <200808261956.m7QJu09K004108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 148545 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, 26 Aug 2008 19:56:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=148545 Change 148545 by nwhitehorn@nwhitehorn_trantor on 2008/08/26 19:55:27 Support for the G5 as it currently stands. Boots multiuser and is self-hosting on my iMac. Built-in SATA nonfunctional, and INVARIANTS is broken. Affected files ... .. //depot/projects/ppc-g5/lib/libc/powerpc/gen/syncicache.c#2 edit .. //depot/projects/ppc-g5/sys/conf/files.powerpc#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#1 add .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/uio_machdep.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/uma_machdep.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/vm_machdep.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/hid.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/md_var.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/pte.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/sf_buf.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/include/vmparam.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pci.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#1 add .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#1 add .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powerpc/syncicache.c#2 edit Differences ... ==== //depot/projects/ppc-g5/lib/libc/powerpc/gen/syncicache.c#2 (text+ko) ==== @@ -48,27 +48,23 @@ #include #if defined(_KERNEL) || defined(_STANDALONE) -#ifndef CACHELINESIZE -#error "Must know the size of a cache line" -#endif +int cacheline_size = 32; #else #include +static int cacheline_size; static void getcachelinesize(void); -static int _cachelinesize; -#define CACHELINESIZE _cachelinesize - static void getcachelinesize() { static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; int clen; - clen = sizeof(_cachelinesize); + clen = sizeof(cacheline_size); if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize) { + &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) { abort(); } } @@ -81,21 +77,23 @@ char *p; #if !defined(_KERNEL) && !defined(_STANDALONE) - if (!_cachelinesize) + if (!cacheline_size) getcachelinesize(); #endif - off = (u_int)from & (CACHELINESIZE - 1); + + off = (u_int)from & (cacheline_size - 1); l = len += off; p = (char *)from - off; + do { __asm __volatile ("dcbst 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((l -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((l -= cacheline_size) > 0); __asm __volatile ("sync"); p = (char *)from - off; do { __asm __volatile ("icbi 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((len -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } ==== //depot/projects/ppc-g5/sys/conf/files.powerpc#2 (text+ko) ==== @@ -70,6 +70,7 @@ powerpc/aim/locore.S optional aim no-obj powerpc/aim/machdep.c optional aim powerpc/aim/mmu_oea.c optional aim +powerpc/aim/mmu_oea64.c optional aim powerpc/aim/mp_cpudep.c optional aim smp powerpc/aim/nexus.c optional aim powerpc/aim/ofw_machdep.c optional aim @@ -116,6 +117,7 @@ powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch powerpc/powermac/uninorth.c optional powermac pci +powerpc/powermac/cpcht.c optional powermac pci powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard ==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#2 (text+ko) ==== @@ -128,6 +128,8 @@ #endif int cold = 1; +int ppc64 = 0; +int hw_direct_map = 1; struct pcpu __pcpu[MAXCPU]; @@ -136,7 +138,7 @@ char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); -static int cacheline_size = CACHELINESIZE; +extern int cacheline_size; SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, CTLFLAG_RD, &cacheline_size, 0, ""); @@ -229,6 +231,9 @@ extern char kernel_text[], _end[]; +extern void *testppc64, *testppc64size; +extern void *restorebridge, *restorebridgesize; +extern void *rfid_patch, *rfi_patch1, *rfi_patch2; #ifdef SMP extern void *rstcode, *rstsize; #endif @@ -245,11 +250,15 @@ { struct pcpu *pc; vm_offset_t end; + size_t trap_offset; void *kmdp; char *env; + int vers; + uint32_t msr, scratch; end = 0; kmdp = NULL; + trap_offset = 0; /* * Parse metadata if present and fetch parameters. Must be done @@ -305,6 +314,26 @@ printf("powerpc_init: no loader metadata.\n"); } + /* + * Set cacheline_size based on the CPU model. + */ + + vers = mfpvr() >> 16; + switch (vers) { + case IBM970: + case IBM970FX: + case IBM970MP: + case IBM970GX: + cacheline_size = 128; + break; + default: + cacheline_size = 32; + } + + /* + * Init KDB and KOBJ + */ + kdb_init(); kobj_machdep_init(); @@ -314,47 +343,110 @@ * Disable translation in case the vector area * hasn't been mapped (G5) */ - mtmsr(mfmsr() & ~(PSL_IR | PSL_DR)); + msr = mfmsr(); + mtmsr(msr & ~(PSL_IR | PSL_DR)); isync(); + + /* + * Figure out whether we need to use the 64 bit PMAP. This works by + * executing an instruction that is only legal on 64-bit PPC (mtmsrd), + * and setting ppc64 = 0 if that causes a trap. + */ + + ppc64 = 1; + + bcopy(&testppc64, (void *)EXC_PGM, (size_t)&testppc64size); + __syncicache((void *)EXC_PGM, (size_t)&testppc64size); + + __asm __volatile("\ + mfmsr %0; \ + mtsprg2 %1; \ + \ + mtmsrd %0; \ + mfsprg2 %1;" + : "=r"(scratch), "=r"(ppc64)); + + /* + * Now copy restorebridge into all the handlers, if necessary, + * and set up the trap tables. + */ + + if (ppc64) { + /* Patch the two instances of rfi -> rfid */ + bcopy(&rfid_patch,&rfi_patch1,4); + bcopy(&rfid_patch,&rfi_patch2,4); + + /* Copy a code snippet to restore 32-bit bridge mode + * to the top of every trap handler */ + trap_offset += (size_t)&restorebridgesize; + bcopy(&restorebridge, (void *)EXC_RST, trap_offset); + bcopy(&restorebridge, (void *)EXC_MCHK, trap_offset); + bcopy(&restorebridge, (void *)EXC_DSI, trap_offset); + bcopy(&restorebridge, (void *)EXC_ISI, trap_offset); + bcopy(&restorebridge, (void *)EXC_EXI, trap_offset); + bcopy(&restorebridge, (void *)EXC_ALI, trap_offset); + bcopy(&restorebridge, (void *)EXC_PGM, trap_offset); + bcopy(&restorebridge, (void *)EXC_FPU, trap_offset); + bcopy(&restorebridge, (void *)EXC_DECR, trap_offset); + bcopy(&restorebridge, (void *)EXC_SC, trap_offset); + bcopy(&restorebridge, (void *)EXC_TRC, trap_offset); + bcopy(&restorebridge, (void *)EXC_FPA, trap_offset); + bcopy(&restorebridge, (void *)EXC_VEC, trap_offset); + bcopy(&restorebridge, (void *)EXC_VECAST, trap_offset); + bcopy(&restorebridge, (void *)EXC_THRM, trap_offset); + bcopy(&restorebridge, (void *)EXC_BPT, trap_offset); + } + #ifdef SMP - bcopy(&rstcode, (void *)EXC_RST, (size_t)&rstsize); + bcopy(&rstcode, (void *)(EXC_RST + trap_offset), (size_t)&rstsize); #else - bcopy(&trapcode, (void *)EXC_RST, (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_RST + trap_offset), (size_t)&trapsize); +#endif + bcopy(&trapcode, (void *)(EXC_MCHK + trap_offset), (size_t)&trapsize); +#if 0 + if (ppc64) + bcopy(&alitrap, (void *)(EXC_DSI + trap_offset), (size_t)&alisize); + else #endif - bcopy(&trapcode, (void *)EXC_MCHK, (size_t)&trapsize); - bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize); - bcopy(&trapcode, (void *)EXC_ISI, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_EXI, (size_t)&trapsize); - bcopy(&alitrap, (void *)EXC_ALI, (size_t)&alisize); - bcopy(&trapcode, (void *)EXC_PGM, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_FPU, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_DECR, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_SC, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_TRC, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_FPA, (size_t)&trapsize); - bcopy(&vectrap, (void *)EXC_VEC, (size_t)&vectrapsize); - bcopy(&trapcode, (void *)EXC_VECAST, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_THRM, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_BPT, (size_t)&trapsize); + bcopy(&dsitrap, (void *)(EXC_DSI + trap_offset), (size_t)&dsisize); + bcopy(&trapcode, (void *)(EXC_ISI + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_EXI + trap_offset), (size_t)&trapsize); + bcopy(&alitrap, (void *)(EXC_ALI + trap_offset), (size_t)&alisize); + bcopy(&trapcode, (void *)(EXC_PGM + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_FPU + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_DECR + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_SC + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_TRC + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_FPA + trap_offset), (size_t)&trapsize); + bcopy(&vectrap, (void *)(EXC_VEC + trap_offset), (size_t)&vectrapsize); + bcopy(&trapcode, (void *)(EXC_VECAST + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_THRM + trap_offset), (size_t)&trapsize); + bcopy(&trapcode, (void *)(EXC_BPT + trap_offset), (size_t)&trapsize); #ifdef KDB - bcopy(&dblow, (void *)EXC_MCHK, (size_t)&dbsize); - bcopy(&dblow, (void *)EXC_PGM, (size_t)&dbsize); - bcopy(&dblow, (void *)EXC_TRC, (size_t)&dbsize); - bcopy(&dblow, (void *)EXC_BPT, (size_t)&dbsize); + bcopy(&dblow, (void *)(EXC_MCHK + trap_offset), (size_t)&dbsize); + bcopy(&dblow, (void *)(EXC_PGM + trap_offset), (size_t)&dbsize); + bcopy(&dblow, (void *)(EXC_TRC + trap_offset), (size_t)&dbsize); + bcopy(&dblow, (void *)(EXC_BPT + trap_offset), (size_t)&dbsize); #endif __syncicache(EXC_RSVD, EXC_LAST - EXC_RSVD); /* - * Make sure translation has been enabled + * Restore MSR */ - mtmsr(mfmsr() | PSL_IR|PSL_DR|PSL_ME|PSL_RI); + mtmsr(msr); isync(); /* * Initialise virtual memory. */ - pmap_mmu_install(MMU_TYPE_OEA, 0); /* XXX temporary */ + if (ppc64) + pmap_mmu_install(MMU_TYPE_G5, 0); + else + pmap_mmu_install(MMU_TYPE_OEA, 0); + pmap_bootstrap(startkernel, endkernel); + mtmsr(mfmsr() | PSL_IR|PSL_DR|PSL_ME|PSL_RI); + isync(); /* * Initialize params/tunables that are derived from memsize ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#2 (text+ko) ==== @@ -714,6 +714,9 @@ __asm __volatile("mtdbatl 1,%0" :: "r"(battable[8].batl)); isync(); + /* set global direct map flag */ + hw_direct_map = 1; + mem_regions(&pregions, &pregions_sz, ®ions, ®ions_sz); CTR0(KTR_PMAP, "moea_bootstrap: physical memory"); @@ -952,9 +955,7 @@ * not issue any loads while we have interrupts disabled below. */ pm = &td->td_proc->p_vmspace->vm_pmap; - - if ((pmr = (pmap_t)moea_kextract(mmu, (vm_offset_t)pm)) == NULL) - pmr = pm; + pmr = pm->pmap_phys; pm->pm_active |= PCPU_GET(cpumask); PCPU_SET(curpmap, pmr); @@ -1206,7 +1207,7 @@ if (pvo == NULL) pa = 0; else - pa = (pvo->pvo_pte.pte_lo & PTE_RPGN) | (va & ADDR_POFF); + pa = (pvo->pvo_pte.pte.pte_lo & PTE_RPGN) | (va & ADDR_POFF); PMAP_UNLOCK(pm); return (pa); } @@ -1226,10 +1227,10 @@ vm_page_lock_queues(); PMAP_LOCK(pmap); pvo = moea_pvo_find_va(pmap, va & ~ADDR_POFF, NULL); - if (pvo != NULL && (pvo->pvo_pte.pte_hi & PTE_VALID) && - ((pvo->pvo_pte.pte_lo & PTE_PP) == PTE_RW || + if (pvo != NULL && (pvo->pvo_pte.pte.pte_hi & PTE_VALID) && + ((pvo->pvo_pte.pte.pte_lo & PTE_PP) == PTE_RW || (prot & VM_PROT_WRITE) == 0)) { - m = PHYS_TO_VM_PAGE(pvo->pvo_pte.pte_lo & PTE_RPGN); + m = PHYS_TO_VM_PAGE(pvo->pvo_pte.pte.pte_lo & PTE_RPGN); vm_page_hold(m); } vm_page_unlock_queues(); @@ -1300,15 +1301,15 @@ LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { pmap = pvo->pvo_pmap; PMAP_LOCK(pmap); - if ((pvo->pvo_pte.pte_lo & PTE_PP) != PTE_BR) { + if ((pvo->pvo_pte.pte.pte_lo & PTE_PP) != PTE_BR) { pt = moea_pvo_to_pte(pvo, -1); - pvo->pvo_pte.pte_lo &= ~PTE_PP; - pvo->pvo_pte.pte_lo |= PTE_BR; + pvo->pvo_pte.pte.pte_lo &= ~PTE_PP; + pvo->pvo_pte.pte.pte_lo |= PTE_BR; if (pt != NULL) { - moea_pte_synch(pt, &pvo->pvo_pte); - lo |= pvo->pvo_pte.pte_lo; - pvo->pvo_pte.pte_lo &= ~PTE_CHG; - moea_pte_change(pt, &pvo->pvo_pte, + moea_pte_synch(pt, &pvo->pvo_pte.pte); + lo |= pvo->pvo_pte.pte.pte_lo; + pvo->pvo_pte.pte.pte_lo &= ~PTE_CHG; + moea_pte_change(pt, &pvo->pvo_pte.pte, pvo->pvo_vaddr); mtx_unlock(&moea_table_mutex); } @@ -1399,19 +1400,17 @@ struct pvo_entry *pvo; vm_paddr_t pa; -#ifdef UMA_MD_SMALL_ALLOC /* - * Allow direct mappings + * Allow direct mappings on 32-bit OEA */ if (va < VM_MIN_KERNEL_ADDRESS) { return (va); } -#endif PMAP_LOCK(kernel_pmap); pvo = moea_pvo_find_va(kernel_pmap, va & ~ADDR_POFF, NULL); KASSERT(pvo != NULL, ("moea_kextract: no addr found")); - pa = (pvo->pvo_pte.pte_lo & PTE_RPGN) | (va & ADDR_POFF); + pa = (pvo->pvo_pte.pte.pte_lo & PTE_RPGN) | (va & ADDR_POFF); PMAP_UNLOCK(kernel_pmap); return (pa); } @@ -1510,6 +1509,10 @@ entropy = 0; __asm __volatile("mftb %0" : "=r"(entropy)); + if ((pmap->pmap_phys = (pmap_t)moea_kextract(mmu, (vm_offset_t)pmap)) == NULL) + pmap->pmap_phys = pmap; + + /* * Allocate some segment registers for this pmap. */ @@ -1602,14 +1605,14 @@ /* * Change the protection of the page. */ - pvo->pvo_pte.pte_lo &= ~PTE_PP; - pvo->pvo_pte.pte_lo |= PTE_BR; + pvo->pvo_pte.pte.pte_lo &= ~PTE_PP; + pvo->pvo_pte.pte.pte_lo |= PTE_BR; /* * If the PVO is in the page table, update that pte as well. */ if (pt != NULL) { - moea_pte_change(pt, &pvo->pvo_pte, pvo->pvo_vaddr); + moea_pte_change(pt, &pvo->pvo_pte.pte, pvo->pvo_vaddr); mtx_unlock(&moea_table_mutex); } } @@ -1808,8 +1811,8 @@ mtx_lock(&moea_table_mutex); LIST_FOREACH(pvo, &moea_pvo_table[ptegidx], pvo_olink) { if (pvo->pvo_pmap == pm && PVO_VADDR(pvo) == va) { - if ((pvo->pvo_pte.pte_lo & PTE_RPGN) == pa && - (pvo->pvo_pte.pte_lo & PTE_PP) == + if ((pvo->pvo_pte.pte.pte_lo & PTE_RPGN) == pa && + (pvo->pvo_pte.pte.pte_lo & PTE_PP) == (pte_lo & PTE_PP)) { mtx_unlock(&moea_table_mutex); return (0); @@ -1856,7 +1859,7 @@ if (flags & PVO_FAKE) pvo->pvo_vaddr |= PVO_FAKE; - moea_pte_create(&pvo->pvo_pte, sr, va, pa | pte_lo); + moea_pte_create(&pvo->pvo_pte.pte, sr, va, pa | pte_lo); /* * Remember if the list was empty and therefore will be the first @@ -1866,14 +1869,14 @@ first = 1; LIST_INSERT_HEAD(pvo_head, pvo, pvo_vlink); - if (pvo->pvo_pte.pte_lo & PVO_WIRED) + if (pvo->pvo_pte.pte.pte_lo & PVO_WIRED) pm->pm_stats.wired_count++; pm->pm_stats.resident_count++; /* * We hope this succeeds but it isn't required. */ - i = moea_pte_insert(ptegidx, &pvo->pvo_pte); + i = moea_pte_insert(ptegidx, &pvo->pvo_pte.pte); if (i >= 0) { PVO_PTEGIDX_SET(pvo, i); } else { @@ -1896,7 +1899,7 @@ */ pt = moea_pvo_to_pte(pvo, pteidx); if (pt != NULL) { - moea_pte_unset(pt, &pvo->pvo_pte, pvo->pvo_vaddr); + moea_pte_unset(pt, &pvo->pvo_pte.pte, pvo->pvo_vaddr); mtx_unlock(&moea_table_mutex); PVO_PTEGIDX_CLR(pvo); } else { @@ -1907,7 +1910,7 @@ * Update our statistics. */ pvo->pvo_pmap->pm_stats.resident_count--; - if (pvo->pvo_pte.pte_lo & PVO_WIRED) + if (pvo->pvo_pte.pte.pte_lo & PVO_WIRED) pvo->pvo_pmap->pm_stats.wired_count--; /* @@ -1916,9 +1919,9 @@ if ((pvo->pvo_vaddr & (PVO_MANAGED|PVO_FAKE)) == PVO_MANAGED) { struct vm_page *pg; - pg = PHYS_TO_VM_PAGE(pvo->pvo_pte.pte_lo & PTE_RPGN); + pg = PHYS_TO_VM_PAGE(pvo->pvo_pte.pte.pte_lo & PTE_RPGN); if (pg != NULL) { - moea_attr_save(pg, pvo->pvo_pte.pte_lo & + moea_attr_save(pg, pvo->pvo_pte.pte.pte_lo & (PTE_REF | PTE_CHG)); } } @@ -1951,7 +1954,7 @@ * noticing the HID bit. */ pteidx = ptegidx * 8 + PVO_PTEGIDX_GET(pvo); - if (pvo->pvo_pte.pte_hi & PTE_HID) + if (pvo->pvo_pte.pte.pte_hi & PTE_HID) pteidx ^= moea_pteg_mask * 8; return (pteidx); @@ -2001,23 +2004,23 @@ pt = &moea_pteg_table[pteidx >> 3].pt[pteidx & 7]; mtx_lock(&moea_table_mutex); - if ((pvo->pvo_pte.pte_hi & PTE_VALID) && !PVO_PTEGIDX_ISSET(pvo)) { + if ((pvo->pvo_pte.pte.pte_hi & PTE_VALID) && !PVO_PTEGIDX_ISSET(pvo)) { panic("moea_pvo_to_pte: pvo %p has valid pte in pvo but no " "valid pte index", pvo); } - if ((pvo->pvo_pte.pte_hi & PTE_VALID) == 0 && PVO_PTEGIDX_ISSET(pvo)) { + if ((pvo->pvo_pte.pte.pte_hi & PTE_VALID) == 0 && PVO_PTEGIDX_ISSET(pvo)) { panic("moea_pvo_to_pte: pvo %p has valid pte index in pvo " "pvo but no valid pte", pvo); } - if ((pt->pte_hi ^ (pvo->pvo_pte.pte_hi & ~PTE_VALID)) == PTE_VALID) { - if ((pvo->pvo_pte.pte_hi & PTE_VALID) == 0) { + if ((pt->pte_hi ^ (pvo->pvo_pte.pte.pte_hi & ~PTE_VALID)) == PTE_VALID) { + if ((pvo->pvo_pte.pte.pte_hi & PTE_VALID) == 0) { panic("moea_pvo_to_pte: pvo %p has valid pte in " "moea_pteg_table %p but invalid in pvo", pvo, pt); } - if (((pt->pte_lo ^ pvo->pvo_pte.pte_lo) & ~(PTE_CHG|PTE_REF)) + if (((pt->pte_lo ^ pvo->pvo_pte.pte.pte_lo) & ~(PTE_CHG|PTE_REF)) != 0) { panic("moea_pvo_to_pte: pvo %p pte does not match " "pte %p in moea_pteg_table", pvo, pt); @@ -2027,7 +2030,7 @@ return (pt); } - if (pvo->pvo_pte.pte_hi & PTE_VALID) { + if (pvo->pvo_pte.pte.pte_hi & PTE_VALID) { panic("moea_pvo_to_pte: pvo %p has invalid pte %p in " "moea_pteg_table but valid in pvo", pvo, pt); } @@ -2072,13 +2075,13 @@ */ MOEA_PVO_CHECK(pvo); if (source_pvo == NULL && - moea_pte_match(&pvo->pvo_pte, sr, addr, - pvo->pvo_pte.pte_hi & PTE_HID)) { + moea_pte_match(&pvo->pvo_pte.pte, sr, addr, + pvo->pvo_pte.pte.pte_hi & PTE_HID)) { /* * Now found an entry to be spilled into the pteg. * The PTE is now valid, so we know it's active. */ - j = moea_pte_insert(ptegidx, &pvo->pvo_pte); + j = moea_pte_insert(ptegidx, &pvo->pvo_pte.pte); if (j >= 0) { PVO_PTEGIDX_SET(pvo, j); @@ -2099,7 +2102,7 @@ * so save the R & C bits of the PTE. */ if ((pt->pte_hi & PTE_HID) == 0 && victim_pvo == NULL && - moea_pte_compare(pt, &pvo->pvo_pte)) { + moea_pte_compare(pt, &pvo->pvo_pte.pte)) { victim_pvo = pvo; if (source_pvo != NULL) break; @@ -2127,7 +2130,7 @@ * We also need the pvo entry of the victim we are * replacing so save the R & C bits of the PTE. */ - if (moea_pte_compare(pt, &pvo->pvo_pte)) { + if (moea_pte_compare(pt, &pvo->pvo_pte.pte)) { victim_pvo = pvo; break; } @@ -2143,10 +2146,10 @@ * though it's valid. If we don't, we lose any ref/chg bit changes * contained in the TLB entry. */ - source_pvo->pvo_pte.pte_hi &= ~PTE_HID; + source_pvo->pvo_pte.pte.pte_hi &= ~PTE_HID; - moea_pte_unset(pt, &victim_pvo->pvo_pte, victim_pvo->pvo_vaddr); - moea_pte_set(pt, &source_pvo->pvo_pte); + moea_pte_unset(pt, &victim_pvo->pvo_pte.pte, victim_pvo->pvo_vaddr); + moea_pte_set(pt, &source_pvo->pvo_pte.pte); PVO_PTEGIDX_CLR(victim_pvo); PVO_PTEGIDX_SET(source_pvo, i); @@ -2213,7 +2216,7 @@ * See if we saved the bit off. If so, cache it and return * success. */ - if (pvo->pvo_pte.pte_lo & ptebit) { + if (pvo->pvo_pte.pte.pte_lo & ptebit) { moea_attr_save(m, ptebit); MOEA_PVO_CHECK(pvo); /* sanity check */ return (TRUE); @@ -2236,9 +2239,9 @@ */ pt = moea_pvo_to_pte(pvo, -1); if (pt != NULL) { - moea_pte_synch(pt, &pvo->pvo_pte); + moea_pte_synch(pt, &pvo->pvo_pte.pte); mtx_unlock(&moea_table_mutex); - if (pvo->pvo_pte.pte_lo & ptebit) { + if (pvo->pvo_pte.pte.pte_lo & ptebit) { moea_attr_save(m, ptebit); MOEA_PVO_CHECK(pvo); /* sanity check */ return (TRUE); @@ -2281,15 +2284,15 @@ MOEA_PVO_CHECK(pvo); /* sanity check */ pt = moea_pvo_to_pte(pvo, -1); if (pt != NULL) { - moea_pte_synch(pt, &pvo->pvo_pte); - if (pvo->pvo_pte.pte_lo & ptebit) { + moea_pte_synch(pt, &pvo->pvo_pte.pte); + if (pvo->pvo_pte.pte.pte_lo & ptebit) { count++; moea_pte_clear(pt, PVO_VADDR(pvo), ptebit); } mtx_unlock(&moea_table_mutex); } - rv |= pvo->pvo_pte.pte_lo; - pvo->pvo_pte.pte_lo &= ~ptebit; + rv |= pvo->pvo_pte.pte.pte_lo; + pvo->pvo_pte.pte.pte_lo &= ~ptebit; MOEA_PVO_CHECK(pvo); /* sanity check */ } ==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#2 (text+ko) ==== @@ -62,6 +62,12 @@ static struct mem_region OFmem[OFMEM_REGIONS + 1], OFavail[OFMEM_REGIONS + 3]; static struct mem_region OFfree[OFMEM_REGIONS + 3]; +struct mem_region64 { + vm_offset_t mr_start_hi; + vm_offset_t mr_start_lo; + vm_size_t mr_size; +}; + extern register_t ofmsr[5]; extern struct pmap ofw_pmap; static int (*ofwcall)(void *); @@ -146,15 +152,35 @@ * Get memory. */ if ((phandle = OF_finddevice("/memory")) == -1 - || (msz = OF_getprop(phandle, "reg", - OFmem, sizeof OFmem[0] * OFMEM_REGIONS)) - <= 0 || (asz = OF_getprop(phandle, "available", OFavail, sizeof OFavail[0] * OFMEM_REGIONS)) <= 0) panic("no memory?"); + + if (ppc64) { + struct mem_region64 OFmem64[OFMEM_REGIONS + 1]; + if ((msz = OF_getprop(phandle, "reg", + OFmem64, sizeof OFmem64[0] * OFMEM_REGIONS)) <= 0) + panic("Physical memory map not found"); + + for (i = 0; i < msz/sizeof(OFmem64[0]); i++) { + if (OFmem64[i].mr_start_hi == 0) { + OFmem[i].mr_start = OFmem64[i].mr_start_lo; + OFmem[i].mr_size = OFmem64[i].mr_size; + } else { + OFmem[i].mr_size = 0; + } + } + msz = i*sizeof(OFmem[0]); + } else { + if ((msz = OF_getprop(phandle, "reg", + OFmem, sizeof OFmem[0] * OFMEM_REGIONS)) <= 0) + panic("Physical memory map not found"); + } + *memp = OFmem; *memsz = msz / sizeof(struct mem_region); + /* * OFavail may have overlapping regions - collapse these @@ -229,8 +255,10 @@ /* * Clear battable[] translations */ - __asm __volatile("mtdbatu 2, %0\n" - "mtdbatu 3, %0" : : "r" (0)); + if (!ppc64) { + __asm __volatile("mtdbatu 2, %0\n" + "mtdbatu 3, %0" : : "r" (0)); + } isync(); } ==== //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#2 (text+ko) ==== @@ -228,6 +228,45 @@ mfsprg2 %r2; /* restore r2 & r3 */ \ mfsprg3 %r3 +/* + * The next two routines are 64-bit glue code. The first is used to test if + * we are on a 64-bit system. By copying it to the illegal instruction + * handler, we can test for 64-bit mode by trying to execute a 64-bit + * instruction and seeing what happens. The second gets copied in front + * of all the other handlers to restore 32-bit bridge mode when traps + * are taken. + */ + +/* 64-bit test code. Sets SPRG2 to 0 if an illegal instruction is executed */ + + .globl CNAME(testppc64),CNAME(testppc64size) +CNAME(testppc64): + mtsprg1 %r31 + mfsrr0 %r31 + addi %r31, %r31, 4 + mtsrr0 %r31 + + li %r31, 0 + mtsprg2 %r31 + mfsprg1 %r31 + + rfi +CNAME(testppc64size) = .-CNAME(testppc64) + + +/* 64-bit bridge mode restore snippet. Gets copied in front of everything else + * on 64-bit systems. */ + + .globl CNAME(restorebridge),CNAME(restorebridgesize) +CNAME(restorebridge): + mtsprg1 %r31 + mfmsr %r31 + clrldi %r31,%r31,1 + mtmsrd %r31 + mfsprg1 %r31 + isync +CNAME(restorebridgesize) = .-CNAME(restorebridge) + #ifdef SMP /* * Processor reset exception handler. These are typically @@ -490,8 +529,15 @@ b trapexit /* test ast ret value ? */ 1: FRAME_LEAVE(PC_TEMPSAVE) + + .globl CNAME(rfi_patch1) /* replace rfi with rfid on ppc64 */ +CNAME(rfi_patch1): rfi + .globl CNAME(rfid_patch) +CNAME(rfid_patch): + rfid + /* * Temporary: vector-unavailable traps are directed to vector-assist traps */ @@ -552,6 +598,8 @@ b realtrap dbleave: FRAME_LEAVE(PC_DBSAVE) + .globl CNAME(rfi_patch2) /* replace rfi with rfid on ppc64 */ +CNAME(rfi_patch2): rfi /* ==== //depot/projects/ppc-g5/sys/powerpc/aim/uio_machdep.c#2 (text+ko) ==== @@ -45,15 +45,17 @@ #include #include #include +#include #include #include +#include +#include #include -#include /* - * Implement uiomove(9) from physical memory using the direct map to + * Implement uiomove(9) from physical memory using sf_bufs to * avoid the creation and destruction of ephemeral mappings. */ int @@ -63,14 +65,17 @@ struct iovec *iov; void *cp; vm_offset_t page_offset; + vm_page_t m; size_t cnt; int error = 0; int save = 0; + struct sf_buf *sf; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { @@ -85,31 +90,37 @@ cnt = n; page_offset = offset & PAGE_MASK; cnt = min(cnt, PAGE_SIZE - page_offset); - cp = (char *)VM_PAGE_TO_PHYS(ma[offset >> PAGE_SHIFT]) + - page_offset; + + m = ma[offset >> PAGE_SHIFT]; + sf = sf_buf_alloc(m, 0); + cp = (char*)sf_buf_kva(sf) + page_offset; + switch (uio->uio_segflg) { - case UIO_USERSPACE: - if (ticks - PCPU_GET(switchticks) >= hogticks) - uio_yield(); - if (uio->uio_rw == UIO_READ) - error = copyout(cp, iov->iov_base, cnt); - else - error = copyin(iov->iov_base, cp, cnt); - if (error) - goto out; - if (uio->uio_rw == UIO_WRITE && - pmap_page_executable(ma[offset >> PAGE_SHIFT])) - __syncicache(cp, cnt); - break; - case UIO_SYSSPACE: - if (uio->uio_rw == UIO_READ) - bcopy(cp, iov->iov_base, cnt); - else - bcopy(iov->iov_base, cp, cnt); - break; - case UIO_NOCOPY: - break; + case UIO_USERSPACE: + if (ticks - PCPU_GET(switchticks) >= hogticks) + uio_yield(); + if (uio->uio_rw == UIO_READ) + error = copyout(cp, iov->iov_base, cnt); + else + error = copyin(iov->iov_base, cp, cnt); + if (error) { + sf_buf_free(sf); + goto out; + } + if (uio->uio_rw == UIO_WRITE && + pmap_page_executable(m)) + __syncicache(cp, cnt); + break; + case UIO_SYSSPACE: + if (uio->uio_rw == UIO_READ) + bcopy(cp, iov->iov_base, cnt); + else + bcopy(iov->iov_base, cp, cnt); + break; + case UIO_NOCOPY: + break; } + sf_buf_free(sf); iov->iov_base = (char *)iov->iov_base + cnt; iov->iov_len -= cnt; uio->uio_resid -= cnt; ==== //depot/projects/ppc-g5/sys/powerpc/aim/uma_machdep.c#2 (text+ko) ==== @@ -35,9 +35,13 @@ #include #include #include +#include #include +#include +#include #include #include +#include #include static int hw_uma_mdpages; @@ -51,6 +55,13 @@ void *va; vm_page_t m; int pflags; + + if (!hw_direct_map) { + *flags = UMA_SLAB_KMEM; + va = (void *)kmem_malloc(kmem_map, bytes, wait); + + return va; + } *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) @@ -83,6 +94,12 @@ { vm_page_t m; + if (!hw_direct_map) { + kmem_free(kmem_map, (vm_offset_t)mem, size); + + return; + } + m = PHYS_TO_VM_PAGE((u_int32_t)mem); m->wire_count--; vm_page_free(m); ==== //depot/projects/ppc-g5/sys/powerpc/aim/vm_machdep.c#2 (text+ko) ==== @@ -101,6 +101,37 @@ #include /* + * On systems without a direct mapped region (e.g. PPC64), + * we use the same code as the Book E implementation. Since + * we need to have runtime detection of this, define some machinery + * for sf_bufs in this case, and ignore it on systems with direct maps. + */ + +#ifndef NSFBUFS +#define NSFBUFS (512 + maxusers * 16) +#endif + +static void sf_buf_init(void *arg); +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); + +LIST_HEAD(sf_head, sf_buf); + +/* A hash table of active sendfile(2) buffers */ +static struct sf_head *sf_buf_active; +static u_long sf_buf_hashmask; + +#define SF_BUF_HASH(m) (((m) - vm_page_array) & sf_buf_hashmask) + +static TAILQ_HEAD(, sf_buf) sf_buf_freelist; +static u_int sf_buf_alloc_want; + +/* + * A lock used to synchronize access to the hash table and free list + */ +static struct mtx sf_buf_lock; + + +/* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child * ready to run and return to user mode. @@ -202,24 +233,122 @@ } /* - * Allocate an sf_buf for the given vm_page. On this machine, however, there - * is no sf_buf object. Instead, an opaque pointer to the given vm_page is - * returned. + * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + */ +static void +sf_buf_init(void *arg) +{ + struct sf_buf *sf_bufs; + vm_offset_t sf_base; + int i; + + /* Don't bother on systems with a direct map */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 20:42:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8E7106567F; Tue, 26 Aug 2008 20:42:30 +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 649AB106567A for ; Tue, 26 Aug 2008 20:42:30 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 410BA8FC3D for ; Tue, 26 Aug 2008 20:42:30 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QKgUOb010645 for ; Tue, 26 Aug 2008 20:42:30 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QKgUru010643 for perforce@freebsd.org; Tue, 26 Aug 2008 20:42:30 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 26 Aug 2008 20:42:30 GMT Message-Id: <200808262042.m7QKgUru010643@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148549 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, 26 Aug 2008 20:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=148549 Change 148549 by ed@ed_dull on 2008/08/26 20:42:16 Prevent one unneeded tty_lock() inside ptsdev_write(). Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#14 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#14 (text+ko) ==== @@ -162,14 +162,14 @@ size_t iblen, rintlen; int error = 0; - tty_lock(tp); + if (uio->uio_resid == 0) + return (0); - while (uio->uio_resid > 0) { - /* Temporarily unlock to buffer new characters. */ - tty_unlock(tp); + for (;;) { ibstart = ib; iblen = MIN(uio->uio_resid, sizeof ib); error = uiomove(ib, iblen, uio); + tty_lock(tp); if (error != 0) goto done; @@ -218,6 +218,10 @@ if (error != 0) goto done; } + + if (uio->uio_resid == 0) + break; + tty_unlock(tp); } done: ttydisc_rint_done(tp); From owner-p4-projects@FreeBSD.ORG Tue Aug 26 20:50:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A1AB1065674; Tue, 26 Aug 2008 20:50: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 EE69A1065671 for ; Tue, 26 Aug 2008 20:50:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9FAD8FC13 for ; Tue, 26 Aug 2008 20:50:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QKocdf020602 for ; Tue, 26 Aug 2008 20:50:38 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QKoc2M020600 for perforce@freebsd.org; Tue, 26 Aug 2008 20:50:38 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 26 Aug 2008 20:50:38 GMT Message-Id: <200808262050.m7QKoc2M020600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148550 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, 26 Aug 2008 20:50:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=148550 Change 148550 by ed@ed_dull on 2008/08/26 20:50:15 Small optimisations: - There is no need to check iblen before the first iteration, because we wouldn't have uiomove()'d if we didn't have any data to read. - Don't check iblen twice when taking the fast write path. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#15 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#15 (text+ko) ==== @@ -178,7 +178,8 @@ * When possible, avoid the slow path. rint_bypass() * copies all input to the input queue at once. */ - while (iblen > 0) { + MPASS(iblen > 0); + do { if (ttydisc_can_bypass(tp)) { /* Store data at once. */ rintlen = ttydisc_rint_bypass(tp, @@ -188,7 +189,7 @@ if (iblen == 0) { /* All data written. */ - continue; + break; } } else { error = ttydisc_rint(tp, *ibstart, 0); @@ -217,7 +218,7 @@ error = cv_wait_sig(&psc->pts_inwait, tp->t_mtx); if (error != 0) goto done; - } + } while (iblen > 0); if (uio->uio_resid == 0) break; From owner-p4-projects@FreeBSD.ORG Tue Aug 26 21:27:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B571065675; Tue, 26 Aug 2008 21:27:17 +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 4578D1065670 for ; Tue, 26 Aug 2008 21:27:17 +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 1E1938FC08 for ; Tue, 26 Aug 2008 21:27:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QLRHL3024601 for ; Tue, 26 Aug 2008 21:27:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QLRHe6024599 for perforce@freebsd.org; Tue, 26 Aug 2008 21:27:17 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 21:27:17 GMT Message-Id: <200808262127.m7QLRHe6024599@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 148555 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, 26 Aug 2008 21:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=148555 Change 148555 by jb@freebsd3 on 2008/08/26 21:26:52 IFC Affected files ... .. //depot/projects/dtrace/src/lib/libc/sys/execve.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/wait.2#5 integrate .. //depot/projects/dtrace/src/sbin/ping6/ping6.8#6 integrate .. //depot/projects/dtrace/src/sbin/ping6/ping6.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/bpf_jit_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#20 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#21 integrate .. //depot/projects/dtrace/src/sys/conf/options#58 integrate .. //depot/projects/dtrace/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/i386/bpf_jit_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_shell.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#24 integrate .. //depot/projects/dtrace/src/sys/net/bpf.h#12 integrate .. //depot/projects/dtrace/src/sys/net/bpf_filter.c#7 integrate .. //depot/projects/dtrace/src/sys/net/bpf_jitter.c#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/dtrace/src/sys/sys/wait.h#4 integrate .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/bpf_test.c#3 integrate .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0001.h#2 integrate .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0075.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0076.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0077.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0078.h#1 branch .. //depot/projects/dtrace/src/usr.bin/netstat/inet.c#12 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libc/sys/execve.2#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)execve.2 8.5 (Berkeley) 6/1/94 -.\" $FreeBSD: src/lib/libc/sys/execve.2,v 1.41 2008/04/16 13:03:12 kib Exp $ +.\" $FreeBSD: src/lib/libc/sys/execve.2,v 1.42 2008/08/26 10:53:32 kib Exp $ .\" .Dd April 10, 2008 .Dt EXECVE 2 @@ -314,7 +314,7 @@ .Fa fd argument is not a valid file descriptor open for executing. .El -.Sh CAVEAT +.Sh CAVEATS If a program is .Em setuid to a non-super-user, but is executed when @@ -322,6 +322,22 @@ .Em uid is ``root'', then the program has some of the powers of a super-user as well. +.Pp +When executing an interpreted program through +.Fn fexecve , +kernel supplies +.Pa /dev/fd/n +as a second argument to the interpreter, +where +.Ar n +is the file descriptor passed in the +.Fa fd +argument to +.Fn fexecve . +For this construction to work correctly, the +.Xr fdescfs 5 +filesystem shall be mounted on +.Pa /dev/fd . .Sh SEE ALSO .Xr ktrace 1 , .Xr _exit 2 , @@ -332,6 +348,7 @@ .Xr sysctl 3 , .Xr a.out 5 , .Xr elf 5 , +.Xr fdescfs 5 , .Xr environ 7 , .Xr mount 8 .Sh STANDARDS ==== //depot/projects/dtrace/src/lib/libc/sys/wait.2#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)wait.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.28 2007/01/09 00:28:16 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.29 2008/08/26 12:37:16 kib Exp $ .\" .Dd November 12, 2005 .Dt WAIT 2 @@ -99,6 +99,7 @@ The .Fa status argument is defined below. +.Pp The .Fa options argument contains the bitwise OR of any of the following options. @@ -121,8 +122,15 @@ .Dv SIGTTIN , SIGTTOU , SIGTSTP , or .Dv SIGSTOP -signal also have -their status reported. +signal also have their status reported. +The +.Dv WSTOPPED +option is an alias for +.Dv WUNTRACED . +The +.Dv WNOWAIT +option keeps the process whose status is returned in a waitable state. +The process may be waited for again after this call completes. .Pp If .Fa rusage ==== //depot/projects/dtrace/src/sbin/ping6/ping6.8#6 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ping6/ping6.8,v 1.25 2008/05/27 10:51:19 bz Exp $ +.\" $FreeBSD: src/sbin/ping6/ping6.8,v 1.26 2008/08/26 14:34:09 matteo Exp $ .\" -.Dd May 27, 2008 +.Dd August 26, 2008 .Dt PING6 8 .Os .Sh NAME @@ -40,7 +40,7 @@ .Sh SYNOPSIS .Nm .\" without ipsec, or new ipsec -.Op Fl dfHmnNoqtvwW +.Op Fl defHmnNoqtvwW .\" old ipsec .\" .Op Fl AdEfmnNqRtvwW .Bk -words @@ -148,6 +148,12 @@ .\" .It Fl E .\" Enables transport-mode IPsec encapsulated security payload .\" (experimental). +.It Fl e +Audible. +Include a bell +.Tn ( ASCII +0x07) +character in the output when any packet is received. .It Fl f Flood ping. Outputs packets as fast as they come back or one hundred times per second, ==== //depot/projects/dtrace/src/sbin/ping6/ping6.c#8 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.34 2008/05/27 10:51:19 bz Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.35 2008/08/26 14:34:09 matteo Exp $"; #endif /* not lint */ /* @@ -189,6 +189,7 @@ #define F_SUPTYPES 0x80000 #define F_NOMINMTU 0x100000 #define F_ONCE 0x200000 +#define F_AUDIBLE 0x400000 #define F_NOUSERDATA (F_NODEADDR | F_FQDN | F_FQDNOLD | F_SUPTYPES) u_int options; @@ -215,6 +216,7 @@ int s; /* socket file descriptor */ u_char outpack[MAXPACKETLEN]; char BSPACE = '\b'; /* characters written for flood */ +char BBELL = '\a'; /* characters written for AUDIBLE */ char DOT = '.'; char *hostname; int ident; /* process id to identify our packets */ @@ -345,7 +347,7 @@ #endif /*IPSEC_POLICY_IPSEC*/ #endif while ((ch = getopt(argc, argv, - "a:b:c:dfHg:h:I:i:l:mnNop:qS:s:tvwW" ADDOPTS)) != -1) { + "a:b:c:defHg:h:I:i:l:mnNop:qS:s:tvwW" ADDOPTS)) != -1) { #undef ADDOPTS switch (ch) { case 'a': @@ -414,6 +416,9 @@ case 'd': options |= F_SO_DEBUG; break; + case 'e': + options |= F_AUDIBLE; + break; case 'f': if (getuid()) { errno = EPERM; @@ -1555,6 +1560,8 @@ if (options & F_FLOOD) (void)write(STDOUT_FILENO, &BSPACE, 1); else { + if (options & F_AUDIBLE) + (void)write(STDOUT_FILENO, &BBELL, 1); (void)printf("%d bytes from %s, icmp_seq=%u", cc, pr_addr(from, fromlen), seq); (void)printf(" hlim=%d", hoplim); ==== //depot/projects/dtrace/src/sys/amd64/amd64/bpf_jit_machdep.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.13 2008/08/25 20:43:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/dtrace/src/sys/boot/forth/loader.conf#20 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.131 2008/08/11 04:54:43 weongyo Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.132 2008/08/26 13:27:48 matteo Exp $ ############################################################## ### Basic configuration options ############################ @@ -149,6 +149,7 @@ geom_eli_load="NO" # Disk encryption driver (see geli(8)) geom_gate_load="NO" # Userland disk driver (see geom_gate(4), # ggatec(8), ggated(8), ggatel(8)) +geom_journal_load="NO" # Journaled filesystem driver (see gjournal(8)) geom_label_load="NO" # File system labels (see glabel(8)) geom_md_load="NO" # Memory disk driver (vnode/swap/malloc) (see # md(4), mdconfig(8)) ==== //depot/projects/dtrace/src/sys/conf/files.powerpc#21 (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.powerpc,v 1.79 2008/06/07 22:58:32 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.80 2008/08/26 10:41:49 raj Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -44,6 +44,7 @@ dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc dev/tsec/if_tsec.c optional tsec +dev/tsec/if_tsec_ocp.c optional tsec mpc85xx dev/uart/uart_bus_ocp.c optional uart mpc85xx dev/uart/uart_cpu_powerpc.c optional uart kern/syscalls.c optional ktr ==== //depot/projects/dtrace/src/sys/conf/options#58 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.638 2008/08/24 21:33:10 julian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.639 2008/08/26 07:28:27 imp Exp $ # # On the handling of kernel options # @@ -533,15 +533,15 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h -MAXPHYS opt_global.h -DFLTPHYS opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h DEBUG_VFS_LOCKS opt_global.h +DFLTPHYS opt_global.h DIAGNOSTIC opt_global.h INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h +MAXPHYS opt_global.h MCLSHIFT opt_global.h MUTEX_DEBUG opt_global.h MUTEX_NOINLINE opt_global.h ==== //depot/projects/dtrace/src/sys/dev/tsec/if_tsec.c#3 (text+ko) ==== @@ -1,9 +1,8 @@ /*- - * Copyright (C) 2006-2008 Semihalf + * Copyright (C) 2007-2008 Semihalf, Rafal Jaworowski + * Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski * All rights reserved. * - * Written by: Piotr Kruszynski - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -12,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -31,171 +28,270 @@ * Freescale integrated Three-Speed Ethernet Controller (TSEC) driver. */ #include -__FBSDID("$FreeBSD: src/sys/dev/tsec/if_tsec.c,v 1.3 2008/03/12 16:35:25 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tsec/if_tsec.c,v 1.5 2008/08/26 10:41:49 raj Exp $"); #include #include +#include #include #include #include #include #include +#include #include +#include +#include #include +#include #include #include +#include +#include -#include -#include -#include #include -#include -#include - -#include -#include - -#include -#include #include #include -#include - #include #include -#include "miibus_if.h" - -#define TSEC_DEBUG - -#ifdef TSEC_DEBUG -#define PDEBUG(a) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");} -#else -#define PDEBUG(a) /* nop */ -#endif - -static int tsec_probe(device_t dev); -static int tsec_attach(device_t dev); -static int tsec_setup_intr(device_t dev, struct resource **ires, - void **ihand, int *irid, driver_intr_t handler, const char *iname); -static void tsec_release_intr(device_t dev, struct resource *ires, - void *ihand, int irid, const char *iname); +static int tsec_alloc_dma_desc(device_t dev, bus_dma_tag_t *dtag, + bus_dmamap_t *dmap, bus_size_t dsize, void **vaddr, void *raddr, + const char *dname); +static void tsec_dma_ctl(struct tsec_softc *sc, int state); +static int tsec_encap(struct tsec_softc *sc, struct mbuf *m_head); static void tsec_free_dma(struct tsec_softc *sc); -static int tsec_detach(device_t dev); -static void tsec_shutdown(device_t dev); -static int tsec_suspend(device_t dev); /* XXX */ -static int tsec_resume(device_t dev); /* XXX */ - -static void tsec_init(void *xsc); -static void tsec_init_locked(struct tsec_softc *sc); -static void tsec_set_mac_address(struct tsec_softc *sc); -static void tsec_dma_ctl(struct tsec_softc *sc, int state); -static void tsec_intrs_ctl(struct tsec_softc *sc, int state); -static void tsec_reset_mac(struct tsec_softc *sc); - -static void tsec_watchdog(struct tsec_softc *sc); -static void tsec_start(struct ifnet *ifp); -static void tsec_start_locked(struct ifnet *ifp); -static int tsec_encap(struct tsec_softc *sc, - struct mbuf *m_head); -static void tsec_setfilter(struct tsec_softc *sc); -static int tsec_ioctl(struct ifnet *ifp, u_long command, - caddr_t data); +static void tsec_free_dma_desc(bus_dma_tag_t dtag, bus_dmamap_t dmap, void *vaddr); static int tsec_ifmedia_upd(struct ifnet *ifp); static void tsec_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int tsec_new_rxbuf(bus_dma_tag_t tag, bus_dmamap_t map, struct mbuf **mbufp, uint32_t *paddr); static void tsec_map_dma_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error); -static int tsec_alloc_dma_desc(device_t dev, bus_dma_tag_t *dtag, - bus_dmamap_t *dmap, bus_size_t dsize, void **vaddr, void *raddr, - const char *dname); -static void tsec_free_dma_desc(bus_dma_tag_t dtag, bus_dmamap_t dmap, - void *vaddr); +static void tsec_intrs_ctl(struct tsec_softc *sc, int state); +static void tsec_init(void *xsc); +static void tsec_init_locked(struct tsec_softc *sc); +static int tsec_ioctl(struct ifnet *ifp, u_long command, caddr_t data); +static void tsec_reset_mac(struct tsec_softc *sc); +static void tsec_setfilter(struct tsec_softc *sc); +static void tsec_set_mac_address(struct tsec_softc *sc); +static void tsec_start(struct ifnet *ifp); +static void tsec_start_locked(struct ifnet *ifp); +static void tsec_stop(struct tsec_softc *sc); +static void tsec_tick(void *arg); +static void tsec_watchdog(struct tsec_softc *sc); + +struct tsec_softc *tsec0_sc = NULL; /* XXX ugly hack! */ + +devclass_t tsec_devclass; +DRIVER_MODULE(miibus, tsec, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(tsec, ether, 1, 1, 1); +MODULE_DEPEND(tsec, miibus, 1, 1, 1); + +int +tsec_attach(struct tsec_softc *sc) +{ + uint8_t hwaddr[ETHER_ADDR_LEN]; + struct ifnet *ifp; + bus_dmamap_t *map_ptr; + bus_dmamap_t **map_pptr; + int error = 0; + int i; + + /* Reset all TSEC counters */ + TSEC_TX_RX_COUNTERS_INIT(sc); + + /* Stop DMA engine if enabled by firmware */ + tsec_dma_ctl(sc, 0); + + /* Reset MAC */ + tsec_reset_mac(sc); + + /* Disable interrupts for now */ + tsec_intrs_ctl(sc, 0); + + /* Allocate a busdma tag and DMA safe memory for TX descriptors. */ + error = tsec_alloc_dma_desc(sc->dev, &sc->tsec_tx_dtag, &sc->tsec_tx_dmap, + sizeof(*sc->tsec_tx_vaddr) * TSEC_TX_NUM_DESC, + (void **)&sc->tsec_tx_vaddr, &sc->tsec_tx_raddr, "TX"); + if (error) { + tsec_detach(sc); + return (ENXIO); + } + + /* Allocate a busdma tag and DMA safe memory for RX descriptors. */ + error = tsec_alloc_dma_desc(sc->dev, &sc->tsec_rx_dtag, &sc->tsec_rx_dmap, + sizeof(*sc->tsec_rx_vaddr) * TSEC_RX_NUM_DESC, + (void **)&sc->tsec_rx_vaddr, &sc->tsec_rx_raddr, "RX"); + if (error) { + tsec_detach(sc); + return (ENXIO); + } + + /* Allocate a busdma tag for TX mbufs. */ + error = bus_dma_tag_create(NULL, /* parent */ + TSEC_TXBUFFER_ALIGNMENT, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filtfunc, filtfuncarg */ + MCLBYTES * (TSEC_TX_NUM_DESC - 1),/* maxsize */ + TSEC_TX_NUM_DESC - 1, /* nsegments */ + MCLBYTES, 0, /* maxsegsz, flags */ + NULL, NULL, /* lockfunc, lockfuncarg */ + &sc->tsec_tx_mtag); /* dmat */ + if (error) { + device_printf(sc->dev, "failed to allocate busdma tag(tx mbufs)\n"); + tsec_detach(sc); + return (ENXIO); + } + + /* Allocate a busdma tag for RX mbufs. */ + error = bus_dma_tag_create(NULL, /* parent */ + TSEC_RXBUFFER_ALIGNMENT, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filtfunc, filtfuncarg */ + MCLBYTES, /* maxsize */ + 1, /* nsegments */ + MCLBYTES, 0, /* maxsegsz, flags */ + NULL, NULL, /* lockfunc, lockfuncarg */ + &sc->tsec_rx_mtag); /* dmat */ + if (error) { + device_printf(sc->dev, "failed to allocate busdma tag(rx mbufs)\n"); + tsec_detach(sc); + return (ENXIO); + } + + /* Create TX busdma maps */ + map_ptr = sc->tx_map_data; + map_pptr = sc->tx_map_unused_data; -static void tsec_stop(struct tsec_softc *sc); + for (i = 0; i < TSEC_TX_NUM_DESC; i++) { + map_pptr[i] = &map_ptr[i]; + error = bus_dmamap_create(sc->tsec_tx_mtag, 0, map_pptr[i]); + if (error) { + device_printf(sc->dev, "failed to init TX ring\n"); + tsec_detach(sc); + return (ENXIO); + } + } -static void tsec_receive_intr(void *arg); -static void tsec_transmit_intr(void *arg); -static void tsec_error_intr(void *arg); + /* Create RX busdma maps and zero mbuf handlers */ + for (i = 0; i < TSEC_RX_NUM_DESC; i++) { + error = bus_dmamap_create(sc->tsec_rx_mtag, 0, &sc->rx_data[i].map); + if (error) { + device_printf(sc->dev, "failed to init RX ring\n"); + tsec_detach(sc); + return (ENXIO); + } + sc->rx_data[i].mbuf = NULL; + } -static void tsec_tick(void *arg); -static int tsec_miibus_readreg(device_t dev, int phy, int reg); -static void tsec_miibus_writereg(device_t dev, int phy, int reg, int value); -static void tsec_miibus_statchg(device_t dev); + /* Create mbufs for RX buffers */ + for (i = 0; i < TSEC_RX_NUM_DESC; i++) { + error = tsec_new_rxbuf(sc->tsec_rx_mtag, sc->rx_data[i].map, + &sc->rx_data[i].mbuf, &sc->rx_data[i].paddr); + if (error) { + device_printf(sc->dev, "can't load rx DMA map %d, error = " + "%d\n", i, error); + tsec_detach(sc); + return (error); + } + } -static struct tsec_softc *tsec0_sc = NULL; /* XXX ugly hack! */ + /* Create network interface for upper layers */ + ifp = sc->tsec_ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + device_printf(sc->dev, "if_alloc() failed\n"); + tsec_detach(sc); + return (ENOMEM); + } -static device_method_t tsec_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, tsec_probe), - DEVMETHOD(device_attach, tsec_attach), - DEVMETHOD(device_detach, tsec_detach), - DEVMETHOD(device_shutdown, tsec_shutdown), - DEVMETHOD(device_suspend, tsec_suspend), - DEVMETHOD(device_resume, tsec_resume), + ifp->if_softc = sc; + if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev)); + ifp->if_mtu = ETHERMTU; + ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; + ifp->if_init = tsec_init; + ifp->if_start = tsec_start; + ifp->if_ioctl = tsec_ioctl; - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), + IFQ_SET_MAXLEN(&ifp->if_snd, TSEC_TX_NUM_DESC - 1); + ifp->if_snd.ifq_drv_maxlen = TSEC_TX_NUM_DESC - 1; + IFQ_SET_READY(&ifp->if_snd); - /* MII interface */ - DEVMETHOD(miibus_readreg, tsec_miibus_readreg), - DEVMETHOD(miibus_writereg, tsec_miibus_writereg), - DEVMETHOD(miibus_statchg, tsec_miibus_statchg), - { 0, 0 } -}; + /* XXX No special features of TSEC are supported currently */ + ifp->if_capabilities = 0; + ifp->if_capenable = ifp->if_capabilities; -static driver_t tsec_driver = { - "tsec", - tsec_methods, - sizeof(struct tsec_softc), -}; + /* Probe PHY(s) */ + error = mii_phy_probe(sc->dev, &sc->tsec_miibus, tsec_ifmedia_upd, + tsec_ifmedia_sts); + if (error) { + device_printf(sc->dev, "MII failed to find PHY!\n"); + if_free(ifp); + sc->tsec_ifp = NULL; + tsec_detach(sc); + return (error); + } + sc->tsec_mii = device_get_softc(sc->tsec_miibus); -static devclass_t tsec_devclass; + /* Set MAC address */ + tsec_get_hwaddr(sc, hwaddr); + ether_ifattach(ifp, hwaddr); -DRIVER_MODULE(tsec, ocpbus, tsec_driver, tsec_devclass, 0, 0); -DRIVER_MODULE(miibus, tsec, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(tsec, ether, 1, 1, 1); -MODULE_DEPEND(tsec, miibus, 1, 1, 1); + return (0); +} -static void -tsec_get_hwaddr(struct tsec_softc *sc, uint8_t *addr) +int +tsec_detach(struct tsec_softc *sc) { - union { - uint32_t reg[2]; - uint8_t addr[6]; - } curmac; - uint32_t a[6]; - device_t parent; - uintptr_t macaddr; - int i; + + /* Stop TSEC controller and free TX queue */ + if (sc->sc_rres && sc->tsec_ifp) + tsec_shutdown(sc->dev); - parent = device_get_parent(sc->dev); - if (BUS_READ_IVAR(parent, sc->dev, OCPBUS_IVAR_MACADDR, - &macaddr) == 0) { - bcopy((uint8_t *)macaddr, addr, 6); - return; + /* Detach network interface */ + if (sc->tsec_ifp) { + ether_ifdetach(sc->tsec_ifp); + if_free(sc->tsec_ifp); + sc->tsec_ifp = NULL; } - /* - * Fall back -- use the currently programmed address in the hope that - * it was set be firmware... - */ - curmac.reg[0] = TSEC_READ(sc, TSEC_REG_MACSTNADDR1); - curmac.reg[1] = TSEC_READ(sc, TSEC_REG_MACSTNADDR2); - for (i = 0; i < 6; i++) - a[5-i] = curmac.addr[i]; + /* Free DMA resources */ + tsec_free_dma(sc); + + return (0); +} + +void +tsec_shutdown(device_t dev) +{ + struct tsec_softc *sc; + + sc = device_get_softc(dev); + + TSEC_GLOBAL_LOCK(sc); + tsec_stop(sc); + TSEC_GLOBAL_UNLOCK(sc); +} + +int +tsec_suspend(device_t dev) +{ + + /* TODO not implemented! */ + return (0); +} + +int +tsec_resume(device_t dev) +{ - addr[0] = a[0]; - addr[1] = a[1]; - addr[2] = a[2]; - addr[3] = a[3]; - addr[4] = a[4]; - addr[5] = a[5]; + /* TODO not implemented! */ + return (0); } static void @@ -327,16 +423,16 @@ for (i = 0; i < TSEC_TX_NUM_DESC; i++) { tx_desc[i].bufptr = 0; tx_desc[i].length = 0; - tx_desc[i].flags = ((i == TSEC_TX_NUM_DESC-1) ? TSEC_TXBD_W : 0); + tx_desc[i].flags = ((i == TSEC_TX_NUM_DESC - 1) ? TSEC_TXBD_W : 0); } - bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, BUS_DMASYNC_PREREAD | - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); for (i = 0; i < TSEC_RX_NUM_DESC; i++) { rx_desc[i].bufptr = sc->rx_data[i].paddr; rx_desc[i].length = 0; rx_desc[i].flags = TSEC_RXBD_E | TSEC_RXBD_I | - ((i == TSEC_RX_NUM_DESC-1) ? TSEC_RXBD_W : 0); + ((i == TSEC_RX_NUM_DESC - 1) ? TSEC_RXBD_W : 0); } bus_dmamap_sync(sc->tsec_rx_dtag, sc->tsec_rx_dmap, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); @@ -368,31 +464,28 @@ /* Step 23: Reset TSEC counters for Tx and Rx rings */ TSEC_TX_RX_COUNTERS_INIT(sc); - /* Step 24: Activate timer for PHY */ - callout_reset(&sc->tsec_tick_ch, hz, tsec_tick, sc); - - /* Step 25: Activate network interface */ + /* Step 24: Activate network interface */ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->tsec_if_flags = ifp->if_flags; + sc->tsec_watchdog = 0; /* Schedule watchdog timeout */ - callout_reset(&sc->wd_callout, hz, tsec_tick, sc); + callout_reset(&sc->tsec_callout, hz, tsec_tick, sc); } static void tsec_set_mac_address(struct tsec_softc *sc) { uint32_t macbuf[2] = { 0, 0 }; - int i; char *macbufp; char *curmac; + int i; TSEC_GLOBAL_LOCK_ASSERT(sc); KASSERT((ETHER_ADDR_LEN <= sizeof(macbuf)), - ("tsec_set_mac_address: (%d <= %d", - ETHER_ADDR_LEN, sizeof(macbuf))); + ("tsec_set_mac_address: (%d <= %d", ETHER_ADDR_LEN, sizeof(macbuf))); macbufp = (char *)macbuf; curmac = (char *)IF_LLADDR(sc->tsec_ifp); @@ -480,13 +573,10 @@ TSEC_WRITE(sc, TSEC_REG_IMASK, 0); break; case 1: - TSEC_WRITE(sc, TSEC_REG_IMASK, TSEC_IMASK_BREN | - TSEC_IMASK_RXCEN | TSEC_IMASK_BSYEN | - TSEC_IMASK_EBERREN | TSEC_IMASK_BTEN | - TSEC_IMASK_TXEEN | TSEC_IMASK_TXBEN | - TSEC_IMASK_TXFEN | TSEC_IMASK_XFUNEN | - TSEC_IMASK_RXFEN - ); + TSEC_WRITE(sc, TSEC_REG_IMASK, TSEC_IMASK_BREN | TSEC_IMASK_RXCEN | + TSEC_IMASK_BSYEN | TSEC_IMASK_EBERREN | TSEC_IMASK_BTEN | + TSEC_IMASK_TXEEN | TSEC_IMASK_TXBEN | TSEC_IMASK_TXFEN | + TSEC_IMASK_XFUNEN | TSEC_IMASK_RXFEN); break; default: device_printf(dev, "tsec_intrs_ctl(): unknown state value: %d\n", @@ -517,7 +607,7 @@ TSEC_GLOBAL_LOCK_ASSERT(sc); - if (sc->wd_timer == 0 || --sc->wd_timer > 0) + if (sc->tsec_watchdog == 0 || --sc->tsec_watchdog > 0) return; ifp = sc->tsec_ifp; @@ -557,8 +647,8 @@ if (sc->tsec_link == 0) return; - bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, BUS_DMASYNC_POSTREAD | + BUS_DMASYNC_POSTWRITE); for (;;) { /* Get packet from the queue */ @@ -578,13 +668,13 @@ queued++; BPF_MTAP(ifp, m0); } - bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap, BUS_DMASYNC_PREREAD | + BUS_DMASYNC_PREWRITE); if (queued) { /* Enable transmitter and watchdog timer */ TSEC_WRITE(sc, TSEC_REG_TSTAT, TSEC_TSTAT_THLT); - sc->wd_timer = 5; + sc->tsec_watchdog = 5; } } @@ -612,7 +702,7 @@ /* Create mapping in DMA memory */ error = bus_dmamap_load_mbuf_sg(sc->tsec_tx_mtag, - *mapp, m0, segs, &nsegs, BUS_DMA_NOWAIT); + *mapp, m0, segs, &nsegs, BUS_DMA_NOWAIT); if (error != 0 || nsegs > TSEC_FREE_TX_DESC(sc) || nsegs <= 0) { bus_dmamap_unload(sc->tsec_tx_mtag, *mapp); TSEC_FREE_TX_MAP(sc, mapp); @@ -679,22 +769,19 @@ TSEC_GLOBAL_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - if ((sc->tsec_if_flags ^ ifp->if_flags) & - IFF_PROMISC) + if ((sc->tsec_if_flags ^ ifp->if_flags) & IFF_PROMISC) tsec_setfilter(sc); } else tsec_init_locked(sc); - } else { - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - tsec_stop(sc); - } + } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) + tsec_stop(sc); + sc->tsec_if_flags = ifp->if_flags; TSEC_GLOBAL_UNLOCK(sc); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: - error = ifmedia_ioctl(ifp, ifr, &sc->tsec_mii->mii_media, - command); + error = ifmedia_ioctl(ifp, ifr, &sc->tsec_mii->mii_media, command); break; default: error = ether_ioctl(ifp, command, data); @@ -740,7 +827,7 @@ static int tsec_new_rxbuf(bus_dma_tag_t tag, bus_dmamap_t map, struct mbuf **mbufp, - uint32_t *paddr) + uint32_t *paddr) { struct mbuf *new_mbuf; bus_dma_segment_t seg[1]; @@ -760,7 +847,7 @@ } error = bus_dmamap_load_mbuf_sg(tag, map, new_mbuf, seg, &nsegs, - BUS_DMA_NOWAIT); + BUS_DMA_NOWAIT); KASSERT(nsegs == 1, ("Too many segments returned!")); if (nsegs != 1 || error) panic("tsec_new_rxbuf(): nsegs(%d), error(%d)", nsegs, error); @@ -819,10 +906,10 @@ } error = bus_dmamem_alloc(*dtag, vaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, - dmap); + dmap); if (error) { device_printf(dev, "failed to allocate %s DMA safe memory\n", - dname); + dname); bus_dma_tag_destroy(*dtag); (*vaddr) = NULL; return (ENXIO); @@ -860,301 +947,6 @@ bus_dma_tag_destroy(dtag); } -static int -tsec_probe(device_t dev) -{ - struct tsec_softc *sc; - device_t parent; - uintptr_t devtype; - int error; - uint32_t id; - - parent = device_get_parent(dev); - - error = BUS_READ_IVAR(parent, dev, OCPBUS_IVAR_DEVTYPE, &devtype); - if (error) - return (error); - if (devtype != OCPBUS_DEVTYPE_TSEC) - return (ENXIO); - - sc = device_get_softc(dev); - - sc->sc_rrid = 0; - sc->sc_rres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_rrid, - 0ul, ~0ul, TSEC_IO_SIZE, RF_ACTIVE); - if (sc->sc_rres == NULL) - return (ENXIO); - - sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); - sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - - /* Check that we actually have a TSEC at this address */ - id = TSEC_READ(sc, TSEC_REG_ID) | TSEC_READ(sc, TSEC_REG_ID2); - - bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rrid, sc->sc_rres); - - if (id == 0) - return (ENXIO); - - device_set_desc(dev, "Three-Speed Ethernet Controller"); - return (BUS_PROBE_DEFAULT); -} - -static int -tsec_attach(device_t dev) -{ - uint8_t hwaddr[ETHER_ADDR_LEN]; - struct tsec_softc *sc; - struct ifnet *ifp; - bus_dmamap_t *map_ptr; - bus_dmamap_t **map_pptr; - int error = 0; - int i; - - sc = device_get_softc(dev); - sc->dev = dev; - - if (device_get_unit(dev) == 0) - tsec0_sc = sc; /* XXX */ - - callout_init(&sc->tsec_tick_ch, 1); - mtx_init(&sc->transmit_lock, device_get_nameunit(dev), "TSEC TX lock", - MTX_DEF); - mtx_init(&sc->receive_lock, device_get_nameunit(dev), "TSEC RX lock", - MTX_DEF); - - /* Reset all TSEC counters */ - TSEC_TX_RX_COUNTERS_INIT(sc); - - /* Allocate IO memory for TSEC registers */ - sc->sc_rrid = 0; - sc->sc_rres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_rrid, - 0ul, ~0ul, TSEC_IO_SIZE, RF_ACTIVE); - if (sc->sc_rres == NULL) { - device_printf(dev, "could not allocate IO memory range!\n"); - tsec_detach(dev); - return (ENXIO); - } - sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); - sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); - - /* Stop DMA engine if enabled by firmware */ - tsec_dma_ctl(sc, 0); - - /* Reset MAC */ - tsec_reset_mac(sc); - - /* Disable interrupts for now */ - tsec_intrs_ctl(sc, 0); - - /* Allocate a busdma tag and DMA safe memory for TX descriptors. */ - error = tsec_alloc_dma_desc(dev, &sc->tsec_tx_dtag, &sc->tsec_tx_dmap, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 21:31:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6ECB106567E; Tue, 26 Aug 2008 21:31: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 717BF1065670 for ; Tue, 26 Aug 2008 21:31: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 499688FC14 for ; Tue, 26 Aug 2008 21:31:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QLVLgD024926 for ; Tue, 26 Aug 2008 21:31:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QLVLDR024924 for perforce@freebsd.org; Tue, 26 Aug 2008 21:31:21 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 21:31:21 GMT Message-Id: <200808262131.m7QLVLDR024924@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 148556 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, 26 Aug 2008 21:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=148556 Change 148556 by jb@freebsd3 on 2008/08/26 21:30:22 IF7 Affected files ... .. //depot/projects/dtrace7/src/Makefile.inc1#9 integrate .. //depot/projects/dtrace7/src/lib/libkvm/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libkvm/kvm.h#2 integrate .. //depot/projects/dtrace7/src/lib/libkvm/kvm_cptime.c#1 branch .. //depot/projects/dtrace7/src/lib/libkvm/kvm_getcptime.3#1 branch .. //depot/projects/dtrace7/src/lib/libkvm/kvm_getpcpu.3#1 branch .. //depot/projects/dtrace7/src/lib/libkvm/kvm_pcpu.c#1 branch .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/dtrace7/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/dtrace7/src/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/dtrace7/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/dtrace7/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/pcpu.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/types.h#4 integrate .. //depot/projects/dtrace7/src/usr.bin/ldd/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.bin/ldd/ldd.1#3 integrate .. //depot/projects/dtrace7/src/usr.bin/ldd/ldd.c#4 integrate Differences ... ==== //depot/projects/dtrace7/src/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.588.2.4 2008/02/24 14:31:41 remko Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.588.2.5 2008/08/26 17:36:38 jhb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -467,8 +467,8 @@ cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all - cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t} .endfor distribute32 install32: @@ -487,10 +487,11 @@ .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE) WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools @@ -631,7 +632,8 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute .if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32 + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \ + DISTRIBUTION=lib32 .endif distrib-dirs distribution: ==== //depot/projects/dtrace7/src/lib/libkvm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libkvm/Makefile,v 1.17 2006/10/09 05:12:54 kmacy Exp $ +# $FreeBSD: src/lib/libkvm/Makefile,v 1.17.2.2 2008/08/26 18:00:06 jhb Exp $ LIB= kvm SHLIBDIR?= /lib @@ -9,16 +9,18 @@ CFLAGS+=-DSUN4V .endif -SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \ - kvm_getswapinfo.c kvm_proc.c +SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ + kvm_getswapinfo.c kvm_pcpu.c kvm_proc.c .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= kvm_minidump_${MACHINE_ARCH}.c .endif INCS= kvm.h -MAN= kvm.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 kvm_getprocs.3 \ - kvm_getswapinfo.3 kvm_nlist.3 kvm_open.3 kvm_read.3 +MAN= kvm.3 kvm_getcptime.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 \ + kvm_getpcpu.3 kvm_getprocs.3 kvm_getswapinfo.3 kvm_nlist.3 kvm_open.3 \ + kvm_read.3 +MLINKS+=kvm_getpcpu.3 kvm_getmaxcpu.3 MLINKS+=kvm_getprocs.3 kvm_getargv.3 kvm_getprocs.3 kvm_getenvv.3 MLINKS+=kvm_open.3 kvm_close.3 kvm_open.3 kvm_openfiles.3 MLINKS+=kvm_read.3 kvm_write.3 ==== //depot/projects/dtrace7/src/lib/libkvm/kvm.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)kvm.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/lib/libkvm/kvm.h,v 1.17 2007/01/08 17:35:36 imp Exp $ + * $FreeBSD: src/lib/libkvm/kvm.h,v 1.17.2.2 2008/08/26 18:00:06 jhb Exp $ */ #ifndef _KVM_H_ @@ -70,10 +70,13 @@ __BEGIN_DECLS int kvm_close(kvm_t *); char **kvm_getargv(kvm_t *, const struct kinfo_proc *, int); +int kvm_getcptime(kvm_t *, long *); char **kvm_getenvv(kvm_t *, const struct kinfo_proc *, int); char *kvm_geterr(kvm_t *); char *kvm_getfiles(kvm_t *, int, int, int *); int kvm_getloadavg(kvm_t *, double [], int); +int kvm_getmaxcpu(kvm_t *); +void *kvm_getpcpu(kvm_t *, int); struct kinfo_proc * kvm_getprocs(kvm_t *, int, int, int *); int kvm_getswapinfo(kvm_t *, struct kvm_swap *, int, int); ==== //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.25 2008/04/17 00:58:50 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.26 2008/08/26 10:20:07 marck Exp $ 2000 @@ -245,6 +245,10 @@ a flag to suppress warnings; it now also accepts multiple paths on its command line. + &man.cron.8; now supports a option, + which can help managing cron mails in massive hosting + environment. + &man.ypserv.8; now supports a option to specify the port number on which it should listen. ==== //depot/projects/dtrace7/src/sys/amd64/include/pcpu.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48.2.1 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -33,8 +33,6 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif -#ifdef _KERNEL - /* * The SMP parts are setup in pmap.c and locore.s for the BSP, and * mp_machdep.c sets up the data for the AP's to "see" when they awake. @@ -51,6 +49,8 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ +#ifdef _KERNEL + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/dtrace7/src/sys/arm/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6.2.1 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -38,6 +38,8 @@ struct vmspace; +#endif /* _KERNEL */ + /* * Inside the kernel, the globally reserved register g7 is used to * point at the globaldata structure. @@ -45,6 +47,8 @@ #define PCPU_MD_FIELDS \ struct pcup *pc_prvspace; +#ifdef _KERNEL + struct pcb; struct pcpu; ==== //depot/projects/dtrace7/src/sys/dev/dc/if_dc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.192.2.3 2008/06/19 01:36:31 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.192.2.4 2008/08/26 19:14:55 marius Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -3138,7 +3138,7 @@ bus_dma_segment_t segs[DC_MAXFRAGS]; struct dc_desc *f; struct mbuf *m; - int chainlen, cur, error, first, frag, i, idx, nseg; + int cur, defragged, error, first, frag, i, idx, nseg; /* * If there's no way we can send any packets, return now. @@ -3146,22 +3146,30 @@ if (DC_TX_LIST_CNT - sc->dc_cdata.dc_tx_cnt <= DC_TX_LIST_RSVD) return (ENOBUFS); - /* - * Count the number of frags in this chain to see if - * we need to m_defrag. Since the descriptor list is shared - * by all packets, we'll m_defrag long chains so that they - * do not use up the entire list, even if they would fit. - */ - chainlen = 0; - for (m = *m_head; m != NULL; m = m->m_next) - chainlen++; - m = NULL; - if ((sc->dc_flags & DC_TX_COALESCE && ((*m_head)->m_next != NULL || - sc->dc_flags & DC_TX_ALIGN)) || (chainlen > DC_TX_LIST_CNT / 4) || - (DC_TX_LIST_CNT - (chainlen + sc->dc_cdata.dc_tx_cnt) <= - DC_TX_LIST_RSVD)) { + defragged = 0; + if (sc->dc_flags & DC_TX_COALESCE && + ((*m_head)->m_next != NULL || sc->dc_flags & DC_TX_ALIGN)) { m = m_defrag(*m_head, M_DONTWAIT); + defragged = 1; + } else { + /* + * Count the number of frags in this chain to see if we + * need to m_collapse. Since the descriptor list is shared + * by all packets, we'll m_collapse long chains so that they + * do not use up the entire list, even if they would fit. + */ + i = 0; + for (m = *m_head; m != NULL; m = m->m_next) + i++; + if (i > DC_TX_LIST_CNT / 4 || + DC_TX_LIST_CNT - i + sc->dc_cdata.dc_tx_cnt <= + DC_TX_LIST_RSVD) { + m = m_collapse(*m_head, M_DONTWAIT, DC_MAXFRAGS); + defragged = 1; + } + } + if (defragged != 0) { if (m == NULL) { m_freem(*m_head); *m_head = NULL; @@ -3169,15 +3177,16 @@ } *m_head = m; } + idx = sc->dc_cdata.dc_tx_prod; error = bus_dmamap_load_mbuf_sg(sc->dc_mtag, sc->dc_cdata.dc_tx_map[idx], *m_head, segs, &nseg, 0); if (error == EFBIG) { - m = m_defrag(*m_head, M_DONTWAIT); - if (m == NULL) { + if (defragged != 0 || (m = m_collapse(*m_head, M_DONTWAIT, + DC_MAXFRAGS)) == NULL) { m_freem(*m_head); *m_head = NULL; - return (ENOBUFS); + return (defragged != 0 ? error : ENOBUFS); } *m_head = m; error = bus_dmamap_load_mbuf_sg(sc->dc_mtag, ==== //depot/projects/dtrace7/src/sys/dev/gem/if_gem.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.44.2.5 2008/07/13 17:09:22 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.44.2.6 2008/08/26 18:11:25 marius Exp $"); /* * Driver for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers @@ -87,7 +87,7 @@ #define TRIES 10000 /* - * The GEM hardware support basic TCP/UDP checksum offloading. However, + * The hardware supports basic TCP/UDP checksum offloading. However, * the hardware doesn't compensate the checksum for UDP datagram which * can yield to 0x0. As a safe guard, UDP checksum offload is disabled * by default. It can be reactivated by setting special link option @@ -536,18 +536,26 @@ { struct gem_softc *sc = arg; struct ifnet *ifp; + uint32_t v; GEM_LOCK_ASSERT(sc, MA_OWNED); ifp = sc->sc_ifp; /* - * Unload collision counters. + * Unload collision and error counters. */ ifp->if_collisions += GEM_BANK1_READ_4(sc, GEM_MAC_NORM_COLL_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) + + GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT); + v = GEM_BANK1_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) + GEM_BANK1_READ_4(sc, GEM_MAC_LATE_COLL_CNT); + ifp->if_collisions += v; + ifp->if_oerrors += v; + ifp->if_ierrors += + GEM_BANK1_READ_4(sc, GEM_MAC_RX_LEN_ERR_CNT) + + GEM_BANK1_READ_4(sc, GEM_MAC_RX_ALIGN_ERR) + + GEM_BANK1_READ_4(sc, GEM_MAC_RX_CRC_ERR_CNT) + + GEM_BANK1_READ_4(sc, GEM_MAC_RX_CODE_VIOL); /* * Then clear the hardware counters. @@ -556,6 +564,10 @@ GEM_BANK1_WRITE_4(sc, GEM_MAC_FIRST_COLL_CNT, 0); GEM_BANK1_WRITE_4(sc, GEM_MAC_EXCESS_COLL_CNT, 0); GEM_BANK1_WRITE_4(sc, GEM_MAC_LATE_COLL_CNT, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_LEN_ERR_CNT, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_ALIGN_ERR, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CRC_ERR_CNT, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CODE_VIOL, 0); mii_tick(sc->sc_mii); @@ -1739,7 +1751,7 @@ /* * MII interface * - * The GEM MII interface supports at least three different operating modes: + * The MII interface supports at least three different operating modes: * * Bitbang mode is implemented using data, clock and output enable registers. * @@ -1971,12 +1983,12 @@ v |= GEM_MAC_XIF_TX_MII_ENA; if ((sc->sc_flags & GEM_SERDES) == 0) { if ((GEM_BANK1_READ_4(sc, GEM_MIF_CONFIG) & - GEM_MIF_CONFIG_PHY_SEL) != 0 && - (IFM_OPTIONS(sc->sc_mii->mii_media_active) & - IFM_FDX) == 0) + GEM_MIF_CONFIG_PHY_SEL) != 0) { /* External MII needs echo disable if half duplex. */ - v |= GEM_MAC_XIF_ECHO_DISABL; - else + if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & + IFM_FDX) == 0) + v |= GEM_MAC_XIF_ECHO_DISABL; + } else /* * Internal MII needs buffer enable. * XXX buffer enable makes only sense for an ==== //depot/projects/dtrace7/src/sys/i386/include/pcpu.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.50 2007/06/04 21:38:46 attilio Exp $ + * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.50.2.1 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -33,8 +33,6 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif -#ifdef _KERNEL - #include #include @@ -57,6 +55,9 @@ u_int pc_apic_id; \ int pc_private_tss /* Flag indicating private tss */ + +#ifdef _KERNEL + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/dtrace7/src/sys/ia64/include/pcpu.h#2 (text+ko) ==== @@ -24,14 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/pcpu.h,v 1.20 2007/06/04 21:38:47 attilio Exp $ + * $FreeBSD: src/sys/ia64/include/pcpu.h,v 1.20.2.1 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ -#ifdef _KERNEL - #include #define PCPU_MD_FIELDS \ @@ -43,6 +41,8 @@ uint32_t pc_awake:1; /* CPU is awake? */ \ uint32_t pc_acpi_id /* ACPI CPU id. */ +#ifdef _KERNEL + struct pcpu; register struct pcpu *pcpup __asm__("r13"); ==== //depot/projects/dtrace7/src/sys/powerpc/include/pcpu.h#2 (text+ko) ==== @@ -24,13 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/pcpu.h,v 1.24 2007/06/04 21:38:47 attilio Exp $ + * $FreeBSD: src/sys/powerpc/include/pcpu.h,v 1.24.2.1 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ -#ifdef _KERNEL #include struct pmap; @@ -54,6 +53,8 @@ #define CPUSAVE_SRR0 6 /* where SRR0 gets saved */ #define CPUSAVE_SRR1 7 /* where SRR1 gets saved */ +#ifdef _KERNEL + #define PCPUP ((struct pcpu *) powerpc_get_pcpup()) #define PCPU_GET(member) (PCPUP->pc_ ## member) ==== //depot/projects/dtrace7/src/sys/sparc64/central/central.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.12 2007/03/07 21:13:50 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.12.2.1 2008/08/26 18:45:56 marius Exp $"); #include #include @@ -105,6 +105,7 @@ static devclass_t central_devclass; DRIVER_MODULE(central, nexus, central_driver, central_devclass, 0, 0); +MODULE_VERSION(central, 1); static int central_probe(device_t dev) @@ -159,7 +160,7 @@ resource_list_add(&cdi->cdi_rl, SYS_RES_MEMORY, i, reg[i].sbr_offset, reg[i].sbr_offset + reg[i].sbr_size, reg[i].sbr_size); - free(reg, M_OFWPROP); + free(reg, M_OFWPROP); cdev = device_add_child(dev, NULL, -1); if (cdev == NULL) { device_printf(dev, "<%s>: device_add_child failed\n", ==== //depot/projects/dtrace7/src/sys/sparc64/conf/GENERIC#3 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.127.2.5 2008/04/14 06:30:46 yongari Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.127.2.6 2008/08/26 18:06:17 marius Exp $ cpu SUN4U ident GENERIC @@ -118,6 +118,8 @@ device atkbd # AT keyboard device psm # PS/2 mouse +device kbdmux # keyboard multiplexer + # syscons is the default console driver, resembling an SCO console device sc device creator # Creator, Creator3D and Elite3D framebuffers @@ -148,7 +150,7 @@ #device plip # TCP/IP over parallel #device ppi # Parallel port interface device #device vpo # Requires scbus and da - + # PCI Ethernet NICs. #device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card ==== //depot/projects/dtrace7/src/sys/sparc64/ebus/ebus.c#2 (text+ko) ==== @@ -30,21 +30,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.26 2006/04/20 04:20:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.26.2.1 2008/08/26 18:22:16 marius Exp $"); /* - * UltraSPARC 5 and beyond Ebus support. - * - * note that this driver is not complete: - * - ebus2 dma code is completely unwritten - * - interrupt establish is written and appears to work - * - bus map code is written and appears to work - * XXX: This is PCI specific, however, there exist SBus-to-EBus bridges... - * XXX: The EBus was designed to allow easy adaption of ISA devices to it - a - * compatability layer for ISA devices might be nice, although probably not - * easily possible because of some cruft (like in[bwl]/out[bwl] and friends). - * Additionally, the existing ISA code is limited to one ISA bus, however, - * there are machines with both ISA and EBus. + * UltraSPARC 5 and beyond EBus support */ #include @@ -88,8 +77,6 @@ }; struct ebus_softc { - phandle_t sc_node; - struct isa_ranges *sc_range; struct ebus_rinfo *sc_rinfo; @@ -123,7 +110,7 @@ /* Bus interface */ DEVMETHOD(bus_print_child, ebus_print_child), DEVMETHOD(bus_probe_nomatch, ebus_probe_nomatch), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, ebus_alloc_resource), DEVMETHOD(bus_get_resource_list, ebus_get_resource_list), @@ -152,6 +139,8 @@ static devclass_t ebus_devclass; DRIVER_MODULE(ebus, pci, ebus_driver, ebus_devclass, 0, 0); +MODULE_DEPEND(ebus, pci, 1, 1, 1); +MODULE_VERSION(ebus, 1); static int ebus_probe(device_t dev) @@ -183,8 +172,8 @@ int i, rnum, rid; sc = device_get_softc(dev); - sc->sc_node = node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(dev); sc->sc_nrange = OF_getprop_alloc(node, "ranges", sizeof(*sc->sc_range), (void **)&sc->sc_range); if (sc->sc_nrange == -1) { @@ -215,7 +204,7 @@ goto fail; } if (rman_manage_region(&eri->eri_rman, rman_get_start(res), - rman_get_end(res)) != 0) { + rman_get_end(res)) != 0) { printf("ebus_attach: failed to register region!"); rman_fini(&eri->eri_rman); goto fail; @@ -293,7 +282,7 @@ sc = (struct ebus_softc *)device_get_softc(bus); rl = BUS_GET_RESOURCE_LIST(bus, child); /* - * Map ebus ranges to PCI ranges. This may include changing the + * Map EBus ranges to PCI ranges. This may include changing the * allocation type. */ switch (type) { @@ -339,11 +328,10 @@ return (resource_list_alloc(rl, bus, child, type, rid, start, end, count, flags)); } - return (NULL); } -int +static int ebus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { @@ -354,7 +342,7 @@ rl = BUS_GET_RESOURCE_LIST(bus, child); switch (type) { - case SYS_RES_MEMORY: + case SYS_RES_MEMORY: if ((rv = rman_release_resource(res)) != 0) return (rv); if (!passthrough) { ==== //depot/projects/dtrace7/src/sys/sparc64/fhc/fhc.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc.c,v 1.18.2.1 2008/05/30 19:30:05 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc.c,v 1.18.2.2 2008/08/26 18:45:56 marius Exp $"); #include #include @@ -120,6 +120,8 @@ DRIVER_MODULE(fhc, central, fhc_driver, fhc_devclass, 0, 0); DRIVER_MODULE(fhc, nexus, fhc_driver, fhc_devclass, 0, 0); +MODULE_DEPEND(fhc, central, 1, 1, 1); +MODULE_VERSION(fhc, 1); static const struct intr_controller fhc_ic = { fhc_intr_enable, @@ -320,7 +322,7 @@ if (sc->sc_memres[i] != NULL) bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->sc_memres[i]), sc->sc_memres[i]); - return (error); + return (error); } static int @@ -399,12 +401,12 @@ /* * Make sure the vector is fully specified and we registered * our interrupt controller for it. - */ + */ vec = rman_get_start(r); if (INTIGN(vec) != sc->sc_ign || intr_vectors[vec].iv_ic != &fhc_ic) { device_printf(bus, "invalid interrupt vector 0x%lx\n", vec); - return (EINVAL); - } + return (EINVAL); + } return (bus_generic_setup_intr(bus, child, r, flags, filt, func, arg, cookiep)); } ==== //depot/projects/dtrace7/src/sys/sparc64/include/cpufunc.h#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/sys/sparc64/include/cpufunc.h,v 1.21.2.1 2008/08/24 18:28:13 marius Exp $ + * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.21.2.2 2008/08/26 18:50:50 marius Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -177,14 +177,16 @@ * Macro intended to be used instead of wr(asr23, val, xor) for writing to * the TICK_COMPARE register in order to avoid a bug in BlackBird CPUs that * can cause these writes to fail under certain condidtions which in turn - * causes the hardclock to stop. The workaround is to perform the write - * at the beginning of an I-Cache line directly followed by a dummy read. + * causes the hardclock to stop. The workaround is to read the TICK_COMPARE + * register back immediately after writing to it with these two instructions + * aligned to a quadword boundary in order to ensure that I$ misses won't + * split them up. */ #define wrtickcmpr(val, xor) ({ \ __asm __volatile( \ " ba,pt %%xcc, 1f ; " \ " nop ; " \ - " .align 64 ; " \ + " .align 128 ; " \ "1: wr %0, %1, %%asr23 ; " \ " rd %%asr23, %%g0 ; " \ : : "r" (val), "rI" (xor)); \ ==== //depot/projects/dtrace7/src/sys/sparc64/include/pcpu.h#3 (text+ko) ==== @@ -24,14 +24,12 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/sparc64/include/pcpu.h,v 1.22.2.1 2008/08/24 18:28:13 marius Exp $ + * $FreeBSD: src/sys/sparc64/include/pcpu.h,v 1.22.2.2 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ -#ifdef _KERNEL - #include #include #include @@ -59,6 +57,8 @@ u_int pc_tlb_ctx_max; \ u_int pc_tlb_ctx_min +#ifdef _KERNEL + struct pcb; struct pcpu; ==== //depot/projects/dtrace7/src/sys/sparc64/sbus/dma_sbus.c#2 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.5 2007/01/20 14:06:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.5.2.1 2008/08/26 18:17:28 marius Exp $"); #include #include @@ -150,6 +150,8 @@ }; DRIVER_MODULE(dma, sbus, dma_driver, dma_devclass, 0, 0); +MODULE_DEPEND(dma, sbus, 1, 1, 1); +MODULE_VERSION(dma, 1); static int dma_probe(device_t dev) ==== //depot/projects/dtrace7/src/sys/sparc64/sbus/sbus.c#4 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.46.2.2 2008/05/30 19:30:06 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.46.2.3 2008/08/26 18:17:28 marius Exp $"); /* * SBus support. @@ -247,6 +247,7 @@ static devclass_t sbus_devclass; DRIVER_MODULE(sbus, nexus, sbus_driver, sbus_devclass, 0, 0); +MODULE_VERSION(sbus, 1); #define OFW_SBUS_TYPE "sbus" #define OFW_SBUS_NAME "sbus" ==== //depot/projects/dtrace7/src/sys/sun4v/include/pcpu.h#3 (text+ko) ==== @@ -24,14 +24,12 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.9.2.1 2008/05/07 21:14:13 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.9.2.2 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ -#ifdef _KERNEL - #include #include #include @@ -82,6 +80,9 @@ * be L2 cache aligned - they're surrounded by per-cpu data, so there is * no possibility of false sharing, but this might help in reducing misses */ + +#ifdef _KERNEL + struct pcpu; register struct pcpu *pcpup __asm__(__XSTRING(PCPU_REG)); ==== //depot/projects/dtrace7/src/sys/sys/pcpu.h#3 (text+ko) ==== @@ -27,16 +27,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/pcpu.h,v 1.22.2.1 2008/04/09 19:05:59 peter Exp $ + * $FreeBSD: src/sys/sys/pcpu.h,v 1.22.2.2 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _SYS_PCPU_H_ #define _SYS_PCPU_H_ -#ifndef _KERNEL -#error "no user-serviceable parts inside" -#endif - #ifdef LOCORE #error "no assembler-serviceable parts inside" #endif @@ -78,6 +74,8 @@ struct device *pc_device; }; +#ifdef _KERNEL + SLIST_HEAD(cpuhead, pcpu); extern struct cpuhead cpuhead; @@ -101,4 +99,6 @@ struct pcpu *pcpu_find(u_int cpuid); void pcpu_init(struct pcpu *pcpu, int cpuid, size_t size); +#endif /* _KERNEL */ + #endif /* !_SYS_PCPU_H_ */ ==== //depot/projects/dtrace7/src/sys/sys/types.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/types.h,v 1.96.2.1 2008/07/25 17:46:01 jhb Exp $ + * $FreeBSD: src/sys/sys/types.h,v 1.96.2.2 2008/08/26 17:48:10 jhb Exp $ */ #ifndef _SYS_TYPES_H_ @@ -143,6 +143,7 @@ #define _CLOCKID_T_DECLARED #endif +typedef __cpumask_t cpumask_t; typedef __critical_t critical_t; /* Critical section value */ typedef __int64_t daddr_t; /* disk address */ @@ -278,7 +279,6 @@ #ifdef _KERNEL typedef int boolean_t; -typedef __cpumask_t cpumask_t; typedef struct device *device_t; typedef __intfptr_t intfptr_t; ==== //depot/projects/dtrace7/src/usr.bin/ldd/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13 2004/06/29 21:13:15 dwmalone Exp $ +# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13.18.1 2008/08/26 17:36:38 jhb Exp $ -PROG= ldd +PROG?= ldd SRCS= ldd.c .if ${MACHINE_ARCH} == "i386" SRCS+= sods.c ==== //depot/projects/dtrace7/src/usr.bin/ldd/ldd.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.24.2.1 2008/07/10 01:32:08 edwin Exp $ +.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.24.2.2 2008/08/26 17:36:38 jhb Exp $ .\" .Dd October 22, 1993 .Dt LDD 1 @@ -57,12 +57,6 @@ encoded in the executable. See the source code and include files for the definitive meaning of all the fields. -.Sh BUGS -On 64 bit architectures, dlopen() cannot open 32 bit dynamic libraries, -so -.Nm -will show the error -.Qq "unsupported file layout" . .Sh SEE ALSO .Xr ld 1 , .Xr nm 1 , ==== //depot/projects/dtrace7/src/usr.bin/ldd/ldd.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/ldd/ldd.c,v 1.33.24.2 2008/07/30 03:33:49 edwin Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ldd/ldd.c,v 1.33.24.3 2008/08/26 17:36:38 jhb Exp $"); #include @@ -44,10 +44,17 @@ #include #include #include +#include #include #include "extern.h" +#ifdef COMPAT_32BIT +#define LD_ "LD_32_" +#else +#define LD_ "LD_" +#endif + /* * 32-bit ELF data structures can only be used if the system header[s] declare * them. There is no official macro for determining whether they are declared, @@ -66,30 +73,57 @@ #define TYPE_ELF 2 /* Architecture default */ #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) #define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */ -#endif + +#define _PATH_LDD32 "/usr/bin/ldd32" + +static int +execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag) +{ + char *argv[8]; + int i, rval, status; -#define ENV_OBJECTS 0 -#define ENV_OBJECTS_FMT1 1 -#define ENV_OBJECTS_FMT2 2 -#define ENV_OBJECTS_PROGNAME 3 -#define ENV_OBJECTS_ALL 4 -#define ENV_LAST 5 + unsetenv(LD_ "TRACE_LOADED_OBJECTS"); + rval = 0; + i = 0; + argv[i++] = strdup(_PATH_LDD32); + if (aflag) + argv[i++] = strdup("-a"); + if (vflag) + argv[i++] = strdup("-v"); + if (fmt1 != NULL) { + argv[i++] = strdup("-f"); + argv[i++] = strdup(fmt1); + } + if (fmt2 != NULL) { + argv[i++] = strdup("-f"); + argv[i++] = strdup(fmt2); + } + argv[i++] = strdup(file); + argv[i++] = NULL; -const char *envdef[ENV_LAST] = { - "LD_TRACE_LOADED_OBJECTS", - "LD_TRACE_LOADED_OBJECTS_FMT1", - "LD_TRACE_LOADED_OBJECTS_FMT2", - "LD_TRACE_LOADED_OBJECTS_PROGNAME", - "LD_TRACE_LOADED_OBJECTS_ALL", -}; -#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 21:38:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 527E41065677; Tue, 26 Aug 2008 21:38: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 160FC1065675 for ; Tue, 26 Aug 2008 21:38:29 +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 E24E98FC1F for ; Tue, 26 Aug 2008 21:38:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QLcSHV025492 for ; Tue, 26 Aug 2008 21:38:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QLcSOW025490 for perforce@freebsd.org; Tue, 26 Aug 2008 21:38:28 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 21:38:28 GMT Message-Id: <200808262138.m7QLcSOW025490@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 148559 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, 26 Aug 2008 21:38:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=148559 Change 148559 by jb@freebsd3 on 2008/08/26 21:38:26 IF6 Affected files ... .. //depot/projects/dtrace6/src/Makefile.inc1#7 integrate .. //depot/projects/dtrace6/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/dtrace6/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/dtrace6/src/usr.bin/ldd/Makefile#2 integrate .. //depot/projects/dtrace6/src/usr.bin/ldd/ldd.1#3 integrate .. //depot/projects/dtrace6/src/usr.bin/ldd/ldd.c#4 integrate .. //depot/projects/dtrace6/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/mountd/mountd.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.499.2.21 2007/05/16 21:39:44 ambrisko Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.499.2.22 2008/08/26 17:40:41 jhb Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -472,8 +472,8 @@ cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all - cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t} .endfor distribute32 install32: @@ -487,10 +487,11 @@ .if !defined(NO_CRYPT) cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE) WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools @@ -610,7 +611,8 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute .if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32 + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \ + DISTRIBUTION=lib32 .endif distrib-dirs distribution: ==== //depot/projects/dtrace6/src/sys/dev/gem/if_gem.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.29.2.8 2008/07/13 21:36:42 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.29.2.9 2008/08/26 18:13:40 marius Exp $"); /* * Driver for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers @@ -87,7 +87,7 @@ #define TRIES 10000 /* - * The GEM hardware support basic TCP/UDP checksum offloading. However, + * The hardware supports basic TCP/UDP checksum offloading. However, * the hardware doesn't compensate the checksum for UDP datagram which * can yield to 0x0. As a safe guard, UDP checksum offload is disabled * by default. It can be reactivated by setting special link option @@ -537,18 +537,26 @@ { struct gem_softc *sc = arg; struct ifnet *ifp; + uint32_t v; GEM_LOCK_ASSERT(sc, MA_OWNED); ifp = sc->sc_ifp; /* - * Unload collision counters. + * Unload collision and error counters. */ ifp->if_collisions += GEM_BANK1_READ_4(sc, GEM_MAC_NORM_COLL_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) + + GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT); + v = GEM_BANK1_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) + GEM_BANK1_READ_4(sc, GEM_MAC_LATE_COLL_CNT); + ifp->if_collisions += v; + ifp->if_oerrors += v; + ifp->if_ierrors += + GEM_BANK1_READ_4(sc, GEM_MAC_RX_LEN_ERR_CNT) + + GEM_BANK1_READ_4(sc, GEM_MAC_RX_ALIGN_ERR) + + GEM_BANK1_READ_4(sc, GEM_MAC_RX_CRC_ERR_CNT) + + GEM_BANK1_READ_4(sc, GEM_MAC_RX_CODE_VIOL); /* * Then clear the hardware counters. @@ -557,6 +565,10 @@ GEM_BANK1_WRITE_4(sc, GEM_MAC_FIRST_COLL_CNT, 0); GEM_BANK1_WRITE_4(sc, GEM_MAC_EXCESS_COLL_CNT, 0); GEM_BANK1_WRITE_4(sc, GEM_MAC_LATE_COLL_CNT, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_LEN_ERR_CNT, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_ALIGN_ERR, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CRC_ERR_CNT, 0); + GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CODE_VIOL, 0); mii_tick(sc->sc_mii); @@ -1826,7 +1838,7 @@ /* * MII interface * - * The GEM MII interface supports at least three different operating modes: + * The MII interface supports at least three different operating modes: * * Bitbang mode is implemented using data, clock and output enable registers. * @@ -2058,12 +2070,12 @@ v |= GEM_MAC_XIF_TX_MII_ENA; if ((sc->sc_flags & GEM_SERDES) == 0) { if ((GEM_BANK1_READ_4(sc, GEM_MIF_CONFIG) & - GEM_MIF_CONFIG_PHY_SEL) != 0 && - (IFM_OPTIONS(sc->sc_mii->mii_media_active) & - IFM_FDX) == 0) + GEM_MIF_CONFIG_PHY_SEL) != 0) { /* External MII needs echo disable if half duplex. */ - v |= GEM_MAC_XIF_ECHO_DISABL; - else + if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & + IFM_FDX) == 0) + v |= GEM_MAC_XIF_ECHO_DISABL; + } else /* * Internal MII needs buffer enable. * XXX buffer enable makes only sense for an ==== //depot/projects/dtrace6/src/sys/sparc64/central/central.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.8.2.1 2006/01/30 22:30:50 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.8.2.2 2008/08/26 18:46:08 marius Exp $"); #include #include @@ -112,6 +112,7 @@ static devclass_t central_devclass; DRIVER_MODULE(central, nexus, central_driver, central_devclass, 0, 0); +MODULE_VERSION(central, 1); static int central_probe(device_t dev) ==== //depot/projects/dtrace6/src/sys/sparc64/conf/GENERIC#4 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.96.2.14 2008/04/24 10:46:23 dfr Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.96.2.15 2008/08/26 18:06:49 marius Exp $ machine sparc64 cpu SUN4U @@ -113,6 +113,8 @@ device atkbd # AT keyboard device psm # PS/2 mouse +device kbdmux # keyboard multiplexer + # syscons is the default console driver, resembling an SCO console device sc device creator # Creator, Creator3D and Elite3D framebuffers @@ -143,7 +145,7 @@ #device plip # TCP/IP over parallel #device ppi # Parallel port interface device #device vpo # Requires scbus and da - + # PCI Ethernet NICs. #device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card ==== //depot/projects/dtrace6/src/sys/sparc64/ebus/ebus.c#3 (text+ko) ==== @@ -30,21 +30,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.23.2.2 2007/10/03 20:41:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.23.2.3 2008/08/26 18:22:11 marius Exp $"); /* - * UltraSPARC 5 and beyond Ebus support. - * - * note that this driver is not complete: - * - ebus2 dma code is completely unwritten - * - interrupt establish is written and appears to work - * - bus map code is written and appears to work - * XXX: This is PCI specific, however, there exist SBus-to-EBus bridges... - * XXX: The EBus was designed to allow easy adaption of ISA devices to it - a - * compatability layer for ISA devices might be nice, although probably not - * easily possible because of some cruft (like in[bwl]/out[bwl] and friends). - * Additionally, the existing ISA code is limited to one ISA bus, however, - * there are machines with both ISA and EBus. + * UltraSPARC 5 and beyond EBus support */ #include @@ -92,8 +81,6 @@ }; struct ebus_softc { - phandle_t sc_node; - struct isa_ranges *sc_range; struct ebus_rinfo *sc_rinfo; @@ -132,7 +119,7 @@ /* Bus interface */ DEVMETHOD(bus_print_child, ebus_print_child), DEVMETHOD(bus_probe_nomatch, ebus_probe_nomatch), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, ebus_alloc_resource), DEVMETHOD(bus_get_resource_list, ebus_get_resource_list), @@ -160,6 +147,8 @@ static devclass_t ebus_devclass; DRIVER_MODULE(ebus, pci, ebus_driver, ebus_devclass, 0, 0); +MODULE_DEPEND(ebus, pci, 1, 1, 1); +MODULE_VERSION(ebus, 1); static int ebus_probe(device_t dev) @@ -192,8 +181,8 @@ int i, rnum, rid; sc = device_get_softc(dev); - sc->sc_node = node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(dev); sc->sc_nrange = OF_getprop_alloc(node, "ranges", sizeof(*sc->sc_range), (void **)&sc->sc_range); if (sc->sc_nrange == -1) { @@ -224,7 +213,7 @@ goto fail; } if (rman_manage_region(&eri->eri_rman, rman_get_start(res), - rman_get_end(res)) != 0) { + rman_get_end(res)) != 0) { printf("ebus_attach: failed to register region!"); rman_fini(&eri->eri_rman); goto fail; @@ -307,7 +296,7 @@ sc = (struct ebus_softc *)device_get_softc(bus); rl = BUS_GET_RESOURCE_LIST(bus, child); /* - * Map ebus ranges to PCI ranges. This may include changing the + * Map EBus ranges to PCI ranges. This may include changing the * allocation type. */ switch (type) { @@ -353,11 +342,10 @@ return (resource_list_alloc(rl, bus, child, type, rid, start, end, count, flags)); } - return (NULL); } -int +static int ebus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { @@ -368,7 +356,7 @@ rl = BUS_GET_RESOURCE_LIST(bus, child); switch (type) { - case SYS_RES_MEMORY: + case SYS_RES_MEMORY: if ((rv = rman_release_resource(res)) != 0) return (rv); if (!passthrough) { ==== //depot/projects/dtrace6/src/sys/sparc64/fhc/fhc.c#2 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc.c,v 1.13 2005/06/05 10:16:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc.c,v 1.13.2.1 2008/08/26 18:46:08 marius Exp $"); #include #include #include #include #include +#include #include #include @@ -68,6 +69,8 @@ static void fhc_intr_stub(void *); static void fhc_led_func(void *, int); +MODULE_VERSION(fhc, 1); + int fhc_probe(device_t dev) { @@ -388,7 +391,7 @@ const char * fhc_get_compat(device_t bus, device_t dev) -{ +{ struct fhc_devinfo *dinfo; dinfo = device_get_ivars(dev); ==== //depot/projects/dtrace6/src/sys/sparc64/fhc/fhc_central.c#2 (text+ko) ==== @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.8.2.1 2006/01/30 22:30:50 marius Exp $"); +#include +__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.8.2.2 2008/08/26 18:46:08 marius Exp $"); #include #include @@ -86,6 +86,7 @@ static devclass_t fhc_central_devclass; DRIVER_MODULE(fhc, central, fhc_central_driver, fhc_central_devclass, 0, 0); +MODULE_DEPEND(fhc, central, 1, 1, 1); static int fhc_central_probe(device_t dev) ==== //depot/projects/dtrace6/src/sys/sparc64/include/cpufunc.h#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/sys/sparc64/include/cpufunc.h,v 1.20.2.2 2008/08/24 19:19:49 marius Exp $ + * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.20.2.3 2008/08/26 18:50:52 marius Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -177,14 +177,16 @@ * Macro intended to be used instead of wr(asr23, val, xor) for writing to * the TICK_COMPARE register in order to avoid a bug in BlackBird CPUs that * can cause these writes to fail under certain condidtions which in turn - * causes the hardclock to stop. The workaround is to perform the write - * at the beginning of an I-Cache line directly followed by a dummy read. + * causes the hardclock to stop. The workaround is to read the TICK_COMPARE + * register back immediately after writing to it with these two instructions + * aligned to a quadword boundary in order to ensure that I$ misses won't + * split them up. */ #define wrtickcmpr(val, xor) ({ \ __asm __volatile( \ " ba,pt %%xcc, 1f ; " \ " nop ; " \ - " .align 64 ; " \ + " .align 128 ; " \ "1: wr %0, %1, %%asr23 ; " \ " rd %%asr23, %%g0 ; " \ : : "r" (val), "rI" (xor)); \ ==== //depot/projects/dtrace6/src/sys/sparc64/sbus/dma_sbus.c#2 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.1.2.1 2006/01/30 22:30:51 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.1.2.2 2008/08/26 18:18:30 marius Exp $"); #include #include @@ -155,6 +155,8 @@ }; DRIVER_MODULE(dma, sbus, dma_driver, dma_devclass, 0, 0); +MODULE_DEPEND(dma, sbus, 1, 1, 1); +MODULE_VERSION(dma, 1); static int dma_probe(device_t dev) ==== //depot/projects/dtrace6/src/sys/sparc64/sbus/sbus.c#4 (text+ko) ==== @@ -98,7 +98,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.35.2.5 2008/05/19 19:23:05 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.35.2.6 2008/08/26 18:18:30 marius Exp $"); /* * SBus support. @@ -261,6 +261,7 @@ static devclass_t sbus_devclass; DRIVER_MODULE(sbus, nexus, sbus_driver, sbus_devclass, 0, 0); +MODULE_VERSION(sbus, 1); #define OFW_SBUS_TYPE "sbus" #define OFW_SBUS_NAME "sbus" ==== //depot/projects/dtrace6/src/usr.bin/ldd/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13 2004/06/29 21:13:15 dwmalone Exp $ +# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13.8.1 2008/08/26 17:40:41 jhb Exp $ -PROG= ldd +PROG?= ldd SRCS= ldd.c .if ${MACHINE_ARCH} == "i386" SRCS+= sods.c ==== //depot/projects/dtrace6/src/usr.bin/ldd/ldd.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.23.12.2 2008/07/10 01:33:48 edwin Exp $ +.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.23.12.3 2008/08/26 17:40:41 jhb Exp $ .\" .Dd October 22, 1993 .Dt LDD 1 @@ -57,12 +57,6 @@ encoded in the executable. See the source code and include files for the definitive meaning of all the fields. -.Sh BUGS -On 64 bit architectures, dlopen() cannot open 32 bit dynamic libraries, -so -.Nm -will show the error -.Qq "unsupported file layout" . .Sh SEE ALSO .Xr ld 1 , .Xr nm 1 , ==== //depot/projects/dtrace6/src/usr.bin/ldd/ldd.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/ldd/ldd.c,v 1.33.14.2 2008/07/30 03:32:32 edwin Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ldd/ldd.c,v 1.33.14.3 2008/08/26 17:40:41 jhb Exp $"); #include @@ -44,10 +44,17 @@ #include #include #include +#include #include #include "extern.h" +#ifdef COMPAT_32BIT +#define LD_ "LD_32_" +#else +#define LD_ "LD_" +#endif + /* * 32-bit ELF data structures can only be used if the system header[s] declare * them. There is no official macro for determining whether they are declared, @@ -66,30 +73,57 @@ #define TYPE_ELF 2 /* Architecture default */ #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) #define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */ -#endif + +#define _PATH_LDD32 "/usr/bin/ldd32" + +static int +execldd32(char *file, char *fmt1, char *fmt2, int aflag, int vflag) +{ + char *argv[8]; + int i, rval, status; -#define ENV_OBJECTS 0 -#define ENV_OBJECTS_FMT1 1 -#define ENV_OBJECTS_FMT2 2 -#define ENV_OBJECTS_PROGNAME 3 -#define ENV_OBJECTS_ALL 4 -#define ENV_LAST 5 + unsetenv(LD_ "TRACE_LOADED_OBJECTS"); + rval = 0; + i = 0; + argv[i++] = strdup(_PATH_LDD32); + if (aflag) + argv[i++] = strdup("-a"); + if (vflag) + argv[i++] = strdup("-v"); + if (fmt1 != NULL) { + argv[i++] = strdup("-f"); + argv[i++] = strdup(fmt1); + } + if (fmt2 != NULL) { + argv[i++] = strdup("-f"); + argv[i++] = strdup(fmt2); + } + argv[i++] = strdup(file); + argv[i++] = NULL; -const char *envdef[ENV_LAST] = { - "LD_TRACE_LOADED_OBJECTS", - "LD_TRACE_LOADED_OBJECTS_FMT1", - "LD_TRACE_LOADED_OBJECTS_FMT2", - "LD_TRACE_LOADED_OBJECTS_PROGNAME", - "LD_TRACE_LOADED_OBJECTS_ALL", -}; -#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) -const char *env32[ENV_LAST] = { - "LD_32_TRACE_LOADED_OBJECTS", - "LD_32_TRACE_LOADED_OBJECTS_FMT1", - "LD_32_TRACE_LOADED_OBJECTS_FMT2", - "LD_32_TRACE_LOADED_OBJECTS_PROGNAME", - "LD_32_TRACE_LOADED_OBJECTS_ALL", -}; + switch (fork()) { + case -1: + err(1, "fork"); + break; + case 0: + execv(_PATH_LDD32, argv); + warn("%s", _PATH_LDD32); + _exit(127); + break; + default: + if (wait(&status) < 0) + rval = 1; + else if (WIFSIGNALED(status)) + rval = 1; + else if (WIFEXITED(status) && WEXITSTATUS(status) != 0) + rval = 1; + break; + } + while (i--) + free(argv[i]); + setenv(LD_ "TRACE_LOADED_OBJECTS", "yes", 1); + return (rval); +} #endif int @@ -144,7 +178,6 @@ rval = 0; for (; argc > 0; argc--, argv++) { int fd, status, is_shlib, rv, type; - const char **env; if ((fd = open(*argv, O_RDONLY, 0)) < 0) { warn("%s", *argv); @@ -161,12 +194,11 @@ switch (type) { case TYPE_ELF: case TYPE_AOUT: - env = envdef; break; #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) case TYPE_ELF32: - env = env32; - break; + rval |= execldd32(*argv, fmt1, fmt2, aflag, vflag); + continue; #endif case TYPE_UNKNOWN: default: @@ -178,15 +210,15 @@ } /* ld.so magic */ - setenv(env[ENV_OBJECTS], "yes", 1); + setenv(LD_ "TRACE_LOADED_OBJECTS", "yes", 1); if (fmt1 != NULL) - setenv(env[ENV_OBJECTS_FMT1], fmt1, 1); + setenv(LD_ "TRACE_LOADED_OBJECTS_FMT1", fmt1, 1); if (fmt2 != NULL) - setenv(env[ENV_OBJECTS_FMT2], fmt2, 1); + setenv(LD_ "TRACE_LOADED_OBJECTS_FMT2", fmt2, 1); - setenv(env[ENV_OBJECTS_PROGNAME], *argv, 1); + setenv(LD_ "TRACE_LOADED_OBJECTS_PROGNAME", *argv, 1); if (aflag) - setenv(env[ENV_OBJECTS_ALL], "1", 1); + setenv(LD_ "TRACE_LOADED_OBJECTS_ALL", "1", 1); else if (fmt1 == NULL && fmt2 == NULL) /* Default formats */ printf("%s:\n", *argv); @@ -197,14 +229,15 @@ err(1, "fork"); break; default: - if (wait(&status) <= 0) { + if (wait(&status) < 0) { warn("wait"); rval |= 1; } else if (WIFSIGNALED(status)) { fprintf(stderr, "%s: signal %d\n", *argv, WTERMSIG(status)); rval |= 1; - } else if (WIFEXITED(status) && WEXITSTATUS(status)) { + } else if (WIFEXITED(status) && + WEXITSTATUS(status) != 0) { fprintf(stderr, "%s: exit status %d\n", *argv, WEXITSTATUS(status)); rval |= 1; ==== //depot/projects/dtrace6/src/usr.sbin/mountd/mountd.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mountd.8 8.4 (Berkeley) 4/28/95 -.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.27.8.1 2006/05/10 19:45:56 keramida Exp $ +.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.27.8.2 2008/08/26 12:05:37 matteo Exp $ .\" -.Dd May 10, 2006 +.Dd October 20, 2007 .Dt MOUNTD 8 .Os .Sh NAME @@ -39,6 +39,7 @@ .Sh SYNOPSIS .Nm .Op Fl 2dlnr +.Op Fl h Ar bindip .Op Fl p Ar port .Op Ar exportsfile .Sh DESCRIPTION @@ -67,6 +68,23 @@ .Nm will not detach from the controlling terminal and will print debugging messages to stderr. +.It Fl h Ar bindip +Specify specific IP addresses to bind to for TCP and UDP requests. +This option may be specified multiple times. +If no +.Fl h +option is specified, +.Nm +will bind to +.Dv INADDR_ANY . +Note that when specifying IP addresses with +.Fl h , +.Nm +will automatically add +.Li 127.0.0.1 +and if IPv6 is enabled, +.Li ::1 +to the list. .It Fl l Cause all succeeded .Nm ==== //depot/projects/dtrace6/src/usr.sbin/mountd/mountd.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.81.2.7 2006/12/19 01:17:58 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.81.2.8 2008/08/26 12:05:37 matteo Exp $"); #include #include @@ -161,6 +161,7 @@ int check_options(struct dirlist *); int checkmask(struct sockaddr *sa); int chk_host(struct dirlist *, struct sockaddr *, int *, int *); +void create_service(struct netconfig *nconf); void del_mlist(char *hostp, char *dirp); struct dirlist *dirp_search(struct dirlist *, char *); int do_mount(struct exportlist *, struct grouplist *, int, @@ -206,6 +207,7 @@ struct mountlist *mlhead; struct grouplist *grphead; char exname[MAXPATHLEN]; +char **hosts = NULL; struct xucred def_anon = { XUCRED_VERSION, (uid_t)-2, @@ -215,9 +217,13 @@ }; int force_v2 = 0; int resvport_only = 1; +int nhosts = 0; int dir_only = 1; int dolog = 0; int got_sighup = 0; +int xcreated = 0; + +char *svcport_str = NULL; int opt_flags; static int have_v6 = 1; @@ -255,22 +261,14 @@ char **argv; { fd_set readfds; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - char *endptr; - SVCXPRT *udptransp, *tcptransp, *udp6transp, *tcp6transp; - struct netconfig *udpconf, *tcpconf, *udp6conf, *tcp6conf; + struct netconfig *nconf; + char *endptr, **hosts_bak; + void *nc_handle; pid_t otherpid; - int udpsock, tcpsock, udp6sock, tcp6sock; - int xcreated = 0, s; + in_port_t svcport; + int c, k, s; int maxrec = RPC_MAXDATASIZE; - int one = 1; - int c, r; - in_port_t svcport = 0; - udp6conf = tcp6conf = NULL; - udp6sock = tcp6sock = 0; - /* Check that another mountd isn't already running. */ pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &otherpid); if (pfh == NULL) { @@ -290,7 +288,7 @@ errx(1, "NFS server is not available or loadable"); } - while ((c = getopt(argc, argv, "2dlnp:r")) != -1) + while ((c = getopt(argc, argv, "2dh:lnp:r")) != -1) switch (c) { case '2': force_v2 = 1; @@ -313,7 +311,29 @@ if (endptr == NULL || *endptr != '\0' || svcport == 0 || svcport >= IPPORT_MAX) usage(); + svcport_str = strdup(optarg); break; + case 'h': + ++nhosts; + hosts_bak = hosts; + hosts_bak = realloc(hosts, nhosts * sizeof(char *)); + if (hosts_bak == NULL) { + if (hosts != NULL) { + for (k = 0; k < nhosts; k++) + free(hosts[k]); + free(hosts); + out_of_mem(); + } + } + hosts = hosts_bak; + hosts[nhosts - 1] = strdup(optarg); + if (hosts[nhosts - 1] == NULL) { + for (k = 0; k < (nhosts - 1); k++) + free(hosts[k]); + free(hosts); + out_of_mem(); + } + break; default: usage(); }; @@ -349,36 +369,8 @@ rpcb_unset(RPCPROG_MNT, RPCMNT_VER1, NULL); rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL); - udpsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - tcpsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - udpconf = getnetconfigent("udp"); - tcpconf = getnetconfigent("tcp"); - rpc_control(RPC_SVC_CONNMAXREC_SET, &maxrec); - if (!have_v6) - goto skip_v6; - udp6sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); - tcp6sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); - /* - * We're doing host-based access checks here, so don't allow - * v4-in-v6 to confuse things. The kernel will disable it - * by default on NFS sockets too. - */ - if (udp6sock != -1 && setsockopt(udp6sock, IPPROTO_IPV6, - IPV6_V6ONLY, &one, sizeof one) < 0) { - syslog(LOG_ERR, "can't disable v4-in-v6 on UDP socket"); - exit(1); - } - if (tcp6sock != -1 && setsockopt(tcp6sock, IPPROTO_IPV6, - IPV6_V6ONLY, &one, sizeof one) < 0) { - syslog(LOG_ERR, "can't disable v4-in-v6 on TCP socket"); - exit(1); - } - udp6conf = getnetconfigent("udp6"); - tcp6conf = getnetconfigent("tcp6"); - -skip_v6: if (!resvport_only) { if (sysctlbyname("vfs.nfsrv.nfs_privport", NULL, NULL, &resvport_only, sizeof(resvport_only)) != 0 && @@ -387,129 +379,60 @@ exit(1); } } - if (svcport != 0) { - bzero(&sin, sizeof(struct sockaddr_in)); - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_family = AF_INET; - sin.sin_port = htons(svcport); - bzero(&sin6, sizeof(struct sockaddr_in6)); - sin6.sin6_len = sizeof(struct sockaddr_in6); - sin6.sin6_family = AF_INET6; - sin6.sin6_port = htons(svcport); - } - if (udpsock != -1 && udpconf != NULL) { - if (svcport != 0) { - r = bindresvport(udpsock, &sin); - if (r != 0) { - syslog(LOG_ERR, "bindresvport: %m"); - exit(1); + /* + * If no hosts were specified, add a wildcard entry to bind to + * INADDR_ANY. Otherwise make sure 127.0.0.1 and ::1 are added to the + * list. + */ + if (nhosts == 0) { + hosts = malloc(sizeof(char**)); + if (hosts == NULL) + out_of_mem(); + hosts[0] = "*"; + nhosts = 1; + } else { + hosts_bak = hosts; + if (have_v6) { + hosts_bak = realloc(hosts, (nhosts + 2) * + sizeof(char *)); + if (hosts_bak == NULL) { + for (k = 0; k < nhosts; k++) + free(hosts[k]); + free(hosts); + out_of_mem(); + } else + hosts = hosts_bak; + nhosts += 2; + hosts[nhosts - 2] = "::1"; + } else { + hosts_bak = realloc(hosts, (nhosts + 1) * sizeof(char *)); + if (hosts_bak == NULL) { + for (k = 0; k < nhosts; k++) + free(hosts[k]); + free(hosts); + out_of_mem(); + } else { + nhosts += 1; + hosts = hosts_bak; } - } else - (void)bindresvport(udpsock, NULL); - udptransp = svc_dg_create(udpsock, 0, 0); - if (udptransp != NULL) { - if (!svc_reg(udptransp, RPCPROG_MNT, RPCMNT_VER1, - mntsrv, udpconf)) - syslog(LOG_WARNING, "can't register UDP RPCMNT_VER1 service"); - else - xcreated++; - if (!force_v2) { - if (!svc_reg(udptransp, RPCPROG_MNT, RPCMNT_VER3, - mntsrv, udpconf)) - syslog(LOG_WARNING, "can't register UDP RPCMNT_VER3 service"); - else - xcreated++; - } - } else - syslog(LOG_WARNING, "can't create UDP services"); + } + hosts[nhosts - 1] = "127.0.0.1"; } - if (tcpsock != -1 && tcpconf != NULL) { - if (svcport != 0) { - r = bindresvport(tcpsock, &sin); - if (r != 0) { - syslog(LOG_ERR, "bindresvport: %m"); - exit(1); - } - } else - (void)bindresvport(tcpsock, NULL); - listen(tcpsock, SOMAXCONN); - tcptransp = svc_vc_create(tcpsock, RPC_MAXDATASIZE, RPC_MAXDATASIZE); - if (tcptransp != NULL) { - if (!svc_reg(tcptransp, RPCPROG_MNT, RPCMNT_VER1, - mntsrv, tcpconf)) - syslog(LOG_WARNING, "can't register TCP RPCMNT_VER1 service"); - else - xcreated++; - if (!force_v2) { - if (!svc_reg(tcptransp, RPCPROG_MNT, RPCMNT_VER3, - mntsrv, tcpconf)) - syslog(LOG_WARNING, "can't register TCP RPCMNT_VER3 service"); - else - xcreated++; - } - } else - syslog(LOG_WARNING, "can't create TCP service"); + nc_handle = setnetconfig(); + while ((nconf = getnetconfig(nc_handle))) { + if (nconf->nc_flag & NC_VISIBLE) { + if (have_v6 == 0 && strcmp(nconf->nc_protofmly, + "inet6") == 0) { + /* DO NOTHING */ + } else + create_service(nconf); + } } - if (have_v6 && udp6sock != -1 && udp6conf != NULL) { - if (svcport != 0) { - r = bindresvport_sa(udp6sock, - (struct sockaddr *)&sin6); - if (r != 0) { - syslog(LOG_ERR, "bindresvport_sa: %m"); - exit(1); - } - } else - (void)bindresvport_sa(udp6sock, NULL); - udp6transp = svc_dg_create(udp6sock, 0, 0); - if (udp6transp != NULL) { - if (!svc_reg(udp6transp, RPCPROG_MNT, RPCMNT_VER1, - mntsrv, udp6conf)) - syslog(LOG_WARNING, "can't register UDP6 RPCMNT_VER1 service"); - else - xcreated++; - if (!force_v2) { - if (!svc_reg(udp6transp, RPCPROG_MNT, RPCMNT_VER3, - mntsrv, udp6conf)) - syslog(LOG_WARNING, "can't register UDP6 RPCMNT_VER3 service"); - else - xcreated++; - } - } else - syslog(LOG_WARNING, "can't create UDP6 service"); + endnetconfig(nc_handle); - } - if (have_v6 && tcp6sock != -1 && tcp6conf != NULL) { - if (svcport != 0) { - r = bindresvport_sa(tcp6sock, - (struct sockaddr *)&sin6); - if (r != 0) { - syslog(LOG_ERR, "bindresvport_sa: %m"); - exit(1); - } - } else - (void)bindresvport_sa(tcp6sock, NULL); - listen(tcp6sock, SOMAXCONN); - tcp6transp = svc_vc_create(tcp6sock, RPC_MAXDATASIZE, RPC_MAXDATASIZE); - if (tcp6transp != NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 23:36:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 020781065684; Tue, 26 Aug 2008 23:36:30 +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 A21D71065678 for ; Tue, 26 Aug 2008 23:36:29 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 779EB8FC18 for ; Tue, 26 Aug 2008 23:36:29 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QNaTih036987 for ; Tue, 26 Aug 2008 23:36:29 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QNaSKV036984 for perforce@freebsd.org; Tue, 26 Aug 2008 23:36:28 GMT (envelope-from wsalamon@computer.org) Date: Tue, 26 Aug 2008 23:36:28 GMT Message-Id: <200808262336.m7QNaSKV036984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 148562 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, 26 Aug 2008 23:36:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=148562 Change 148562 by wsalamon@vh2 on 2008/08/26 23:36:13 For the MAC->AUDIT integration: Remove the do/while statements and place the declaration of variables and code that is conditionally compiled in the conventional #ifdef directives. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#11 edit .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#11 (text) ==== @@ -207,6 +207,9 @@ audit_record_dtor(void *mem, int size, void *arg) { struct kaudit_record *ar; +#ifdef MAC + struct mac_audit_record *head, *next; +#endif KASSERT(sizeof(*ar) == size, ("audit_record_dtor: wrong size")); @@ -226,19 +229,14 @@ #ifdef MAC /* Free the audit data from the MAC policies. */ - do { - struct mac_audit_record *head, *next; - - head = LIST_FIRST(ar->k_ar.ar_mac_records); - while (head != NULL) { - next = LIST_NEXT(head, records); - free(head->data, M_TEMP); - free(head, M_AUDITMAC); - head = next; - } - - free(ar->k_ar.ar_mac_records, M_AUDITMAC); - } while (0); + head = LIST_FIRST(ar->k_ar.ar_mac_records); + while (head != NULL) { + next = LIST_NEXT(head, records); + free(head->data, M_TEMP); + free(head, M_AUDITMAC); + head = next; + } + free(ar->k_ar.ar_mac_records, M_AUDITMAC); #endif } @@ -475,6 +473,9 @@ au_class_t class; au_event_t event; au_id_t auid; +#ifdef MAC + int ret; +#endif KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL")); @@ -508,14 +509,11 @@ * the thread for later use. */ #ifdef MAC -do { - int ret; ret = mac_audit_check_preselect(td->td_ucred, event); if (ret == MAC_AUDIT_YES) { td->td_ar = audit_new(event, td); td->td_ar->k_ar.ar_forced_by_mac = 1; - } - else if (ret == MAC_AUDIT_NO) { + } else if (ret == MAC_AUDIT_NO) { td->td_ar = NULL; } else { /* MAC_AUDIT_DEFAULT */ @@ -546,7 +544,6 @@ td->td_ar = NULL; #ifdef MAC } -} while (0); #endif } @@ -559,7 +556,11 @@ audit_syscall_exit(unsigned int code, int error, struct thread *td) { int retval; +#ifdef MAC + int ret; +#endif + /* * Commit the audit record as desired; once we pass the record into * audit_commit(), the memory is owned by the audit subsystem. The @@ -573,9 +574,6 @@ retval = td->td_retval[0]; #ifdef MAC -do { - int ret; - if (td->td_ar == NULL) /* syscall wasn't audited due to preselect */ return; @@ -590,7 +588,6 @@ td->td_ar = NULL; return; } -} while (0); #endif audit_commit(td->td_ar, error, retval); td->td_ar = NULL; ==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm.c#5 (text) ==== @@ -378,6 +378,9 @@ au_tid_t tid; struct audit_record *ar; int ctr; +#ifdef MAC + struct mac_audit_record *mar; +#endif KASSERT(kar != NULL, ("kaudit_to_bsm: kar == NULL")); @@ -1430,33 +1433,29 @@ } #ifdef MAC - do { - /* Convert the audit data from the MAC policies */ - struct mac_audit_record *mar; - - LIST_FOREACH(mar, ar->ar_mac_records, records) { - switch (mar->type) { - case MAC_AUDIT_DATA_TYPE: - tok = au_to_data(AUP_BINARY, AUR_BYTE, - mar->length, mar->data); - kau_write(rec, tok); - break; - case MAC_AUDIT_TEXT_TYPE: - tok = au_to_text(mar->data); - kau_write(rec, tok); - break; - default: - /* - * XXX: we can either continue, - * skipping this particular entry, - * or we can pre-verify the list and - * abort before writing any records - */ - printf("kaudit_to_bsm(): BSM conversion requested for unknown mac_audit data type %d\n", - mar->type); - } + /* Convert the audit data from the MAC policies */ + LIST_FOREACH(mar, ar->ar_mac_records, records) { + switch (mar->type) { + case MAC_AUDIT_DATA_TYPE: + tok = au_to_data(AUP_BINARY, AUR_BYTE, + mar->length, mar->data); + kau_write(rec, tok); + break; + case MAC_AUDIT_TEXT_TYPE: + tok = au_to_text(mar->data); + kau_write(rec, tok); + break; + default: + /* + * XXX: we can either continue, + * skipping this particular entry, + * or we can pre-verify the list and + * abort before writing any records + */ + printf("kaudit_to_bsm(): BSM conversion requested for unknown mac_audit data type %d\n", + mar->type); } - } while (0); + } #endif kau_write(rec, subj_tok); From owner-p4-projects@FreeBSD.ORG Tue Aug 26 23:37:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B5131065682; Tue, 26 Aug 2008 23: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 E35D2106567D for ; Tue, 26 Aug 2008 23:37:30 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F5EC8FC08 for ; Tue, 26 Aug 2008 23:37:30 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QNbUnZ037065 for ; Tue, 26 Aug 2008 23:37:30 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QNbUKb037063 for perforce@freebsd.org; Tue, 26 Aug 2008 23:37:30 GMT (envelope-from julian@freebsd.org) Date: Tue, 26 Aug 2008 23:37:30 GMT Message-Id: <200808262337.m7QNbUKb037063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 148563 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, 26 Aug 2008 23:37:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=148563 Change 148563 by julian@julian_trafmon1 on 2008/08/26 23:37:24 fix mismerge tcp_hc_purge requires the vnet to use as an argument. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#23 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#23 (text+ko) ==== @@ -226,7 +226,7 @@ */ callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE); callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz, - tcp_hc_purge, 0); + tcp_hc_purge, curvnet); } void From owner-p4-projects@FreeBSD.ORG Tue Aug 26 23:53:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6472106566C; Tue, 26 Aug 2008 23:53: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 660F5106564A for ; Tue, 26 Aug 2008 23:53: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 390F98FC13 for ; Tue, 26 Aug 2008 23:53:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QNrl4O040458 for ; Tue, 26 Aug 2008 23:53:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QNrls3040456 for perforce@freebsd.org; Tue, 26 Aug 2008 23:53:47 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 23:53:47 GMT Message-Id: <200808262353.m7QNrls3040456@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 148564 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, 26 Aug 2008 23:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=148564 Change 148564 by jb@freebsd3 on 2008/08/26 23:53:42 o O { This stuff should have been deleted ages ago. Oops. } Affected files ... .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/dtrace.c#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/README#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#4 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#3 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d.out#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.basename.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.caller.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.cleanpath.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin2.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ddi_pathname.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.dirname.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.errno.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.execname.d#2 delete .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.gid.d#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 23:57:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28B25106567F; Tue, 26 Aug 2008 23:57:52 +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 DF4791065672 for ; Tue, 26 Aug 2008 23:57:51 +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 B4E828FC1A for ; Tue, 26 Aug 2008 23:57:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QNvp0g040776 for ; Tue, 26 Aug 2008 23:57:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QNvpnh040774 for perforce@freebsd.org; Tue, 26 Aug 2008 23:57:51 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 23:57:51 GMT Message-Id: <200808262357.m7QNvpnh040774@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 148565 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, 26 Aug 2008 23:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148565 Change 148565 by jb@freebsd3 on 2008/08/26 23:57:24 o O { More dregs. } Affected files ... .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_decl.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_error.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/ctf/ctf_util.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/ctf/ctf_mod.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/ctf/ctf_subr.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/lockstat.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/profile.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#3 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/systrace.c#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cmn_err.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cpupart.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#3 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#3 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fasttrap.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#2 delete .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 27 00:00:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 876D91065682; Wed, 27 Aug 2008 00:00: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 4BAC71065678 for ; Wed, 27 Aug 2008 00:00:55 +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 0C6D28FC19 for ; Wed, 27 Aug 2008 00:00:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R00sM6041075 for ; Wed, 27 Aug 2008 00:00:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R00st7041073 for perforce@freebsd.org; Wed, 27 Aug 2008 00:00:54 GMT (envelope-from jb@freebsd.org) Date: Wed, 27 Aug 2008 00:00:54 GMT Message-Id: <200808270000.m7R00st7041073@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 148566 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, 27 Aug 2008 00:00:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=148566 Change 148566 by jb@freebsd3 on 2008/08/27 00:00:36 o O { More dregs. } Affected files ... .. //depot/projects/dtrace7/src/compat/opensolaris/include/alloca.h#3 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/dtrace.h#2 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/fcntl.h#3 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/libproc.h#2 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/stdio.h#3 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/stdlib.h#3 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/strings.h#3 delete .. //depot/projects/dtrace7/src/compat/opensolaris/include/unistd.h#3 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#3 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cpuvar_defs.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cyclic_impl.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/feature_tests.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sema.h#2 delete .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/stat.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 27 00:11:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BD2B106567E; Wed, 27 Aug 2008 00:11:07 +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 AA9391065672 for ; Wed, 27 Aug 2008 00:11:06 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DCD48FC17 for ; Wed, 27 Aug 2008 00:11:06 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R0B692043194 for ; Wed, 27 Aug 2008 00:11:06 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R0B5JQ043192 for perforce@freebsd.org; Wed, 27 Aug 2008 00:11:05 GMT (envelope-from diego@FreeBSD.org) Date: Wed, 27 Aug 2008 00:11:05 GMT Message-Id: <200808270011.m7R0B5JQ043192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148567 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, 27 Aug 2008 00:11:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=148567 Change 148567 by diego@diego_black on 2008/08/27 00:10:52 IFC Affected files ... .. //depot/projects/soc2008/diego-audit/src/sbin/ipfw/Makefile#1 branch .. //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw.8#1 branch .. //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw2.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#8 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files#10 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.i386#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/options#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm-subprocess.pl#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppc/ppc_isa.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/isa/isa_common.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/isa/isavar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/init_main.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_conf.c#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/Makefile#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/modules/drm/i915/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/rc/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_var.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_var.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/conf.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/copyright.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/file.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/kernel.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/linedisc.h#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/sys/param.h#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/proc.h#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/resource.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/syscall.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/termios.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/tty.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttycom.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydevsw.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydisc.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttyqueue.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sys/user.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/vimage.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/wait.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_comms.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/xen/xenbus/xenbus_xs.c#2 integrate Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -77,10 +77,6 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 2 -#define LAPIC_TIMER_STATHZ_DIVIDER 15 -#define LAPIC_TIMER_PROFHZ_DIVIDER 3 - /* Magic IRQ values for the timer and syscalls. */ #define IRQ_TIMER (NUM_IO_INTS + 1) #define IRQ_SYSCALL (NUM_IO_INTS + 2) @@ -389,13 +385,24 @@ lapic_timer_divisor, value); /* - * We will drive the timer at a small multiple of hz and drive - * both of the other timers with similarly small but relatively - * prime divisors. + * We want to run stathz in the neighborhood of 128hz. We would + * like profhz to run as often as possible, so we let it run on + * each clock tick. We try to honor the requested 'hz' value as + * much as possible. + * + * If 'hz' is above 1500, then we just let the lapic timer + * (and profhz) run at hz. If 'hz' is below 1500 but above + * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' + * is below 750 then we let the lapic timer run at 4 * 'hz'. */ - lapic_timer_hz = hz * LAPIC_TIMER_HZ_DIVIDER; - stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; - profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; /* ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC @@ -257,7 +257,7 @@ device random # Entropy device device ether # Ethernet support device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) +device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pci_cfgreg.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/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.15 2008/08/22 02:14:23 jhb Exp $ * */ @@ -37,6 +37,7 @@ #define CONF1_ENABLE_MSK1 0x80000001ul #define CONF1_ENABLE_RES1 0x80000000ul +int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.111 2008/08/22 02:14:23 jhb Exp $"); #include #include @@ -36,11 +36,26 @@ #include #include #include +#include +#include #include +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_PCIE, +}; + +static int pciereg_cfgread(int bus, unsigned slot, unsigned func, + unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); +static int cfgmech; +static vm_offset_t pcie_base; +static int pcie_minbus, pcie_maxbus; static struct mtx pcicfg_mtx; /* @@ -49,12 +64,42 @@ int pci_cfgregopen(void) { - static int opened = 0; + uint64_t pciebar; + uint16_t did, vid; - if (opened) + if (cfgmech != CFGMECH_NONE) return (1); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); - opened = 1; + cfgmech = CFGMECH_1; + + /* + * Grope around in the PCI config space to see if this is a + * chipset that is capable of doing memory-mapped config cycles. + * This also implies that it can do PCIe extended config cycles. + */ + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + return (1); } @@ -130,6 +175,11 @@ int data = -1; int port; + if (cfgmech == CFGMECH_PCIE) { + data = pciereg_cfgread(bus, slot, func, reg, bytes); + return (data); + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -155,6 +205,11 @@ { int port; + if (cfgmech == CFGMECH_PCIE) { + pciereg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } + mtx_lock_spin(&pcicfg_mtx); port = pci_cfgenable(bus, slot, func, reg, bytes); if (port != 0) { @@ -173,3 +228,82 @@ } mtx_unlock_spin(&pcicfg_mtx); } + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (minbus != 0) + return (0); + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", + base); + + /* XXX: We should make sure this really fits into the direct map. */ + pcie_base = (vm_offset_t)pmap_mapdev(base, (maxbus + 1) << 20); + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + return (1); +} + +#define PCIE_VADDR(base, reg, bus, slot, func) \ + ((base) + \ + ((((bus) & 0xff) << 20) | \ + (((slot) & 0x1f) << 15) | \ + (((func) & 0x7) << 12) | \ + ((reg) & 0xfff))) + +static int +pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, + unsigned bytes) +{ + volatile vm_offset_t va; + int data = -1; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return (-1); + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + data = *(volatile uint32_t *)(va); + break; + case 2: + data = *(volatile uint16_t *)(va); + break; + case 1: + data = *(volatile uint8_t *)(va); + break; + } + + return (data); +} + +static void +pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes) +{ + volatile vm_offset_t va; + + if (bus < pcie_minbus || bus > pcie_maxbus || slot >= 32 || + func > PCI_FUNCMAX || reg >= 0x1000) + return; + + va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + + switch (bytes) { + case 4: + *(volatile uint32_t *)(va) = data; + break; + case 2: + *(volatile uint16_t *)(va) = data; + break; + case 1: + *(volatile uint8_t *)(va) = data; + break; + } +} ==== //depot/projects/soc2008/diego-audit/src/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.12 2008/08/23 23:35:08 imp Exp $ */ #ifndef _ENDIAN_H_ @@ -94,7 +94,7 @@ : "+r" (v), "=r" (t1)); return (v); - } +} static __inline __uint16_t __bswap16_var(__uint16_t v) ==== //depot/projects/soc2008/diego-audit/src/sys/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.131 2008/08/11 04:54:43 weongyo Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.132 2008/08/26 13:27:48 matteo Exp $ ############################################################## ### Basic configuration options ############################ @@ -149,6 +149,7 @@ geom_eli_load="NO" # Disk encryption driver (see geli(8)) geom_gate_load="NO" # Userland disk driver (see geom_gate(4), # ggatec(8), ggated(8), ggatel(8)) +geom_journal_load="NO" # Journaled filesystem driver (see gjournal(8)) geom_label_load="NO" # File system labels (see glabel(8)) geom_md_load="NO" # Memory disk driver (vnode/swap/malloc) (see # md(4), mdconfig(8)) ==== //depot/projects/soc2008/diego-audit/src/sys/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -8,7 +8,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -28,7 +29,6 @@ #include #include -#include #include #include #include @@ -438,7 +438,7 @@ while (len) { if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 || itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) { - /* Allocate a physical page, claim the virtual area */ + /* Allocate a physical page, claim the virtual area. */ if (pa == (vm_offset_t)-1) { pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M); if (pa == (vm_offset_t)-1) @@ -448,7 +448,9 @@ panic("%s: can't claim virtual page " "(wanted %#lx, got %#lx)", __func__, va, mva); - /* The mappings may have changed, be paranoid. */ + /* + * The mappings may have changed, be paranoid. + */ continue; } /* @@ -553,6 +555,7 @@ } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); + if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max, sizeof(dtlb_slot_max)) == -1 || OF_getprop(child, "#itlb-entries", &itlb_slot_max, @@ -580,7 +583,7 @@ struct devsw **dp; /* - * Tell the Open Firmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the OFW gate. */ OF_init(openfirm); ==== //depot/projects/soc2008/diego-audit/src/sys/bsm/audit_kevents.h#7 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -558,6 +558,7 @@ #define AUE_PFIL_POLICY_FLUSHTABLE 43160 /* FreeBSD. */ #define AUE_PFIL_FLOW_BEGIN 43161 /* FreeBSD. */ #define AUE_PFIL_FLOW_END 43162 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 (text+ko) ==== @@ -382,6 +382,49 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN +#elif defined(__mips__) + +/* + * Define the appropriate "processor characteristics" + */ +#define _STACK_GROWS_DOWNWARD +#define _LONG_LONG_LTOH +#define _BIT_FIELDS_LTOH +#define _IEEE_754 +#define _CHAR_IS_SIGNED +#define _BOOL_ALIGNMENT 1 +#define _CHAR_ALIGNMENT 1 +#define _SHORT_ALIGNMENT 2 +#define _INT_ALIGNMENT 4 +#define _FLOAT_ALIGNMENT 4 +#define _FLOAT_COMPLEX_ALIGNMENT 4 +#define _LONG_ALIGNMENT 4 +#define _LONG_LONG_ALIGNMENT 4 +#define _DOUBLE_ALIGNMENT 4 +#define _DOUBLE_COMPLEX_ALIGNMENT 4 +#define _LONG_DOUBLE_ALIGNMENT 4 +#define _LONG_DOUBLE_COMPLEX_ALIGNMENT 4 +#define _POINTER_ALIGNMENT 4 +#define _MAX_ALIGNMENT 4 +#define _ALIGNMENT_REQUIRED 0 + +#define _LONG_LONG_ALIGNMENT_32 _LONG_LONG_ALIGNMENT + +/* + * Define the appropriate "implementation choices". + */ +#define _ILP32 +#if !defined(_I32LPx) && defined(_KERNEL) +#define _I32LPx +#endif +#define _SUNOS_VTOC_16 +#define _DMA_USES_PHYSADDR +#define _FIRMWARE_NEEDS_FDISK +#define _PSM_MODULES +#define _RTC_CONFIG +#define _DONT_USE_1275_GENERIC_NAMES +#define _HAVE_CPUID_INSN + #elif defined(__powerpc__) /* ==== //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.87 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.85 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define FREEBSD32_SYS_syscall 0 @@ -355,4 +355,5 @@ #define FREEBSD32_SYS_renameat 501 #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 -#define FREEBSD32_SYS_MAXSYSCALL 504 +#define FREEBSD32_SYS_posix_openpt 504 +#define FREEBSD32_SYS_MAXSYSCALL 505 ==== //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.76 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *freebsd32_syscallnames[] = { @@ -511,4 +511,5 @@ "renameat", /* 501 = renameat */ "symlinkat", /* 502 = symlinkat */ "unlinkat", /* 503 = unlinkat */ + "posix_openpt", /* 504 = posix_openpt */ }; ==== //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.86 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -542,4 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/soc2008/diego-audit/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -31,6 +31,13 @@ ; NOSTD implemented but as a lkm that can be statically ; compiled in; sysent entry will be filled with lkmsys ; so the SYSCALL_MODULE macro works +; NOARGS same as STD except do not create structure in sys/sysproto.h +; NODEF same as STD except only have the entry in the syscall table +; added. Meaning - do do not create structure or function +; prototype in sys/sysproto.h +; NOPROTO same as STD except do not create structure or +; function prototype in sys/sysproto.h. Does add a +; definition to syscall.h besides adding a sysent. ; #ifdef's, etc. may be included, and are copied to the output files. @@ -846,3 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/soc2008/diego-audit/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -39,8 +39,10 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.121 2008/08/25 04:55:29 julian Exp $"); #include #include @@ -89,7 +91,6 @@ #include #endif /* __i386__ || __amd64__ */ -#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -26,8 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); #include #include @@ -62,8 +64,6 @@ #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 27 00:59:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68F43106568F; Wed, 27 Aug 2008 00:59: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 2AC4F106566C for ; Wed, 27 Aug 2008 00:59:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1AC48FC0C for ; Wed, 27 Aug 2008 00:59:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R0x5Mx056172 for ; Wed, 27 Aug 2008 00:59:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R0wtp2056154 for perforce@freebsd.org; Wed, 27 Aug 2008 00:58:55 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 00:58:55 GMT Message-Id: <200808270058.m7R0wtp2056154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148568 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, 27 Aug 2008 00:59:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=148568 Change 148568 by sam@sam_ebb on 2008/08/27 00:58:01 MFC @ 148561 Affected files ... .. //depot/projects/vap/Makefile.inc1#15 integrate .. //depot/projects/vap/ObsoleteFiles.inc#16 integrate .. //depot/projects/vap/UPDATING#17 integrate .. //depot/projects/vap/bin/sh/miscbltin.c#3 integrate .. //depot/projects/vap/bin/stty/modes.c#3 integrate .. //depot/projects/vap/bin/stty/print.c#4 integrate .. //depot/projects/vap/bin/stty/stty.1#3 integrate .. //depot/projects/vap/contrib/ntp/COPYRIGHT#3 integrate .. //depot/projects/vap/contrib/ntp/ChangeLog#3 integrate .. //depot/projects/vap/contrib/ntp/ChangeLog-4.1.0#3 delete .. //depot/projects/vap/contrib/ntp/CommitLog#1 branch .. //depot/projects/vap/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/vap/contrib/ntp/FREEBSD-Xlist#3 delete .. //depot/projects/vap/contrib/ntp/FREEBSD-upgrade#3 delete .. //depot/projects/vap/contrib/ntp/INSTALL#3 integrate .. //depot/projects/vap/contrib/ntp/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/NEWS#3 integrate .. //depot/projects/vap/contrib/ntp/README#3 integrate .. //depot/projects/vap/contrib/ntp/README.bk#3 integrate .. //depot/projects/vap/contrib/ntp/README.patches#3 integrate .. //depot/projects/vap/contrib/ntp/README.refclocks#3 integrate .. //depot/projects/vap/contrib/ntp/README.versions#3 integrate .. //depot/projects/vap/contrib/ntp/TODO#3 integrate .. //depot/projects/vap/contrib/ntp/WHERE-TO-START#3 integrate .. //depot/projects/vap/contrib/ntp/acinclude.m4#3 delete .. //depot/projects/vap/contrib/ntp/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/ntp/adjtimed/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/adjtimed/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/configure#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/depcomp#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/install-sh#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/missing#3 integrate .. //depot/projects/vap/contrib/ntp/arlib/mkinstalldirs#3 delete .. //depot/projects/vap/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/vap/contrib/ntp/bootstrap#1 branch .. //depot/projects/vap/contrib/ntp/build#3 integrate .. //depot/projects/vap/contrib/ntp/clockstuff/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/clockstuff/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/clockstuff/clktest.c#3 integrate .. //depot/projects/vap/contrib/ntp/clockstuff/propdelay.c#3 integrate .. //depot/projects/vap/contrib/ntp/compile#3 integrate .. //depot/projects/vap/contrib/ntp/config.guess#3 integrate .. //depot/projects/vap/contrib/ntp/config.h.in#3 integrate .. //depot/projects/vap/contrib/ntp/config.sub#3 integrate .. //depot/projects/vap/contrib/ntp/configure#3 integrate .. //depot/projects/vap/contrib/ntp/configure.ac#1 branch .. //depot/projects/vap/contrib/ntp/configure.in#3 delete .. //depot/projects/vap/contrib/ntp/depcomp#3 integrate .. //depot/projects/vap/contrib/ntp/flock-build#3 integrate .. //depot/projects/vap/contrib/ntp/html/accopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/assoc.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/audio.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/authopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/build.html#3 delete .. //depot/projects/vap/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/vap/contrib/ntp/html/clockopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/config.html#3 delete .. //depot/projects/vap/contrib/ntp/html/confopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/copyright.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/debug.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver1.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver10.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver11.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver12.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver16.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver18.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver19.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver2.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver20.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver22.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver23.html#3 delete .. //depot/projects/vap/contrib/ntp/html/drivers/driver24.html#3 delete .. //depot/projects/vap/contrib/ntp/html/drivers/driver26.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver27.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver28.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver29.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver3.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver30.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/vap/contrib/ntp/html/drivers/driver32.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver33.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver34.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver35.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver36.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver37.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver38.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver39.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver4.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver40.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver42.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver43.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver44.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver5.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver6.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver7.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver8.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/driver9.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/oncore-shmem.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/vap/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/vap/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/vap/contrib/ntp/html/extern.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/vap/contrib/ntp/html/groups.html#1 branch .. //depot/projects/vap/contrib/ntp/html/hints.html#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/a-ux#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/aix#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/bsdi#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/changes#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/decosf1#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/decosf2#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/freebsd#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/hpux#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/linux#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/mpeix#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/netbsd#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/notes-xntp-v3#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/parse#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/refclocks#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/rs6000#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/sco.html#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/sgi#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/solaris-dosynctodr.html#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/solaris.html#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/solaris.xtra.4023118#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/solaris.xtra.4095849#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/solaris.xtra.S99ntpd#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/solaris.xtra.patchfreq#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/sun4#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/svr4-dell#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/svr4_package#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/todo#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/vxworks.html#3 delete .. //depot/projects/vap/contrib/ntp/html/hints/winnt.html#3 delete .. //depot/projects/vap/contrib/ntp/html/howto.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/index.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/kern.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/keygen.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ldisc.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/manyopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/measure.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/miscopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/monopt.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/msyslog.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/mx4200data.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/notes.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/vap/contrib/ntp/html/ntpd.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntpdate.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntpdc.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntpdsim.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/vap/contrib/ntp/html/ntpq.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntptime.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/ntptrace.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/parsedata.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/parsenew.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/patches.html#3 delete .. //depot/projects/vap/contrib/ntp/html/porting.html#3 delete .. //depot/projects/vap/contrib/ntp/html/pps.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/prefer.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/quick.html#3 delete .. //depot/projects/vap/contrib/ntp/html/rdebug.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/refclock.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/release.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/scripts/links11.txt#3 integrate .. //depot/projects/vap/contrib/ntp/html/scripts/links7.txt#3 integrate .. //depot/projects/vap/contrib/ntp/html/scripts/links8.txt#3 integrate .. //depot/projects/vap/contrib/ntp/html/scripts/links9.txt#3 integrate .. //depot/projects/vap/contrib/ntp/html/sntp.html#3 integrate .. //depot/projects/vap/contrib/ntp/html/tickadj.html#3 integrate .. //depot/projects/vap/contrib/ntp/include/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/include/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/include/adjtime.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ascii.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/vap/contrib/ntp/include/binio.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/vap/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/vap/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/vap/contrib/ntp/include/ieee754io.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/vap/contrib/ntp/include/isc/interfaceiter.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/ipv6.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/msgs.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/net.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/netaddr.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/vap/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/vap/contrib/ntp/include/isc/result.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/isc/sockaddr.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/l_stdlib.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/mbg_gps166.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_config.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_control.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_crypto.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/vap/contrib/ntp/include/ntp_filegen.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_fp.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_machine.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/vap/contrib/ntp/include/ntp_refclock.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_request.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_rfc2553.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_tty.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntp_types.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/parse.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/parse_conf.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/recvbuff.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/vap/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/vap/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/vap/contrib/ntp/include/trimble.h#3 integrate .. //depot/projects/vap/contrib/ntp/include/version.def#1 branch .. //depot/projects/vap/contrib/ntp/install-sh#3 integrate .. //depot/projects/vap/contrib/ntp/kernel/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/kernel/chuinit.c#3 integrate .. //depot/projects/vap/contrib/ntp/kernel/clkinit.c#3 integrate .. //depot/projects/vap/contrib/ntp/kernel/sys/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/kernel/sys/parsestreams.h#3 integrate .. //depot/projects/vap/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/vap/contrib/ntp/libisc/ifiter_ioctl.c#3 integrate .. //depot/projects/vap/contrib/ntp/libisc/ifiter_sysctl.c#3 integrate .. //depot/projects/vap/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/vap/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/vap/contrib/ntp/libisc/interfaceiter.c#3 integrate .. //depot/projects/vap/contrib/ntp/libisc/net.c#3 integrate .. //depot/projects/vap/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/vap/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/vap/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/vap/contrib/ntp/libntp/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/a_md5encrypt.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/adjtime.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/audio.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/binio.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/buftvtots.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/caljulian.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/calleapwhen.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/clocktypes.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/decodenetnum.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/dolfptoa.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/gpstolfp.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/humandate.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/icom.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/ieee754io.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/iosignal.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/lib_strbuf.h#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/log.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/log.h#3 delete .. //depot/projects/vap/contrib/ntp/libntp/machines.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/mfp_mul.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/mktime.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/msyslog.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/vap/contrib/ntp/libntp/ntp_rfc2553.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/numtohost.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/prettydate.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/random.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/ranny.c#3 delete .. //depot/projects/vap/contrib/ntp/libntp/recvbuff.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/socktoa.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/socktohost.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/statestr.c#3 integrate .. //depot/projects/vap/contrib/ntp/libntp/systime.c#3 integrate .. //depot/projects/vap/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/vap/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/vap/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/vap/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/vap/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/vap/contrib/ntp/libopts/README#1 branch .. //depot/projects/vap/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/vap/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/vap/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/vap/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/vap/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/vap/contrib/ntp/libparse/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/README#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/vap/contrib/ntp/libparse/clk_computime.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_dcf7000.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_hopf6021.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_meinberg.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_rcc8000.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_schmid.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_trimtaip.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_trimtsip.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_varitext.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/clk_wharton.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/data_mbg.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/vap/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/vap/contrib/ntp/libparse/info_trimble.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/vap/contrib/ntp/libparse/parse.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/parse_conf.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/parsesolaris.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/parsestreams.c#3 integrate .. //depot/projects/vap/contrib/ntp/libparse/trim_info.c#3 integrate .. //depot/projects/vap/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/vap/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/vap/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/vap/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/vap/contrib/ntp/missing#3 integrate .. //depot/projects/vap/contrib/ntp/mkinstalldirs#3 delete .. //depot/projects/vap/contrib/ntp/ntpd/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/cmd_args.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/map_vme.c#3 delete .. //depot/projects/vap/contrib/ntp/ntpd/ntp_config.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_control.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_filegen.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_intres.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_io.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_loopfilter.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_monitor.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_peer.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_proto.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_refclock.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_request.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_restrict.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_timer.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntp_util.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpd.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/ntpsim.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/vap/contrib/ntp/ntpd/refclock_acts.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_arbiter.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_arc.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_atom.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_bancomm.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_chu.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_conf.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_datum.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_fg.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_gpsvme.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_heath.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_hopfpci.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_hopfser.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_hpgps.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_irig.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_jjy.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_jupiter.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_leitch.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_local.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_msfees.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_mx4200.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_neoclock4x.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_nmea.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_oncore.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_palisade.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_palisade.h#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_parse.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_pst.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_ptbacts.c#3 delete .. //depot/projects/vap/contrib/ntp/ntpd/refclock_ripencc.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_shm.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_ulink.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_usno.c#3 delete .. //depot/projects/vap/contrib/ntp/ntpd/refclock_wwv.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpd/refclock_wwvb.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdate/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdate/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdate/ntpdate.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdate/ntptimeset.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/layout.std#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/nl.pl#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/nl.pl.in#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc.h#3 integrate .. //depot/projects/vap/contrib/ntp/ntpdc/ntpdc_ops.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpq/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/ntpq/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/vap/contrib/ntp/ntpq/ntpq.c#3 integrate .. //depot/projects/vap/contrib/ntp/ntpq/ntpq.h#3 integrate .. //depot/projects/vap/contrib/ntp/ntpq/ntpq_ops.c#3 delete .. //depot/projects/vap/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/vap/contrib/ntp/parseutil/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/parseutil/dcfd.c#3 integrate .. //depot/projects/vap/contrib/ntp/parseutil/testdcf.c#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/vap/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/vap/contrib/ntp/scripts/genver#1 branch .. //depot/projects/vap/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/vap/contrib/ntp/scripts/mkver.in#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/monitoring/lr.pl#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/monitoring/ntploopwatch#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/ntpsweep.in#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/ntptrace.in#3 integrate .. //depot/projects/vap/contrib/ntp/scripts/support/README#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/bin/monl#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/bin/mvstats#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/hp300.hp300#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/hp700.hp700#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/hp800.hp800#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/ntp.conf#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun3.sun3#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4c#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4m#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/conf/tickconf#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/etc/cron#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/etc/crontab#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/etc/install#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/etc/rc#3 delete .. //depot/projects/vap/contrib/ntp/scripts/support/etc/setup#3 delete .. //depot/projects/vap/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/vap/contrib/ntp/sntp/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/README#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/aclocal.m4#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/vap/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/vap/contrib/ntp/sntp/compile#1 branch .. //depot/projects/vap/contrib/ntp/sntp/config.guess#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/vap/contrib/ntp/sntp/config.sub#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/configure#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/configure.ac#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/depcomp#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/header.h#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/install-sh#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/internet.c#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/internet.h#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/vap/contrib/ntp/sntp/main.c#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/missing#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/mkinstalldirs#3 delete .. //depot/projects/vap/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/vap/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/vap/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/vap/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/vap/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/vap/contrib/ntp/sntp/socket.c#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/timing.c#3 integrate .. //depot/projects/vap/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/vap/contrib/ntp/util/Makefile.am#3 integrate .. //depot/projects/vap/contrib/ntp/util/Makefile.in#3 integrate .. //depot/projects/vap/contrib/ntp/util/ansi2knr.c#3 integrate .. //depot/projects/vap/contrib/ntp/util/hist.c#3 integrate .. //depot/projects/vap/contrib/ntp/util/jitter.c#3 integrate .. //depot/projects/vap/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/vap/contrib/ntp/util/ntp-keygen.c#3 integrate .. //depot/projects/vap/contrib/ntp/util/ntptime.c#3 integrate .. //depot/projects/vap/contrib/ntp/util/tg.c#1 branch .. //depot/projects/vap/contrib/ntp/version#3 integrate .. //depot/projects/vap/contrib/ntp/version.m4#1 branch .. //depot/projects/vap/crypto/openssh/readconf.c#4 integrate .. //depot/projects/vap/etc/defaults/devfs.rules#3 integrate .. //depot/projects/vap/etc/defaults/rc.conf#19 integrate .. //depot/projects/vap/etc/etc.amd64/ttys#4 integrate .. //depot/projects/vap/etc/etc.arm/ttys#3 integrate .. //depot/projects/vap/etc/etc.i386/ttys#4 integrate .. //depot/projects/vap/etc/etc.ia64/ttys#3 integrate .. //depot/projects/vap/etc/etc.mips/ttys#2 integrate .. //depot/projects/vap/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/vap/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/vap/etc/login.conf#3 integrate .. //depot/projects/vap/etc/rc.d/Makefile#7 integrate .. //depot/projects/vap/etc/rc.d/kernel#4 delete .. //depot/projects/vap/lib/csu/amd64/Makefile#3 integrate .. //depot/projects/vap/lib/libarchive/Makefile#9 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#11 integrate .. //depot/projects/vap/lib/libc/stdlib/Makefile.inc#3 integrate .. //depot/projects/vap/lib/libc/stdlib/Symbol.map#4 integrate .. //depot/projects/vap/lib/libc/stdlib/grantpt.3#3 delete .. //depot/projects/vap/lib/libc/stdlib/grantpt.c#6 delete .. //depot/projects/vap/lib/libc/stdlib/ptsname.3#1 branch .. //depot/projects/vap/lib/libc/stdlib/ptsname.c#1 branch .. //depot/projects/vap/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/vap/lib/libc/sys/execve.2#4 integrate .. //depot/projects/vap/lib/libc/sys/getrlimit.2#3 integrate .. //depot/projects/vap/lib/libc/sys/posix_openpt.2#1 branch .. //depot/projects/vap/lib/libc/sys/wait.2#3 integrate .. //depot/projects/vap/lib/libkvm/Makefile#3 integrate .. //depot/projects/vap/lib/libkvm/kvm.h#3 integrate .. //depot/projects/vap/lib/libkvm/kvm_cptime.c#1 branch .. //depot/projects/vap/lib/libkvm/kvm_getcptime.3#1 branch .. //depot/projects/vap/lib/libkvm/kvm_getpcpu.3#1 branch .. //depot/projects/vap/lib/libkvm/kvm_pcpu.c#1 branch .. //depot/projects/vap/lib/libutil/login.conf.5#4 integrate .. //depot/projects/vap/lib/libutil/login_class.c#4 integrate .. //depot/projects/vap/libexec/Makefile#3 integrate .. //depot/projects/vap/libexec/pt_chown/Makefile#3 delete .. //depot/projects/vap/libexec/pt_chown/pt_chown.c#3 delete .. //depot/projects/vap/release/amd64/boot_crunch.conf#5 integrate .. //depot/projects/vap/release/i386/boot_crunch.conf#5 integrate .. //depot/projects/vap/release/ia64/boot_crunch.conf#6 integrate .. //depot/projects/vap/release/pc98/boot_crunch.conf#5 integrate .. //depot/projects/vap/release/powerpc/boot_crunch.conf#5 integrate .. //depot/projects/vap/release/sparc64/boot_crunch.conf#5 integrate .. //depot/projects/vap/release/sun4v/boot_crunch.conf#5 integrate .. //depot/projects/vap/sbin/fsck_ffs/main.c#7 integrate .. //depot/projects/vap/sbin/ping6/ping6.8#4 integrate .. //depot/projects/vap/sbin/ping6/ping6.c#5 integrate .. //depot/projects/vap/share/man/man4/Makefile#19 integrate .. //depot/projects/vap/share/man/man4/acpi_aiboost.4#1 branch .. //depot/projects/vap/share/man/man4/acpi_asus.4#1 branch .. //depot/projects/vap/share/man/man4/acpi_fujitsu.4#1 branch .. //depot/projects/vap/share/man/man4/acpi_ibm.4#1 branch .. //depot/projects/vap/share/man/man4/acpi_panasonic.4#1 branch .. //depot/projects/vap/share/man/man4/acpi_sony.4#1 branch .. //depot/projects/vap/share/man/man4/acpi_toshiba.4#1 branch .. //depot/projects/vap/share/man/man4/ata.4#3 integrate .. //depot/projects/vap/share/man/man4/ddb.4#11 integrate .. //depot/projects/vap/share/man/man4/ichwd.4#3 integrate .. //depot/projects/vap/share/man/man4/io.4#1 branch .. //depot/projects/vap/share/man/man4/linux.4#1 branch .. //depot/projects/vap/share/man/man4/man4.i386/Makefile#5 integrate .. //depot/projects/vap/share/man/man4/man4.i386/acpi_aiboost.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/acpi_asus.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/acpi_fujitsu.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/acpi_ibm.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/acpi_panasonic.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/acpi_sony.4#4 delete .. //depot/projects/vap/share/man/man4/man4.i386/acpi_toshiba.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/dpms.4#1 branch .. //depot/projects/vap/share/man/man4/man4.i386/ichwd.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/io.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/linux.4#4 delete .. //depot/projects/vap/share/man/man4/man4.i386/ndis.4#3 delete .. //depot/projects/vap/share/man/man4/ndis.4#1 branch .. //depot/projects/vap/share/man/man4/pts.4#1 branch .. //depot/projects/vap/share/man/man4/pty.4#3 integrate .. //depot/projects/vap/share/man/man4/rum.4#5 integrate .. //depot/projects/vap/share/man/man4/tcp.4#3 integrate .. //depot/projects/vap/share/man/man4/termios.4#5 integrate .. //depot/projects/vap/share/man/man4/uipaq.4#1 branch .. //depot/projects/vap/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/vap/share/man/man9/device_get_children.9#3 integrate .. //depot/projects/vap/share/misc/committers-src.dot#10 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#6 integrate .. //depot/projects/vap/sys/amd64/amd64/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/exception.S#8 integrate .. //depot/projects/vap/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/vap/sys/amd64/include/pci_cfgreg.h#5 integrate .. //depot/projects/vap/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/vap/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/vap/sys/arm/arm/dump_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/at91/at91.c#5 integrate .. //depot/projects/vap/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/vap/sys/arm/include/endian.h#5 integrate .. //depot/projects/vap/sys/arm/include/pcpu.h#5 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/vap/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/vap/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_all.c#7 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_stat.c#7 integrate .. //depot/projects/vap/sys/conf/NOTES#26 integrate .. //depot/projects/vap/sys/conf/files#49 integrate .. //depot/projects/vap/sys/conf/files.i386#17 integrate .. //depot/projects/vap/sys/conf/files.powerpc#14 integrate .. //depot/projects/vap/sys/conf/files.sparc64#9 integrate .. //depot/projects/vap/sys/conf/options#26 integrate .. //depot/projects/vap/sys/conf/options.sparc64#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#5 integrate .. //depot/projects/vap/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/vap/sys/ddb/db_output.c#6 integrate .. //depot/projects/vap/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#10 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/vap/sys/dev/agp/agp.c#3 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/vap/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/vap/sys/dev/dcons/dcons.h#5 integrate .. //depot/projects/vap/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/vap/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm-subprocess.pl#3 integrate .. //depot/projects/vap/sys/dev/drm/drm.h#6 integrate .. //depot/projects/vap/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_auth.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_context.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_dma.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_drawable.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_fops.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/vap/sys/dev/drm/drm_ioctl.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_memory.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/vap/sys/dev/drm/drm_sarea.h#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_vm.c#5 integrate .. //depot/projects/vap/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_drm.h#5 integrate .. //depot/projects/vap/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/vap/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/vap/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/vap/sys/dev/drm/i915_mem.c#5 integrate .. //depot/projects/vap/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/vap/sys/dev/drm/mach64_dma.c#5 integrate .. //depot/projects/vap/sys/dev/drm/mach64_drm.h#5 integrate .. //depot/projects/vap/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/vap/sys/dev/drm/mach64_drv.h#5 integrate .. //depot/projects/vap/sys/dev/drm/mach64_irq.c#5 integrate .. //depot/projects/vap/sys/dev/drm/mach64_state.c#5 integrate .. //depot/projects/vap/sys/dev/drm/mga_dma.c#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_drm.h#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_drv.h#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_irq.c#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_state.c#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_warp.c#6 integrate .. //depot/projects/vap/sys/dev/drm/r128_cce.c#6 integrate .. //depot/projects/vap/sys/dev/drm/r128_drm.h#6 integrate .. //depot/projects/vap/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/r128_drv.h#6 integrate .. //depot/projects/vap/sys/dev/drm/r128_irq.c#6 integrate .. //depot/projects/vap/sys/dev/drm/r128_state.c#6 integrate .. //depot/projects/vap/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/vap/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/vap/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/vap/sys/dev/drm/radeon_drm.h#6 integrate .. //depot/projects/vap/sys/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/vap/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/vap/sys/dev/drm/radeon_mem.c#6 integrate .. //depot/projects/vap/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/vap/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/vap/sys/dev/drm/savage_bci.c#5 integrate .. //depot/projects/vap/sys/dev/drm/savage_drm.h#5 integrate .. //depot/projects/vap/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/vap/sys/dev/drm/savage_drv.h#5 integrate .. //depot/projects/vap/sys/dev/drm/savage_state.c#5 integrate .. //depot/projects/vap/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/sis_drv.h#6 integrate .. //depot/projects/vap/sys/dev/drm/sis_mm.c#6 integrate .. //depot/projects/vap/sys/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/vap/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/vap/sys/dev/ex/if_ex_isa.c#6 integrate .. //depot/projects/vap/sys/dev/ex/if_exvar.h#6 integrate .. //depot/projects/vap/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#10 integrate .. //depot/projects/vap/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/vap/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/vap/sys/dev/iicbus/iiconf.c#6 integrate .. //depot/projects/vap/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/vap/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/vap/sys/dev/mii/mii.c#6 integrate .. //depot/projects/vap/sys/dev/mii/mlphy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/tlphy.c#5 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/vap/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/vap/sys/dev/ofw/ofw_console.c#8 integrate .. //depot/projects/vap/sys/dev/pccard/pccard_cis_quirks.c#6 integrate .. //depot/projects/vap/sys/dev/pci/pci.c#10 integrate .. //depot/projects/vap/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/vap/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/vap/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/vap/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/vap/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/vap/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/vap/sys/dev/puc/pucdata.c#9 integrate .. //depot/projects/vap/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/vap/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/vap/sys/dev/sound/pci/csa.c#6 integrate .. //depot/projects/vap/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/vap/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/vap/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/vap/sys/dev/syscons/schistory.c#5 integrate .. //depot/projects/vap/sys/dev/syscons/scmouse.c#5 integrate .. //depot/projects/vap/sys/dev/syscons/scterm-sc.c#5 integrate .. //depot/projects/vap/sys/dev/syscons/scvesactl.c#5 integrate .. //depot/projects/vap/sys/dev/syscons/scvidctl.c#6 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/vap/sys/dev/syscons/sysmouse.c#7 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/vap/sys/dev/uart/uart.h#7 integrate .. //depot/projects/vap/sys/dev/uart/uart_bus_isa.c#3 integrate .. //depot/projects/vap/sys/dev/uart/uart_core.c#8 integrate .. //depot/projects/vap/sys/dev/uart/uart_cpu_pc98.c#5 integrate .. //depot/projects/vap/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/vap/sys/dev/usb/ehci.c#13 integrate .. //depot/projects/vap/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/vap/sys/dev/usb/ehcivar.h#7 integrate .. //depot/projects/vap/sys/dev/usb/hid.c#6 integrate .. //depot/projects/vap/sys/dev/usb/if_rum.c#29 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/vap/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/vap/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/vap/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/vap/sys/dev/usb/uipaq.c#7 integrate .. //depot/projects/vap/sys/dev/usb/umass.c#10 integrate .. //depot/projects/vap/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/vap/sys/dev/usb/ums.c#8 integrate .. //depot/projects/vap/sys/dev/usb/usb.h#5 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/vap/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/vap/sys/dev/vx/if_vx_eisa.c#5 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#30 integrate .. //depot/projects/vap/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/vap/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#17 integrate .. //depot/projects/vap/sys/i386/conf/XBOX#4 integrate .. //depot/projects/vap/sys/i386/conf/XEN#2 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#12 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#6 integrate .. //depot/projects/vap/sys/i386/i386/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/vap/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/vap/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/vap/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/vap/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_socksys.c#6 integrate .. //depot/projects/vap/sys/i386/include/cpufunc.h#9 integrate .. //depot/projects/vap/sys/i386/include/pci_cfgreg.h#4 integrate .. //depot/projects/vap/sys/i386/include/pcpu.h#8 integrate .. //depot/projects/vap/sys/i386/include/pmap.h#9 integrate .. //depot/projects/vap/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/vap/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/vap/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/vap/sys/i386/isa/dpms.c#1 branch .. //depot/projects/vap/sys/i386/pci/pci_cfgreg.c#6 integrate .. //depot/projects/vap/sys/i386/xen/exception.s#2 integrate .. //depot/projects/vap/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/vap/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/vap/sys/ia64/conf/SKI#6 integrate .. //depot/projects/vap/sys/ia64/ia64/dump_machdep.c#6 integrate .. //depot/projects/vap/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/vap/sys/ia64/include/pcpu.h#5 integrate .. //depot/projects/vap/sys/isa/isa_common.c#6 integrate .. //depot/projects/vap/sys/isa/isavar.h#4 integrate .. //depot/projects/vap/sys/kern/imgact_shell.c#6 integrate .. //depot/projects/vap/sys/kern/init_main.c#10 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#14 integrate .. //depot/projects/vap/sys/kern/kern_acct.c#7 integrate .. //depot/projects/vap/sys/kern/kern_conf.c#13 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#13 integrate .. //depot/projects/vap/sys/kern/kern_exit.c#11 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#14 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#13 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#17 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#10 integrate .. //depot/projects/vap/sys/kern/kern_poll.c#8 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#11 integrate .. //depot/projects/vap/sys/kern/kern_resource.c#8 integrate .. //depot/projects/vap/sys/kern/kern_synch.c#12 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#14 integrate .. //depot/projects/vap/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/vap/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/vap/sys/kern/subr_prf.c#6 integrate .. //depot/projects/vap/sys/kern/subr_rman.c#6 integrate .. //depot/projects/vap/sys/kern/syscalls.c#14 integrate .. //depot/projects/vap/sys/kern/syscalls.master#14 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#11 integrate .. //depot/projects/vap/sys/kern/tty.c#11 integrate .. //depot/projects/vap/sys/kern/tty_compat.c#5 integrate .. //depot/projects/vap/sys/kern/tty_conf.c#3 delete .. //depot/projects/vap/sys/kern/tty_cons.c#10 integrate .. //depot/projects/vap/sys/kern/tty_info.c#2 integrate .. //depot/projects/vap/sys/kern/tty_inq.c#1 branch .. //depot/projects/vap/sys/kern/tty_outq.c#1 branch .. //depot/projects/vap/sys/kern/tty_pts.c#5 integrate .. //depot/projects/vap/sys/kern/tty_pty.c#9 integrate .. //depot/projects/vap/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/vap/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/vap/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/vap/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/vap/sys/modules/Makefile#38 integrate .. //depot/projects/vap/sys/modules/dpms/Makefile#1 branch .. //depot/projects/vap/sys/modules/drm/i915/Makefile#3 integrate .. //depot/projects/vap/sys/modules/nmdm/Makefile#5 integrate .. //depot/projects/vap/sys/modules/rc/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf.h#8 integrate .. //depot/projects/vap/sys/net/bpf_filter.c#7 integrate .. //depot/projects/vap/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/vap/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/vap/sys/net/bridgestp.c#4 integrate .. //depot/projects/vap/sys/net/if.c#15 integrate .. //depot/projects/vap/sys/net/if_bridge.c#6 integrate .. //depot/projects/vap/sys/net/if_ef.c#7 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/vap/sys/net/if_faith.c#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 27 02:25:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59A731065673; Wed, 27 Aug 2008 02:25:33 +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 1D9721065671 for ; Wed, 27 Aug 2008 02:25:33 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E61AB8FC08 for ; Wed, 27 Aug 2008 02:25:32 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R2PW8J065686 for ; Wed, 27 Aug 2008 02:25:32 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R2PW9l065684 for perforce@freebsd.org; Wed, 27 Aug 2008 02:25:32 GMT (envelope-from diego@FreeBSD.org) Date: Wed, 27 Aug 2008 02:25:32 GMT Message-Id: <200808270225.m7R2PW9l065684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148572 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, 27 Aug 2008 02:25:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148572 Change 148572 by diego@diego_black on 2008/08/27 02:25:18 Missed submiting this. Add socket_ex argument to audit record. Affected files ... .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_arg.c#8 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_arg.c#8 (text) ==== @@ -408,6 +408,26 @@ } void +audit_arg_socket_ex(int sodomain, int sotype, struct sockaddr *la, + struct sockaddr *ra) +{ + struct kaudit_record *ar; + + KASSERT(la != NULL, ("audit_arg_socket_ex: la == NULL")); + KASSERT(ra != NULL, ("audit_arg_socket_ex: ra == NULL")); + + ar = currecord(); + if (ar == NULL) + return; + + ar->k_ar.ar_arg_sockconn.sc_domain = sodomain; + ar->k_ar.ar_arg_sockconn.sc_type = sotype; + bcopy(la, &ar->k_ar.ar_arg_sockconn.sc_laddr, la->sa_len); + bcopy(ra, &ar->k_ar.ar_arg_sockconn.sc_raddr, ra->sa_len); + ARG_SET_VALID(ar, ARG_SOCKCONN); +} + +void audit_arg_sockaddr(struct thread *td, struct sockaddr *sa) { struct kaudit_record *ar; From owner-p4-projects@FreeBSD.ORG Wed Aug 27 02:26:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82FE7106567F; Wed, 27 Aug 2008 02:26: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 46F6F1065673 for ; Wed, 27 Aug 2008 02:26:34 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B2AF8FC14 for ; Wed, 27 Aug 2008 02:26:34 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R2QY9b065753 for ; Wed, 27 Aug 2008 02:26:34 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R2QYAq065751 for perforce@freebsd.org; Wed, 27 Aug 2008 02:26:34 GMT (envelope-from diego@FreeBSD.org) Date: Wed, 27 Aug 2008 02:26:34 GMT Message-Id: <200808270226.m7R2QYAq065751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148573 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, 27 Aug 2008 02:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=148573 Change 148573 by diego@diego_black on 2008/08/27 02:25:54 Kernel-land part of 'audit' keyword support for ipfw. Affected files ... .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw.h#5 edit .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#10 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw.h#5 (text+ko) ==== @@ -102,7 +102,7 @@ O_PROBE_STATE, /* none */ O_KEEP_STATE, /* none */ - //O_AUDIT, /* none */ + O_AUDIT, /* none */ O_LIMIT, /* ipfw_insn_limit */ O_LIMIT_PARENT, /* dyn_type, not an opcode. */ ==== //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#10 (text+ko) ==== @@ -1066,7 +1066,7 @@ /* remove a refcount to the parent */ \ if (q->dyn_type == O_LIMIT) \ q->parent->count--; \ - /*if (q->dyn_type == O_AUDIT) { */ \ + if (q->dyn_type == O_AUDIT) { \ AUDIT_PFIL_ENTER(AUE_PFIL_FLOW_END, td, error); \ if (error == 0) { \ AUDIT_ARG(text, "ipfw"); \ @@ -1075,7 +1075,7 @@ AUDIT_ARG(socket_ex, AF_INET, SOCK_STREAM, \ (struct sockaddr *)&lsin, (struct sockaddr *)&rsin); \ } \ - /*}*/ \ + } \ if (!error) { \ DEB(printf( \ "ipfw: unlink entry 0x%08x %d -> 0x%08x %d, %d left\n", \ @@ -1384,7 +1384,7 @@ IPFW_DYN_LOCK_ASSERT(); - //if (dyn_type == O_AUDIT) + if (dyn_type == O_AUDIT) { AUDIT_PFIL_ENTER(AUE_PFIL_FLOW_BEGIN, td, error); if (error != 0) @@ -1441,7 +1441,7 @@ V_dyn_count ); ) done: - //if (dyn_type == O_AUDIT) + if (dyn_type == O_AUDIT) AUDIT_PFIL_EXIT(error, td); return r; } @@ -1540,7 +1540,8 @@ switch (cmd->o.opcode) { case O_KEEP_STATE: /* bidir rule */ - add_dyn_rule(&args->f_id, O_KEEP_STATE, rule); + case O_AUDIT: + add_dyn_rule(&args->f_id, cmd->o.opcode, rule); break; case O_LIMIT: { /* limit number of sessions */ @@ -3199,6 +3200,7 @@ */ case O_LIMIT: case O_KEEP_STATE: + case O_AUDIT: if (install_state(f, (ipfw_insn_limit *)cmd, args, tablearg)) { retval = IP_FW_DENY; @@ -3881,6 +3883,7 @@ switch (cmd->opcode) { case O_PROBE_STATE: case O_KEEP_STATE: + case O_AUDIT: case O_PROTO: case O_IP_SRC_ME: case O_IP_DST_ME: From owner-p4-projects@FreeBSD.ORG Wed Aug 27 02:26:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF6F5106574B; Wed, 27 Aug 2008 02:26: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 6966E1065675 for ; Wed, 27 Aug 2008 02:26:34 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DA838FC15 for ; Wed, 27 Aug 2008 02:26:34 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R2QYpQ065758 for ; Wed, 27 Aug 2008 02:26:34 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R2QYKq065756 for perforce@freebsd.org; Wed, 27 Aug 2008 02:26:34 GMT (envelope-from diego@FreeBSD.org) Date: Wed, 27 Aug 2008 02:26:34 GMT Message-Id: <200808270226.m7R2QYKq065756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148574 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, 27 Aug 2008 02:26:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=148574 Change 148574 by diego@diego_black on 2008/08/27 02:26:21 User-land part of 'audit' keyword support for ipfw. Affected files ... .. //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw2.c#2 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw2.c#2 (text+ko) ==== @@ -269,6 +269,7 @@ TOK_IN, TOK_LIMIT, TOK_KEEPSTATE, + TOK_AUDIT, TOK_LAYER2, TOK_OUT, TOK_DIVERTED, @@ -436,6 +437,7 @@ { "in", TOK_IN }, { "limit", TOK_LIMIT }, { "keep-state", TOK_KEEPSTATE }, + { "audit", TOK_AUDIT }, { "bridged", TOK_LAYER2 }, { "layer2", TOK_LAYER2 }, { "out", TOK_OUT }, @@ -2001,6 +2003,10 @@ printf(" keep-state"); break; + case O_AUDIT: + printf(" audit"); + break; + case O_LIMIT: { struct _s_x *p = limit_masks; ipfw_insn_limit *c = (ipfw_insn_limit *)cmd; @@ -2089,6 +2095,9 @@ case O_KEEP_STATE: /* bidir, no mask */ printf(" STATE"); break; + case O_AUDIT: + printf(" AUDIT"); + break; } if ((pe = getprotobynumber(d->id.proto)) != NULL) @@ -4680,9 +4689,15 @@ static ipfw_insn * add_ports(ipfw_insn *cmd, char *av, u_char proto, int opcode) { - if (_substrcmp(av, "any") == 0) { + /* + * 'any' and 'audit' keywords must not be treated as port numbers. + */ + if (_substrcmp(av, "any") == 0) + return NULL; + if (_substrcmp(av, "audit") == 0) return NULL; - } else if (fill_newports((ipfw_insn_u16 *)cmd, av, proto)) { + + if (fill_newports((ipfw_insn_u16 *)cmd, av, proto)) { /* XXX todo: check that we have a protocol with ports */ cmd->opcode = opcode; return cmd; @@ -5489,12 +5504,23 @@ errx(EX_USAGE, "keep-state cannot be part " "of an or block"); if (have_state) - errx(EX_USAGE, "only one of keep-state " + errx(EX_USAGE, "only one of keep-state, audit " "and limit is allowed"); have_state = cmd; fill_cmd(cmd, O_KEEP_STATE, 0, 0); break; + case TOK_AUDIT: + if (open_par) + errx(EX_USAGE, "audit cannot be part of an or " + "block"); + if (have_state) + errx(EX_USAGE, "only one of audit, keep-state " + "and limit is allowed"); + have_state = cmd; + fill_cmd(cmd, O_AUDIT, 0, 0); + break; + case TOK_LIMIT: { ipfw_insn_limit *c = (ipfw_insn_limit *)cmd; int val; @@ -5503,8 +5529,8 @@ errx(EX_USAGE, "limit cannot be part of an or block"); if (have_state) - errx(EX_USAGE, "only one of keep-state and " - "limit is allowed"); + errx(EX_USAGE, "only one of audit, keep-state " + "and limit is allowed"); have_state = cmd; cmd->len = F_INSN_SIZE(ipfw_insn_limit); @@ -5699,13 +5725,15 @@ dst = next_cmd(dst); } - /* copy all commands but O_LOG, O_KEEP_STATE, O_LIMIT, O_ALTQ, O_TAG */ + /* copy all commands but O_LOG, O_KEEP_STATE, O_AUDIT, O_LIMIT, O_ALTQ, + * O_TAG */ for (src = (ipfw_insn *)cmdbuf; src != cmd; src += i) { i = F_LEN(src); switch (src->opcode) { case O_LOG: case O_KEEP_STATE: + case O_AUDIT: case O_LIMIT: case O_ALTQ: case O_TAG: From owner-p4-projects@FreeBSD.ORG Wed Aug 27 02:57:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF4E7106567E; Wed, 27 Aug 2008 02:57: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 B2DE81065673 for ; Wed, 27 Aug 2008 02:57:05 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86ADC8FC16 for ; Wed, 27 Aug 2008 02:57:05 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R2v5oR068924 for ; Wed, 27 Aug 2008 02:57:05 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R2v5Tb068922 for perforce@freebsd.org; Wed, 27 Aug 2008 02:57:05 GMT (envelope-from diego@FreeBSD.org) Date: Wed, 27 Aug 2008 02:57:05 GMT Message-Id: <200808270257.m7R2v5Tb068922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 148576 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, 27 Aug 2008 02:57:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=148576 Change 148576 by diego@diego_black on 2008/08/27 02:56:36 Teach OpenBSM library and utilities about Sun OpenSolaris socket_ex token. Affected files ... .. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/libbsm.h#2 edit .. //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_io.c#2 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/contrib/openbsm/bsm/libbsm.h#2 (text) ==== @@ -537,21 +537,21 @@ } au_socket_t; /* + * socket domain 2 bytes * socket type 2 bytes + * ip address type 2 bytes * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) + * local address 4 bytes/16 bytes (IPv4/IPv6 address) + * remote port 2 bytes + * remote address 4 bytes/16 bytes (IPv4/IPv6 address) */ typedef struct { + u_int16_t domain; u_int16_t type; + u_int16_t addr_type; u_int16_t l_port; - u_int32_t l_ad_type; u_int32_t l_addr; - u_int32_t r_port; - u_int32_t r_ad_type; + u_int16_t r_port; u_int32_t r_addr; } au_socket_ex32_t; ==== //depot/projects/soc2008/diego-audit/src/contrib/openbsm/libbsm/bsm_io.c#2 (text) ==== @@ -557,7 +557,7 @@ break; case AUT_SOCKET_EX: - fprintf(fp, "tt.socket_ex32.domain, tok->len, + err); + if (err) + return (-1); + READ_TOKEN_U_INT16(buf, len, tok->tt.socket_ex32.type, tok->len, err); if (err) return (-1); - READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.l_port, - sizeof(uint16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.socket_ex32.addr_type, tok->len, + err); if (err) return (-1); - READ_TOKEN_U_INT32(buf, len, tok->tt.socket_ex32.l_ad_type, tok->len, - err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.l_port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -3784,11 +3789,6 @@ if (err) return (-1); - READ_TOKEN_U_INT32(buf, len, tok->tt.socket_ex32.r_ad_type, tok->len, - err); - if (err) - return (-1); - READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.r_addr, sizeof(tok->tt.socket_ex32.r_addr), tok->len, err); if (err) @@ -3802,8 +3802,11 @@ __unused char sfrm, int xml) { - print_tok_type(fp, tok->id, "socket", raw, xml); + print_tok_type(fp, tok->id, "socket_ex", raw, xml); if (xml) { + open_attr(fp, "sock_domain"); + print_2_bytes(fp, tok->tt.socket_ex32.domain, "%#x"); + close_attr(fp); open_attr(fp, "sock_type"); print_2_bytes(fp, tok->tt.socket_ex32.type, "%#x"); close_attr(fp); @@ -3822,6 +3825,8 @@ close_tag(fp, tok->id); } else { print_delim(fp, del); + print_2_bytes(fp, tok->tt.socket_ex32.domain, "%#x"); + print_delim(fp, del); print_2_bytes(fp, tok->tt.socket_ex32.type, "%#x"); print_delim(fp, del); print_2_bytes(fp, ntohs(tok->tt.socket_ex32.l_port), "%#x"); From owner-p4-projects@FreeBSD.ORG Wed Aug 27 07:44:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D97C106566C; Wed, 27 Aug 2008 07:44: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 D6DD0106564A for ; Wed, 27 Aug 2008 07:44:58 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC0D58FC24 for ; Wed, 27 Aug 2008 07:44:58 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R7iwRj022444 for ; Wed, 27 Aug 2008 07:44:58 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R7iw1N022442 for perforce@freebsd.org; Wed, 27 Aug 2008 07:44:58 GMT (envelope-from konrad@FreeBSD.org) Date: Wed, 27 Aug 2008 07:44:58 GMT Message-Id: <200808270744.m7R7iw1N022442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148588 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, 27 Aug 2008 07:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=148588 Change 148588 by konrad@vspredator on 2008/08/27 07:44:00 Now print the names of all the characters. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/analyze/analyze.c#2 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/analyze/analyze.c#2 (text+ko) ==== @@ -30,12 +30,32 @@ } void +grep_name(char *str, int len) +{ + char grepbuf[30] = { 0 }, cmd[120], tmp[10]; + int i; + + for (i = 0; i < len; i++) { + snprintf(tmp, sizeof(tmp), "\\\\x%2X", (unsigned char)str[i]); + strlcat(grepbuf, tmp, sizeof(grepbuf)); + } + fflush(stdout); + snprintf(cmd, sizeof(cmd), "grep ' %s$' /usr/home/versus/p4/posix/UTF-8.cm" + " | head -n 1 | awk ' { print $1 } '" + " | tr -d '\n'", grepbuf); +#if 0 + printf("cmd: %s\n", cmd); +#else + system(cmd); +#endif +} + +void show(char *line) { char *p; int delta, i, len, chars, max = 0; wchar_t wc; - char grepbuf[20], tmpbuf[5], cmd[50]; for (p = line, i = 1; *p; p += delta, i++) { delta = mbtowc(&wc, p, -1); @@ -58,13 +78,8 @@ putchar('\n'); for (p = line; *p; p += delta) { delta = mbtowc(&wc, p, -1); - grepbuf[0] = '\0'; - for (i = 0; i < delta; i++) { + for (i = 0; i < delta; i++) printf("%X", (unsigned char)p[i]); - snprintf(tmpbuf, sizeof(tmpbuf), - ".x%X", (unsigned char)p[i]); - strcat(grepbuf, tmpbuf); - } adjust(max, delta << 1); } putchar('\n'); @@ -74,9 +89,11 @@ adjust(max, len); } putchar('\n'); - /* printf("grepbuf: %s\n", grepbuf); */ - snprintf(cmd, sizeof(cmd), "grep %s /usr/home/versus/p4/posix/UTF-8.cm", grepbuf); - system(cmd); + for (p = line; *p; p += delta) { + delta = mbtowc(&wc, p, -1); + grep_name(p, delta); + } + putchar('\n'); } int From owner-p4-projects@FreeBSD.ORG Wed Aug 27 10:58:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC8AC1065686; Wed, 27 Aug 2008 10:58: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 7FEA2106567D for ; Wed, 27 Aug 2008 10:58:15 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6597E8FC19 for ; Wed, 27 Aug 2008 10:58:15 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RAwF1e062065 for ; Wed, 27 Aug 2008 10:58:15 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RAwFua062063 for perforce@freebsd.org; Wed, 27 Aug 2008 10:58:15 GMT (envelope-from trasz@freebsd.org) Date: Wed, 27 Aug 2008 10:58:15 GMT Message-Id: <200808271058.m7RAwFua062063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148597 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, 27 Aug 2008 10:58:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=148597 Change 148597 by trasz@trasz_traszkan on 2008/08/27 10:58:12 Compilation fix. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#30 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#30 (text+ko) ==== @@ -965,6 +965,7 @@ acl_nfs4_sync_acl_from_mode(child_aclp, mode, file_owner_id); } +#ifdef _KERNEL static int _acls_are_equal(const struct acl *a, const struct acl *b) { @@ -989,7 +990,6 @@ return (1); } -#ifdef _KERNEL /* * This routine is used to determine whether to remove extended attribute * that stores ACL contents. From owner-p4-projects@FreeBSD.ORG Wed Aug 27 11:03:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 201471065681; Wed, 27 Aug 2008 11:03: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 D7072106567D for ; Wed, 27 Aug 2008 11:03:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB07F8FC08 for ; Wed, 27 Aug 2008 11:03:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RB3KBY063626 for ; Wed, 27 Aug 2008 11:03:20 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RB3Kww063624 for perforce@freebsd.org; Wed, 27 Aug 2008 11:03:20 GMT (envelope-from trasz@freebsd.org) Date: Wed, 27 Aug 2008 11:03:20 GMT Message-Id: <200808271103.m7RB3Kww063624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148598 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, 27 Aug 2008 11:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=148598 Change 148598 by trasz@trasz_traszkan on 2008/08/27 11:02:34 IFC. This is the point 20080827-nfs4acls.diff was made. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Symbol.map#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/execve.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/wait.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping6/ping6.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping6/ping6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.mips#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/wait.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0001.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0075.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0076.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0077.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0078.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bpf/bpf_filter/tests/test0079.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet.c#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/libc_private.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.19 2008/06/23 05:22:06 ed Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.20 2008/08/27 02:00:53 jasone Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -158,6 +158,12 @@ extern const char *__progname; /* + * This function is used by the threading libraries to notify malloc that a + * thread is exiting. + */ +void _malloc_thread_cleanup(void); + +/* * These functions are used by the threading libraries in order to protect * malloc across fork(). */ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.8 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.9 2008/08/27 02:00:53 jasone Exp $ */ FBSD_1.0 { @@ -93,6 +93,7 @@ }; FBSDprivate_1.0 { + _malloc_thread_cleanup; _malloc_prefork; _malloc_postfork; __system; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.78 2008/02/17 17:09:24 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.79 2008/08/27 02:00:53 jasone Exp $ .\" -.Dd February 17, 2008 +.Dd August 26, 2008 .Dt MALLOC 3 .Os .Sh NAME @@ -154,7 +154,7 @@ implementation-dependent. .Sh TUNING Once, when the first call is made to one of these memory allocation -routines, various flags will be set or reset, which affect the +routines, various flags will be set or reset, which affects the workings of this allocator implementation. .Pp The @@ -196,6 +196,11 @@ Therefore, some applications may benefit from increasing or decreasing this threshold parameter. This option is not available for some configurations (non-PIC). +.It C +Double/halve the size of the maximum size class that is a multiple of the +cacheline size (64). +Above this size, subpage spacing (256 bytes) is used for size classes. +The default value is 512 bytes. .It D Use .Xr sbrk 2 @@ -214,6 +219,16 @@ The default is 512 pages per arena; .Ev MALLOC_OPTIONS=10f will prevent any dirty unused pages from accumulating. +.It G +When there are multiple threads, use thread-specific caching for objects that +are smaller than one page. +This option is enabled by default. +Thread-specific caching allows many allocations to be satisfied without +performing any thread synchronization, at the cost of increased memory use. +See the +.Dq R +option for related tuning information. +This option is not available for some configurations (non-PIC). .It J Each byte of new memory allocated by .Fn malloc , @@ -248,7 +263,7 @@ acquiring memory. .It N Double/halve the number of arenas. -The default number of arenas is four times the number of CPUs, or one if there +The default number of arenas is two times the number of CPUs, or one if there is a single CPU. .It P Various statistics are printed at program exit via an @@ -259,14 +274,18 @@ Therefore, this option should only be used with care; it is primarily intended as a performance tuning aid during application development. .It Q -Double/halve the size of the allocation quantum. -The default quantum is the minimum allowed by the architecture (typically 8 or -16 bytes). -.It S Double/halve the size of the maximum size class that is a multiple of the -quantum. -Above this size, power-of-two spacing is used for size classes. -The default value is 512 bytes. +quantum (8 or 16 bytes, depending on architecture). +Above this size, cacheline spacing is used for size classes. +The default value is 128 bytes. +.It R +Double/halve magazine size, which approximately doubles/halves the number of +rounds in each magazine. +Magazines are used by the thread-specific caching machinery to acquire and +release objects in bulk. +Increasing the magazine size decreases locking overhead, at the expense of +increased memory usage. +This option is not available for some configurations (non-PIC). .It U Generate .Dq utrace @@ -358,6 +377,13 @@ However, it may make sense to reduce the number of arenas if an application does not make much use of the allocation functions. .Pp +In addition to multiple arenas, this allocator supports thread-specific +caching for small objects (smaller than one page), in order to make it +possible to completely avoid synchronization for most small allocation requests. +Such caching allows very fast allocation in the common case, but it increases +memory usage and fragmentation, since a bounded number of objects can remain +allocated in each thread cache. +.Pp Memory is conceptually broken into equal-sized chunks, where the chunk size is a power of two that is greater than the page size. Chunks are always aligned to multiples of the chunk size. @@ -366,7 +392,7 @@ .Pp User objects are broken into three categories according to size: small, large, and huge. -Small objects are no larger than one half of a page. +Small objects are smaller than one page. Large objects are smaller than the chunk size. Huge objects are a multiple of the chunk size. Small and large objects are managed by arenas; huge objects are managed @@ -378,23 +404,24 @@ contiguous pages (unused, backing a set of small objects, or backing one large object). The combination of chunk alignment and chunk page maps makes it possible to -determine all metadata regarding small and large allocations in -constant and logarithmic time, respectively. +determine all metadata regarding small and large allocations in constant time. .Pp Small objects are managed in groups by page runs. Each run maintains a bitmap that tracks which regions are in use. -Allocation requests that are no more than half the quantum (see the +Allocation requests that are no more than half the quantum (8 or 16, depending +on architecture) are rounded up to the nearest power of two. +Allocation requests that are more than half the quantum, but no more than the +minimum cacheline-multiple size class (see the .Dq Q -option) are rounded up to the nearest power of two (typically 2, 4, or 8). -Allocation requests that are more than half the quantum, but no more than the -maximum quantum-multiple size class (see the -.Dq S option) are rounded up to the nearest multiple of the quantum. -Allocation requests that are larger than the maximum quantum-multiple size -class, but no larger than one half of a page, are rounded up to the nearest -power of two. -Allocation requests that are larger than half of a page, but small enough to -fit in an arena-managed chunk (see the +Allocation requests that are more than the minumum cacheline-multiple size +class, but no more than the minimum subpage-multiple size class (see the +.Dq C +option) are rounded up to the nearest multiple of the cacheline size (64). +Allocation requests that are more than the minimum subpage-multiple size class +are rounded up to the nearest multiple of the subpage size (256). +Allocation requests that are more than one page, but small enough to fit in +an arena-managed chunk (see the .Dq K option), are rounded up to the nearest run size. Allocation requests that are too large to fit in an arena-managed chunk are @@ -402,8 +429,8 @@ .Pp Allocations are packed tightly together, which can be an issue for multi-threaded applications. -If you need to assure that allocations do not suffer from cache line sharing, -round your allocation requests up to the nearest multiple of the cache line +If you need to assure that allocations do not suffer from cacheline sharing, +round your allocation requests up to the nearest multiple of the cacheline size. .Sh DEBUGGING MALLOC PROBLEMS The first thing to do is to set the ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -35,6 +35,9 @@ * + Multiple arenas are used if there are multiple CPUs, which reduces lock * contention and cache sloshing. * + * + Thread-specific caching is used if there are multiple threads, which + * reduces the amount of locking. + * * + Cache line sharing between arenas is avoided for internal data * structures. * @@ -48,37 +51,49 @@ * and a 16 byte quantum on a 32-bit system, the size classes in each category * are as follows: * - * |=====================================| - * | Category | Subcategory | Size | - * |=====================================| - * | Small | Tiny | 2 | - * | | | 4 | - * | | | 8 | - * | |----------------+---------| - * | | Quantum-spaced | 16 | - * | | | 32 | - * | | | 48 | - * | | | ... | - * | | | 480 | - * | | | 496 | - * | | | 512 | - * | |----------------+---------| - * | | Sub-page | 1 kB | - * | | | 2 kB | - * |=====================================| - * | Large | 4 kB | - * | | 8 kB | - * | | 12 kB | - * | | ... | - * | | 1012 kB | - * | | 1016 kB | - * | | 1020 kB | - * |=====================================| - * | Huge | 1 MB | - * | | 2 MB | - * | | 3 MB | - * | | ... | - * |=====================================| + * |=======================================| + * | Category | Subcategory | Size | + * |=======================================| + * | Small | Tiny | 2 | + * | | | 4 | + * | | | 8 | + * | |------------------+---------| + * | | Quantum-spaced | 16 | + * | | | 32 | + * | | | 48 | + * | | | ... | + * | | | 96 | + * | | | 112 | + * | | | 128 | + * | |------------------+---------| + * | | Cacheline-spaced | 192 | + * | | | 256 | + * | | | 320 | + * | | | 384 | + * | | | 448 | + * | | | 512 | + * | |------------------+---------| + * | | Sub-page | 760 | + * | | | 1024 | + * | | | 1280 | + * | | | ... | + * | | | 3328 | + * | | | 3584 | + * | | | 3840 | + * |=======================================| + * | Large | 4 kB | + * | | 8 kB | + * | | 12 kB | + * | | ... | + * | | 1012 kB | + * | | 1016 kB | + * | | 1020 kB | + * |=======================================| + * | Huge | 1 MB | + * | | 2 MB | + * | | 3 MB | + * | | ... | + * |=======================================| * * A different mechanism is used for each category: * @@ -113,6 +128,19 @@ #endif /* + * MALLOC_TINY enables support for tiny objects, which are smaller than one + * quantum. + */ +#define MALLOC_TINY + +/* + * MALLOC_MAG enables a magazine-based thread-specific caching layer for small + * objects. This makes it possible to allocate/deallocate objects without any + * locking when the cache is in the steady state. + */ +#define MALLOC_MAG + +/* * MALLOC_BALANCE enables monitoring of arena lock contention and dynamically * re-balances arena load if exponentially averaged contention exceeds a * certain threshold. @@ -128,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.176 2008/08/14 17:31:42 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.177 2008/08/27 02:00:53 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -184,46 +212,63 @@ /* Size of stack-allocated buffer passed to strerror_r(). */ #define STRERROR_BUF 64 -/* Minimum alignment of allocations is 2^QUANTUM_2POW_MIN bytes. */ +/* + * The const_size2bin table is sized according to PAGESIZE_2POW, but for + * correctness reasons, we never assume that + * (pagesize == (1U << * PAGESIZE_2POW)). + * + * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. + */ #ifdef __i386__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 13 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 13 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define QUANTUM_2POW_MIN 3 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define QUANTUM_2POW_MIN 3 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif +#define QUANTUM ((size_t)(1U << QUANTUM_2POW)) +#define QUANTUM_MASK (QUANTUM - 1) + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) /* sizeof(int) == (1U << SIZEOF_INT_2POW). */ @@ -237,6 +282,10 @@ #endif #ifdef NO_TLS + /* MALLOC_MAG requires TLS. */ +# ifdef MALLOC_MAG +# undef MALLOC_MAG +# endif /* MALLOC_BALANCE requires TLS. */ # ifdef MALLOC_BALANCE # undef MALLOC_BALANCE @@ -253,23 +302,42 @@ #define DIRTY_MAX_DEFAULT (1U << 9) /* - * Maximum size of L1 cache line. This is used to avoid cache line aliasing, - * so over-estimates are okay (up to a point), but under-estimates will - * negatively affect performance. + * Maximum size of L1 cache line. This is used to avoid cache line aliasing. + * In addition, this controls the spacing of cacheline-spaced size classes. */ #define CACHELINE_2POW 6 #define CACHELINE ((size_t)(1U << CACHELINE_2POW)) +#define CACHELINE_MASK (CACHELINE - 1) -/* Smallest size class to support. */ -#define TINY_MIN_2POW 1 +/* + * Subpages are an artificially designated partitioning of pages. Their only + * purpose is to support subpage-spaced size classes. + * + * There must be at least 4 subpages per page, due to the way size classes are + * handled. + */ +#define SUBPAGE_2POW 8 +#define SUBPAGE ((size_t)(1U << SUBPAGE_2POW)) +#define SUBPAGE_MASK (SUBPAGE - 1) + +#ifdef MALLOC_TINY + /* Smallest size class to support. */ +# define TINY_MIN_2POW 1 +#endif /* * Maximum size class that is a multiple of the quantum, but not (necessarily) * a power of 2. Above this size, allocations are rounded up to the nearest * power of 2. */ -#define SMALL_MAX_2POW_DEFAULT 9 -#define SMALL_MAX_DEFAULT (1U << SMALL_MAX_2POW_DEFAULT) +#define QSPACE_MAX_2POW_DEFAULT 7 + +/* + * Maximum size class that is a multiple of the cacheline, but not (necessarily) + * a power of 2. Above this size, allocations are rounded up to the nearest + * power of 2. + */ +#define CSPACE_MAX_2POW_DEFAULT 9 /* * RUN_MAX_OVRHD indicates maximum desired run header overhead. Runs are sized @@ -293,8 +361,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL_2POW 15 -#define RUN_MAX_SMALL (1U << RUN_MAX_SMALL_2POW) +#define RUN_MAX_SMALL (12 * pagesize) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -319,6 +386,15 @@ */ #define BLOCK_COST_2POW 4 +#ifdef MALLOC_MAG + /* + * Default magazine size, in bytes. max_rounds is calculated to make + * optimal use of the space, leaving just enough room for the magazine + * header. + */ +# define MAG_SIZE_2POW_DEFAULT 9 +#endif + #ifdef MALLOC_BALANCE /* * We use an exponential moving average to track recent lock contention, @@ -369,6 +445,11 @@ */ uint64_t nrequests; +#ifdef MALLOC_MAG + /* Number of magazine reloads from this bin. */ + uint64_t nmags; +#endif + /* Total number of runs created for this bin's size class. */ uint64_t nruns; @@ -678,6 +759,35 @@ /******************************************************************************/ /* + * Magazine data structures. + */ + +#ifdef MALLOC_MAG +typedef struct mag_s mag_t; +struct mag_s { + size_t binind; /* Index of associated bin. */ + size_t nrounds; + void *rounds[1]; /* Dynamically sized. */ +}; + +/* + * Magazines are lazily allocated, but once created, they remain until the + * associated mag_rack is destroyed. + */ +typedef struct bin_mags_s bin_mags_t; +struct bin_mags_s { + mag_t *curmag; + mag_t *sparemag; +}; + +typedef struct mag_rack_s mag_rack_t; +struct mag_rack_s { + bin_mags_t bin_mags[1]; /* Dynamically sized. */ +}; +#endif + +/******************************************************************************/ +/* * Data. */ @@ -690,16 +800,147 @@ static size_t pagesize_2pow; /* Various bin-related settings. */ -static size_t bin_maxclass; /* Max size class for bins. */ -static unsigned ntbins; /* Number of (2^n)-spaced tiny bins. */ +#ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ +# define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) +#else +# define ntbins 0 +#endif static unsigned nqbins; /* Number of quantum-spaced bins. */ -static unsigned nsbins; /* Number of (2^n)-spaced sub-page bins. */ -static size_t small_min; -static size_t small_max; +static unsigned ncbins; /* Number of cacheline-spaced bins. */ +static unsigned nsbins; /* Number of subpage-spaced bins. */ +static unsigned nbins; +#ifdef MALLOC_TINY +# define tspace_max ((size_t)(QUANTUM >> 1)) +#endif +#define qspace_min QUANTUM +static size_t qspace_max; +static size_t cspace_min; +static size_t cspace_max; +static size_t sspace_min; +static size_t sspace_max; +#define bin_maxclass sspace_max + +static uint8_t const *size2bin; +/* + * const_size2bin is a static constant lookup table that in the common case can + * be used as-is for size2bin. For dynamically linked programs, this avoids + * a page of memory overhead per process. + */ +#define S2B_1(i) i, +#define S2B_2(i) S2B_1(i) S2B_1(i) +#define S2B_4(i) S2B_2(i) S2B_2(i) +#define S2B_8(i) S2B_4(i) S2B_4(i) +#define S2B_16(i) S2B_8(i) S2B_8(i) +#define S2B_32(i) S2B_16(i) S2B_16(i) +#define S2B_64(i) S2B_32(i) S2B_32(i) +#define S2B_128(i) S2B_64(i) S2B_64(i) +#define S2B_256(i) S2B_128(i) S2B_128(i) +static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { + S2B_1(0xffU) /* 0 */ +#if (QUANTUM_2POW == 4) +/* 64-bit system ************************/ +# ifdef MALLOC_TINY + S2B_2(0) /* 2 */ + S2B_2(1) /* 4 */ + S2B_4(2) /* 8 */ + S2B_8(3) /* 16 */ +# define S2B_QMIN 3 +# else + S2B_16(0) /* 16 */ +# define S2B_QMIN 0 +# endif + S2B_16(S2B_QMIN + 1) /* 32 */ + S2B_16(S2B_QMIN + 2) /* 48 */ + S2B_16(S2B_QMIN + 3) /* 64 */ + S2B_16(S2B_QMIN + 4) /* 80 */ + S2B_16(S2B_QMIN + 5) /* 96 */ + S2B_16(S2B_QMIN + 6) /* 112 */ + S2B_16(S2B_QMIN + 7) /* 128 */ +# define S2B_CMIN (S2B_QMIN + 8) +#else +/* 32-bit system ************************/ +# ifdef MALLOC_TINY + S2B_2(0) /* 2 */ + S2B_2(1) /* 4 */ + S2B_4(2) /* 8 */ +# define S2B_QMIN 2 +# else + S2B_8(0) /* 8 */ +# define S2B_QMIN 0 +# endif + S2B_8(S2B_QMIN + 1) /* 16 */ + S2B_8(S2B_QMIN + 2) /* 24 */ + S2B_8(S2B_QMIN + 3) /* 32 */ + S2B_8(S2B_QMIN + 4) /* 40 */ + S2B_8(S2B_QMIN + 5) /* 48 */ + S2B_8(S2B_QMIN + 6) /* 56 */ + S2B_8(S2B_QMIN + 7) /* 64 */ + S2B_8(S2B_QMIN + 8) /* 72 */ + S2B_8(S2B_QMIN + 9) /* 80 */ + S2B_8(S2B_QMIN + 10) /* 88 */ + S2B_8(S2B_QMIN + 11) /* 96 */ + S2B_8(S2B_QMIN + 12) /* 104 */ + S2B_8(S2B_QMIN + 13) /* 112 */ + S2B_8(S2B_QMIN + 14) /* 120 */ + S2B_8(S2B_QMIN + 15) /* 128 */ +# define S2B_CMIN (S2B_QMIN + 16) +#endif +/****************************************/ + S2B_64(S2B_CMIN + 0) /* 192 */ + S2B_64(S2B_CMIN + 1) /* 256 */ + S2B_64(S2B_CMIN + 2) /* 320 */ + S2B_64(S2B_CMIN + 3) /* 384 */ + S2B_64(S2B_CMIN + 4) /* 448 */ + S2B_64(S2B_CMIN + 5) /* 512 */ +# define S2B_SMIN (S2B_CMIN + 6) + S2B_256(S2B_SMIN + 0) /* 768 */ + S2B_256(S2B_SMIN + 1) /* 1024 */ + S2B_256(S2B_SMIN + 2) /* 1280 */ + S2B_256(S2B_SMIN + 3) /* 1536 */ + S2B_256(S2B_SMIN + 4) /* 1792 */ + S2B_256(S2B_SMIN + 5) /* 2048 */ + S2B_256(S2B_SMIN + 6) /* 2304 */ + S2B_256(S2B_SMIN + 7) /* 2560 */ + S2B_256(S2B_SMIN + 8) /* 2816 */ + S2B_256(S2B_SMIN + 9) /* 3072 */ + S2B_256(S2B_SMIN + 10) /* 3328 */ + S2B_256(S2B_SMIN + 11) /* 3584 */ + S2B_256(S2B_SMIN + 12) /* 3840 */ +#if (PAGESIZE_2POW == 13) + S2B_256(S2B_SMIN + 13) /* 4096 */ + S2B_256(S2B_SMIN + 14) /* 4352 */ + S2B_256(S2B_SMIN + 15) /* 4608 */ + S2B_256(S2B_SMIN + 16) /* 4864 */ + S2B_256(S2B_SMIN + 17) /* 5120 */ + S2B_256(S2B_SMIN + 18) /* 5376 */ + S2B_256(S2B_SMIN + 19) /* 5632 */ + S2B_256(S2B_SMIN + 20) /* 5888 */ + S2B_256(S2B_SMIN + 21) /* 6144 */ + S2B_256(S2B_SMIN + 22) /* 6400 */ + S2B_256(S2B_SMIN + 23) /* 6656 */ + S2B_256(S2B_SMIN + 24) /* 6912 */ + S2B_256(S2B_SMIN + 25) /* 7168 */ + S2B_256(S2B_SMIN + 26) /* 7424 */ + S2B_256(S2B_SMIN + 27) /* 7680 */ + S2B_256(S2B_SMIN + 28) /* 7936 */ +#endif +}; +#undef S2B_1 +#undef S2B_2 +#undef S2B_4 +#undef S2B_8 +#undef S2B_16 +#undef S2B_32 +#undef S2B_64 +#undef S2B_128 +#undef S2B_256 +#undef S2B_QMIN +#undef S2B_CMIN +#undef S2B_SMIN -/* Various quantum-related settings. */ -static size_t quantum; -static size_t quantum_mask; /* (quantum - 1). */ +#ifdef MALLOC_MAG +static size_t max_rounds; +#endif /* Various chunk-related settings. */ static size_t chunksize; @@ -796,6 +1037,14 @@ static __thread arena_t *arenas_map; #endif +#ifdef MALLOC_MAG +/* + * Map of thread-specific magazine racks, used for thread-specific object + * caching. + */ +static __thread mag_rack_t *mag_rack; +#endif + #ifdef MALLOC_STATS /* Chunk statistics. */ static chunk_stats_t stats_chunks; @@ -818,13 +1067,17 @@ static bool opt_dss = true; static bool opt_mmap = true; #endif +#ifdef MALLOC_MAG +static bool opt_mag = true; +static size_t opt_mag_size_2pow = MAG_SIZE_2POW_DEFAULT; +#endif static size_t opt_dirty_max = DIRTY_MAX_DEFAULT; #ifdef MALLOC_BALANCE static uint64_t opt_balance_threshold = BALANCE_THRESHOLD_DEFAULT; #endif static bool opt_print_stats = false; -static size_t opt_quantum_2pow = QUANTUM_2POW_MIN; -static size_t opt_small_max_2pow = SMALL_MAX_2POW_DEFAULT; +static size_t opt_qspace_max_2pow = QSPACE_MAX_2POW_DEFAULT; +static size_t opt_cspace_max_2pow = CSPACE_MAX_2POW_DEFAULT; static size_t opt_chunk_2pow = CHUNK_2POW_DEFAULT; static bool opt_utrace = false; static bool opt_sysv = false; @@ -902,15 +1155,21 @@ static void arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty); static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin); -static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); -static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size); +static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); +static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size); #ifdef MALLOC_BALANCE static void arena_lock_balance_hard(arena_t *arena); #endif +#ifdef MALLOC_MAG +static void mag_load(mag_t *mag); +#endif static void *arena_malloc_large(arena_t *arena, size_t size, bool zero); static void *arena_palloc(arena_t *arena, size_t alignment, size_t size, size_t alloc_size); static size_t arena_salloc(const void *ptr); +#ifdef MALLOC_MAG +static void mag_unload(mag_t *mag); +#endif static void arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr); static void arena_ralloc_large_shrink(arena_t *arena, arena_chunk_t *chunk, @@ -921,11 +1180,22 @@ static void *arena_ralloc(void *ptr, size_t size, size_t oldsize); static bool arena_new(arena_t *arena); static arena_t *arenas_extend(unsigned ind); +#ifdef MALLOC_MAG +static mag_t *mag_create(arena_t *arena, size_t binind); +static void mag_destroy(mag_t *mag); +static mag_rack_t *mag_rack_create(arena_t *arena); +static void mag_rack_destroy(mag_rack_t *rack); +#endif static void *huge_malloc(size_t size, bool zero); static void *huge_palloc(size_t alignment, size_t size); static void *huge_ralloc(void *ptr, size_t size, size_t oldsize); static void huge_dalloc(void *ptr); static void malloc_print_stats(void); +#ifdef MALLOC_DEBUG +static void size2bin_validate(void); +#endif +static bool size2bin_init(void); +static bool size2bin_init_hard(void); static bool malloc_init_hard(void); /* @@ -1063,18 +1333,23 @@ #define CHUNK_CEILING(s) \ (((s) + chunksize_mask) & ~chunksize_mask) +/* Return the smallest quantum multiple that is >= a. */ +#define QUANTUM_CEILING(a) \ + (((a) + QUANTUM_MASK) & ~QUANTUM_MASK) + /* Return the smallest cacheline multiple that is >= s. */ #define CACHELINE_CEILING(s) \ - (((s) + (CACHELINE - 1)) & ~(CACHELINE - 1)) + (((s) + CACHELINE_MASK) & ~CACHELINE_MASK) -/* Return the smallest quantum multiple that is >= a. */ -#define QUANTUM_CEILING(a) \ - (((a) + quantum_mask) & ~quantum_mask) +/* Return the smallest subpage multiple that is >= s. */ +#define SUBPAGE_CEILING(s) \ + (((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK) /* Return the smallest pagesize multiple that is >= s. */ #define PAGE_CEILING(s) \ (((s) + pagesize_mask) & ~pagesize_mask) +#ifdef MALLOC_TINY /* Compute the smallest power of 2 that is >= x. */ static inline size_t pow2_ceil(size_t x) @@ -1092,6 +1367,7 @@ x++; return (x); } +#endif #ifdef MALLOC_BALANCE /* @@ -1382,10 +1658,19 @@ arena->stats.ndalloc_small + arena->stats.ndalloc_large); malloc_printf("mapped: %12zu\n", arena->stats.mapped); - malloc_printf("bins: bin size regs pgs requests newruns" - " reruns maxruns curruns\n"); - for (i = 0, gap_start = UINT_MAX; i < ntbins + nqbins + nsbins; i++) { - if (arena->bins[i].stats.nrequests == 0) { +#ifdef MALLOC_MAG + if (__isthreaded && opt_mag) { + malloc_printf("bins: bin size regs pgs mags " + "newruns reruns maxruns curruns\n"); + } else { +#endif + malloc_printf("bins: bin size regs pgs requests " + "newruns reruns maxruns curruns\n"); +#ifdef MALLOC_MAG + } +#endif + for (i = 0, gap_start = UINT_MAX; i < nbins; i++) { + if (arena->bins[i].stats.nruns == 0) { if (gap_start == UINT_MAX) gap_start = i; } else { @@ -1404,10 +1689,15 @@ "%13u %1s %4u %4u %3u %9llu %9llu" " %9llu %7lu %7lu\n", i, - i < ntbins ? "T" : i < ntbins + nqbins ? "Q" : "S", + i < ntbins ? "T" : i < ntbins + nqbins ? "Q" : + i < ntbins + nqbins + ncbins ? "C" : "S", arena->bins[i].reg_size, arena->bins[i].nregs, arena->bins[i].run_size >> pagesize_2pow, +#ifdef MALLOC_MAG + (__isthreaded && opt_mag) ? + arena->bins[i].stats.nmags : +#endif arena->bins[i].stats.nrequests, arena->bins[i].stats.nruns, arena->bins[i].stats.reruns, @@ -2137,44 +2427,9 @@ static inline void arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size) { - /* - * To divide by a number D that is not a power of two we multiply - * by (2^21 / D) and then right shift by 21 positions. - * - * X / D - * - * becomes - * - * (X * size_invs[(D >> QUANTUM_2POW_MIN) - 3]) >> SIZE_INV_SHIFT - */ -#define SIZE_INV_SHIFT 21 -#define SIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << QUANTUM_2POW_MIN)) + 1) - static const unsigned size_invs[] = { - SIZE_INV(3), - SIZE_INV(4), SIZE_INV(5), SIZE_INV(6), SIZE_INV(7), - SIZE_INV(8), SIZE_INV(9), SIZE_INV(10), SIZE_INV(11), - SIZE_INV(12),SIZE_INV(13), SIZE_INV(14), SIZE_INV(15), - SIZE_INV(16),SIZE_INV(17), SIZE_INV(18), SIZE_INV(19), - SIZE_INV(20),SIZE_INV(21), SIZE_INV(22), SIZE_INV(23), - SIZE_INV(24),SIZE_INV(25), SIZE_INV(26), SIZE_INV(27), - SIZE_INV(28),SIZE_INV(29), SIZE_INV(30), SIZE_INV(31) -#if (QUANTUM_2POW_MIN < 4) - , - SIZE_INV(32), SIZE_INV(33), SIZE_INV(34), SIZE_INV(35), - SIZE_INV(36), SIZE_INV(37), SIZE_INV(38), SIZE_INV(39), - SIZE_INV(40), SIZE_INV(41), SIZE_INV(42), SIZE_INV(43), - SIZE_INV(44), SIZE_INV(45), SIZE_INV(46), SIZE_INV(47), - SIZE_INV(48), SIZE_INV(49), SIZE_INV(50), SIZE_INV(51), - SIZE_INV(52), SIZE_INV(53), SIZE_INV(54), SIZE_INV(55), - SIZE_INV(56), SIZE_INV(57), SIZE_INV(58), SIZE_INV(59), - SIZE_INV(60), SIZE_INV(61), SIZE_INV(62), SIZE_INV(63) -#endif - }; unsigned diff, regind, elm, bit; assert(run->magic == ARENA_RUN_MAGIC); - assert(((sizeof(size_invs)) / sizeof(unsigned)) + 3 - >= (SMALL_MAX_DEFAULT >> QUANTUM_2POW_MIN)); /* * Avoid doing division with a variable divisor if possible. Using @@ -2203,26 +2458,89 @@ regind = (diff >> log2_table[size - 1]); else if (size <= 32768) regind = diff >> (8 + log2_table[(size >> 8) - 1]); - else { - /* - * The run size is too large for us to use the lookup - * table. Use real division. - */ + else regind = diff / size; - } - } else if (size <= (((sizeof(size_invs) / sizeof(unsigned)) + 2) - << QUANTUM_2POW_MIN)) { - regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff; - regind >>= SIZE_INV_SHIFT; - } else { + } else if (size < qspace_max) { /* - * size_invs isn't large enough to handle this size class, so - * calculate regind using actual division. This only happens - * if the user increases small_max via the 'S' runtime - * configuration option. + * To divide by a number D that is not a power of two we + * multiply by (2^21 / D) and then right shift by 21 positions. + * + * X / D + * + * becomes + * + * (X * qsize_invs[(D >> QUANTUM_2POW) - 3]) + * >> SIZE_INV_SHIFT + * + * We can omit the first three elements, because we never + * divide by 0, and QUANTUM and 2*QUANTUM are both powers of + * two, which are handled above. */ - regind = diff / size; - }; +#define SIZE_INV_SHIFT 21 +#define QSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << QUANTUM_2POW)) + 1) + static const unsigned qsize_invs[] = { + QSIZE_INV(3), + QSIZE_INV(4), QSIZE_INV(5), QSIZE_INV(6), QSIZE_INV(7) +#if (QUANTUM_2POW < 4) + , + QSIZE_INV(8), QSIZE_INV(9), QSIZE_INV(10), QSIZE_INV(11), + QSIZE_INV(12),QSIZE_INV(13), QSIZE_INV(14), QSIZE_INV(15) +#endif + }; + assert(QUANTUM * (((sizeof(qsize_invs)) / sizeof(unsigned)) + 3) + >= (1U << QSPACE_MAX_2POW_DEFAULT)); + + if (size <= (((sizeof(qsize_invs) / sizeof(unsigned)) + 2) << + QUANTUM_2POW)) { + regind = qsize_invs[(size >> QUANTUM_2POW) - 3] * diff; + regind >>= SIZE_INV_SHIFT; + } else + regind = diff / size; +#undef QSIZE_INV + } else if (size < cspace_max) { +#define CSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << CACHELINE_2POW)) + 1) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 27 11:12:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2EED1065672; Wed, 27 Aug 2008 11:12:30 +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 76C68106568E for ; Wed, 27 Aug 2008 11:12:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43BE08FC1E for ; Wed, 27 Aug 2008 11:12:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RBCU4P064476 for ; Wed, 27 Aug 2008 11:12:30 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RBCUYa064474 for perforce@freebsd.org; Wed, 27 Aug 2008 11:12:30 GMT (envelope-from trasz@freebsd.org) Date: Wed, 27 Aug 2008 11:12:30 GMT Message-Id: <200808271112.m7RBCUYa064474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148600 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, 27 Aug 2008 11:12:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=148600 Change 148600 by trasz@trasz_traszkan on 2008/08/27 11:12:20 First attempt at nfs4acls diff. Affected files ... .. //depot/projects/trustedbsd/www/downloads/20080827-nfs4acls.diff#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 27 13:00:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 233BD1065687; Wed, 27 Aug 2008 13:00: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 DAD0E1065685 for ; Wed, 27 Aug 2008 13:00:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9B868FC17 for ; Wed, 27 Aug 2008 13:00:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RD0JQf083727 for ; Wed, 27 Aug 2008 13:00:19 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RD0JNK083725 for perforce@freebsd.org; Wed, 27 Aug 2008 13:00:19 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 27 Aug 2008 13:00:19 GMT Message-Id: <200808271300.m7RD0JNK083725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 148605 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, 27 Aug 2008 13:00:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=148605 Change 148605 by rpaulo@rpaulo_phi on 2008/08/27 12:59:21 Expand snd_scale and rcv_scale as per RFC 1323. Add more debugging information. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#14 edit .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#18 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#13 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#14 $ */ #include @@ -62,6 +62,8 @@ head = cp->pktshead; assert(head != NULL); + DPRINTF(DEBUG_DUMP, "%s: %p %p\n", __func__, cp, head); + dp = malloc(sizeof(*dp)); if (dp == NULL) { fprintf(stderr, "%s: malloc failed\n", __func__); @@ -88,7 +90,12 @@ va_list ap; assert(cp != NULL); - assert(cp->pktshead != NULL); + /* + * XXX: might happen. explain why + */ + if (cp->pktshead == NULL) + return; + //assert(cp->pktshead != NULL); for (i = 0; i < 3000; i++) { snprintf(path, sizeof(path), "%s/dump%03d.txt", DUMPER_PATH, i); @@ -189,4 +196,5 @@ } free(head); cp->pktshead = NULL; + DPRINTF(DEBUG_DUMP, "freeing done\n"); } ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#18 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#17 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#18 $ */ #include @@ -304,7 +304,7 @@ return (cp); } tp->irs = th->th_seq; - tp->rcv_wnd = th->th_win; + tp->rcv_wnd = th->th_win >> tp->rcv_scale; } /* @@ -334,8 +334,8 @@ return (NULL); } break; - default: - dumper_error(cp, "RST with no known state"); + //default: + //dumper_error(cp, "RST with no known state"); } } /* @@ -473,7 +473,7 @@ if (SEQ_LT(tp->snd_wl1, th->th_seq) || (tp->snd_wl1 == th->th_seq && SEQ_LEQ(tp->snd_wl2, th->th_ack))) { - tp->snd_wnd = th->th_win; + tp->snd_wnd = th->th_win << tp->snd_scale; tp->snd_wl1 = th->th_seq; tp->snd_wl2 = th->th_ack; } From owner-p4-projects@FreeBSD.ORG Wed Aug 27 15:18:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96C5B1065686; Wed, 27 Aug 2008 15:18: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 5A3C1106567C for ; Wed, 27 Aug 2008 15:18:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 504148FC22 for ; Wed, 27 Aug 2008 15:18:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RFIics099247 for ; Wed, 27 Aug 2008 15:18:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFIihK099245 for perforce@freebsd.org; Wed, 27 Aug 2008 15:18:44 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 15:18:44 GMT Message-Id: <200808271518.m7RFIihK099245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148617 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, 27 Aug 2008 15:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=148617 Change 148617 by sam@sam_ebb on 2008/08/27 15:18:37 track crypto changes Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#20 (text+ko) ==== @@ -685,7 +685,7 @@ const struct ieee80211_cipher *cip = wk->wk_cipher; int keylen = wk->wk_keylen; - if (wk->wk_keyix == IEEE80211_KEYIX_NONE) + if ((wk->wk_flags & IEEE80211_KEY_DEVKEY) == 0) return; db_printf(tag, ix); switch (cip->ic_cipher) { @@ -739,6 +739,10 @@ db_printf("%srx", sep), sep = "+"; if (wk->wk_flags & IEEE80211_KEY_DEFAULT) db_printf("%sdef", sep), sep = "+"; + if (wk->wk_flags & IEEE80211_KEY_SWCRYPT) + db_printf("%sswcrypt", sep), sep = "+"; + if (wk->wk_flags & IEEE80211_KEY_SWMIC) + db_printf("%sswmic", sep), sep = "+"; } db_printf("\n"); } From owner-p4-projects@FreeBSD.ORG Wed Aug 27 15:21:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED3BA106567B; Wed, 27 Aug 2008 15:21: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 B16A01065670 for ; Wed, 27 Aug 2008 15:21:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6EE78FC2B for ; Wed, 27 Aug 2008 15:21:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RFLlrS099627 for ; Wed, 27 Aug 2008 15:21:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFLleI099625 for perforce@freebsd.org; Wed, 27 Aug 2008 15:21:47 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 15:21:47 GMT Message-Id: <200808271521.m7RFLleI099625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148619 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, 27 Aug 2008 15:21:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=148619 Change 148619 by sam@sam_ebb on 2008/08/27 15:20:49 don't display key indices as +1, show the actual value Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#21 (text+ko) ==== @@ -691,30 +691,30 @@ switch (cip->ic_cipher) { case IEEE80211_CIPHER_WEP: /* compatibility */ - db_printf(" wepkey %u:%s", wk->wk_keyix+1, + db_printf(" wepkey %u:%s", wk->wk_keyix, keylen <= 5 ? "40-bit" : keylen <= 13 ? "104-bit" : "128-bit"); break; case IEEE80211_CIPHER_TKIP: if (keylen > 128/8) keylen -= 128/8; /* ignore MIC for now */ - db_printf(" TKIP %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" TKIP %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_OCB: - db_printf(" AES-OCB %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" AES-OCB %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_CCM: - db_printf(" AES-CCM %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" AES-CCM %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_CKIP: - db_printf(" CKIP %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" CKIP %u:%u-bit", wk->wk_keyix, 8*keylen); break; case IEEE80211_CIPHER_NONE: - db_printf(" NULL %u:%u-bit", wk->wk_keyix+1, 8*keylen); + db_printf(" NULL %u:%u-bit", wk->wk_keyix, 8*keylen); break; default: db_printf(" UNKNOWN (0x%x) %u:%u-bit", - cip->ic_cipher, wk->wk_keyix+1, 8*keylen); + cip->ic_cipher, wk->wk_keyix, 8*keylen); break; } if (memcmp(wk->wk_key, zerodata, keylen) != 0) { From owner-p4-projects@FreeBSD.ORG Wed Aug 27 15:25:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E270C10656D6; Wed, 27 Aug 2008 15:25: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 A146810656A3 for ; Wed, 27 Aug 2008 15:25:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3BBD8FC18 for ; Wed, 27 Aug 2008 15:25:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RFPp1S099947 for ; Wed, 27 Aug 2008 15:25:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFPpB2099945 for perforce@freebsd.org; Wed, 27 Aug 2008 15:25:51 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 15:25:51 GMT Message-Id: <200808271525.m7RFPpB2099945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148620 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, 27 Aug 2008 15:25:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=148620 Change 148620 by sam@sam_ebb on 2008/08/27 15:25:17 be consistent in checking ni_chw Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#41 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#14 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#41 (text+ko) ==== @@ -2227,7 +2227,7 @@ ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", ni->ni_flags & IEEE80211_NODE_HT ? - (ni->ni_chw == 20 ? ", HT20" : ", HT40") : "", + (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ", fast-frames" : "", ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#14 (text+ko) ==== @@ -1545,7 +1545,7 @@ ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", ni->ni_flags & IEEE80211_NODE_HT ? - (ni->ni_chw == 20 ? ", HT20" : ", HT40") : "", + (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ? ", fast-frames" : "", From owner-p4-projects@FreeBSD.ORG Wed Aug 27 15:38:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03CD5106568B; Wed, 27 Aug 2008 15:38: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 88E911065675 for ; Wed, 27 Aug 2008 15:38:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F5668FC32 for ; Wed, 27 Aug 2008 15:38:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RFc4xW001163 for ; Wed, 27 Aug 2008 15:38:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFc4ks001161 for perforce@freebsd.org; Wed, 27 Aug 2008 15:38:04 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 15:38:04 GMT Message-Id: <200808271538.m7RFc4ks001161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148622 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, 27 Aug 2008 15:38:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=148622 Change 148622 by sam@sam_ebb on 2008/08/27 15:37:44 Fix mic calculation when final data is entirely in a trailing mbuf; it's unclear if this can happen on freebsd but does appear on netbsd. Identified by Matthias Drochner who came up with an initial change that we then revised together. Reviewed by: thompsa, sephe, avatar Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#15 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#15 (text+ko) ==== @@ -910,7 +910,17 @@ data += sizeof(uint32_t), space -= sizeof(uint32_t); data_len -= sizeof(uint32_t); } - if (data_len < sizeof(uint32_t)) + /* + * NB: when space is zero we make one more trip around + * the loop to advance to the next mbuf where there is + * data. This handles the case where there are 4*n + * bytes in an mbuf followed by <4 bytes in a later mbuf. + * By making an extra trip we'll drop out of the loop + * with m pointing at the mbuf with 3 bytes and space + * set as required by the remainder handling below. + */ + if (data_len == 0 || + (data_len < sizeof(uint32_t) && space != 0)) break; m = m->m_next; if (m == NULL) { @@ -957,6 +967,14 @@ space = m->m_len; } } + /* + * Catch degenerate cases like mbuf[4*n+1 bytes] followed by + * mbuf[2 bytes]. I don't believe these should happen; if they + * do then we'll need more involved logic. + */ + KASSERT(data_len <= space, + ("not enough data, data_len %u space %u\n", data_len, space)); + /* Last block and padding (0x5a, 4..7 x 0) */ switch (data_len) { case 0: From owner-p4-projects@FreeBSD.ORG Wed Aug 27 15:47:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537051065672; Wed, 27 Aug 2008 15:47: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 168891065670 for ; Wed, 27 Aug 2008 15:47:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E72D78FC1A for ; Wed, 27 Aug 2008 15:47:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RFlD7S001895 for ; Wed, 27 Aug 2008 15:47:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RFlD1j001891 for perforce@freebsd.org; Wed, 27 Aug 2008 15:47:13 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 15:47:13 GMT Message-Id: <200808271547.m7RFlD1j001891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148623 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, 27 Aug 2008 15:47:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148623 Change 148623 by sam@sam_ebb on 2008/08/27 15:46:34 diff reduction against a private tree Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#38 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#38 (text+ko) ==== @@ -823,7 +823,7 @@ * Stop BA stream if setup so driver has a chance * to reclaim any resources it might have allocated. */ - ic->ic_addba_stop(ni, &ni->ni_tx_ampdu[i]); + ic->ic_addba_stop(ni, tap); tap->txa_lastsample = 0; tap->txa_avgpps = 0; /* NB: clearing NAK means we may re-send ADDBA */ From owner-p4-projects@FreeBSD.ORG Wed Aug 27 16:04:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDAF31065670; Wed, 27 Aug 2008 16:04: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 88B131065675 for ; Wed, 27 Aug 2008 16:04:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F8618FC1B for ; Wed, 27 Aug 2008 16:04:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RG4VcG005789 for ; Wed, 27 Aug 2008 16:04:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RG4Vtb005787 for perforce@freebsd.org; Wed, 27 Aug 2008 16:04:31 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 16:04:31 GMT Message-Id: <200808271604.m7RG4Vtb005787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148624 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, 27 Aug 2008 16:04:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=148624 Change 148624 by sam@sam_ebb on 2008/08/27 16:03:35 fix channel width handling for sta's associating to an ap; this was broken when ieee80211_parse_htcap was changed to only parse ie's and push state to the node; we need to also update ni_chw to reflect htcap contents because no htinfo state is provided in an AssocReq frame Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#39 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#19 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#15 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#24 (text+ko) ==== @@ -2039,7 +2039,7 @@ return; } ieee80211_ht_node_init(ni); - ieee80211_parse_htcap(ni, htcap); + ieee80211_ht_updatehtcap(ni, htcap); } else if (ni->ni_flags & IEEE80211_NODE_HT) ieee80211_ht_node_cleanup(ni); /* ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#39 (text+ko) ==== @@ -1196,24 +1196,13 @@ * parsing the contents of a beacon frame). */ static void -htinfo_update_chw(struct ieee80211_node *ni, - const struct ieee80211_ie_htinfo *htinfo) +htinfo_update_chw(struct ieee80211_node *ni, int htflags) { struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211_channel *c; - int htflags, chanflags; + int chanflags; - /* NB: honor operating mode constraint */ - htflags = (vap->iv_flags_ext & IEEE80211_FEXT_HT) ? - IEEE80211_CHAN_HT20 : 0; - if ((htinfo->hi_byte1 & IEEE80211_HTINFO_TXWIDTH_2040) && - (vap->iv_flags_ext & IEEE80211_FEXT_USEHT40)) { - if (ni->ni_ht2ndchan == IEEE80211_HTINFO_2NDCHAN_ABOVE) - htflags = IEEE80211_CHAN_HT40U; - else if (ni->ni_ht2ndchan == IEEE80211_HTINFO_2NDCHAN_BELOW) - htflags = IEEE80211_CHAN_HT40D; - } chanflags = (ni->ni_chan->ic_flags &~ IEEE80211_CHAN_HT) | htflags; if (chanflags != ni->ni_chan->ic_flags) { /* XXX not right for ht40- */ @@ -1254,11 +1243,53 @@ ieee80211_ht_updateparams(struct ieee80211_node *ni, const uint8_t *htcapie, const uint8_t *htinfoie) { + struct ieee80211vap *vap = ni->ni_vap; + const struct ieee80211_ie_htinfo *htinfo; + int htflags; + ieee80211_parse_htcap(ni, htcapie); if (htinfoie[0] == IEEE80211_ELEMID_VENDOR) htinfoie += 4; - htinfo_parse(ni, (const struct ieee80211_ie_htinfo *) htinfoie); - htinfo_update_chw(ni, (const struct ieee80211_ie_htinfo *) htinfoie); + htinfo = (const struct ieee80211_ie_htinfo *) htinfoie; + htinfo_parse(ni, htinfo); + + htflags = (vap->iv_flags_ext & IEEE80211_FEXT_HT) ? + IEEE80211_CHAN_HT20 : 0; + /* NB: honor operating mode constraint */ + if ((htinfo->hi_byte1 & IEEE80211_HTINFO_TXWIDTH_2040) && + (vap->iv_flags_ext & IEEE80211_FEXT_USEHT40)) { + if (ni->ni_ht2ndchan == IEEE80211_HTINFO_2NDCHAN_ABOVE) + htflags = IEEE80211_CHAN_HT40U; + else if (ni->ni_ht2ndchan == IEEE80211_HTINFO_2NDCHAN_BELOW) + htflags = IEEE80211_CHAN_HT40D; + } + htinfo_update_chw(ni, htflags); +} + +/* + * Parse and update HT-related state extracted from the HT cap ie + * for a station joining an HT BSS. + */ +void +ieee80211_ht_updatehtcap(struct ieee80211_node *ni, const uint8_t *htcapie) +{ + struct ieee80211vap *vap = ni->ni_vap; + int htflags; + + ieee80211_parse_htcap(ni, htcapie); + + /* NB: honor operating mode constraint */ + /* XXX 40 MHZ intolerant */ + htflags = (vap->iv_flags_ext & IEEE80211_FEXT_HT) ? + IEEE80211_CHAN_HT20 : 0; + if ((ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) && + (vap->iv_flags_ext & IEEE80211_FEXT_USEHT40)) { + if (IEEE80211_IS_CHAN_HT40U(vap->iv_bss->ni_chan)) + htflags = IEEE80211_CHAN_HT40U; + else if (IEEE80211_IS_CHAN_HT40D(vap->iv_bss->ni_chan)) + htflags = IEEE80211_CHAN_HT40D; + } + htinfo_update_chw(ni, htflags); } /* ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#19 (text+ko) ==== @@ -180,6 +180,7 @@ void ieee80211_parse_htinfo(struct ieee80211_node *, const uint8_t *); void ieee80211_ht_updateparams(struct ieee80211_node *, const uint8_t *, const uint8_t *); +void ieee80211_ht_updatehtcap(struct ieee80211_node *, const uint8_t *); void ieee80211_recv_action(struct ieee80211_node *, const uint8_t *, const uint8_t *); int ieee80211_ampdu_request(struct ieee80211_node *, ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#15 (text+ko) ==== @@ -1268,7 +1268,8 @@ ieee80211_wme_updateparams(vap); if (scan.ath != NULL) ieee80211_parse_athparams(ni, scan.ath, wh); - if (scan.htcap != NULL && scan.htinfo != NULL) { + if (scan.htcap != NULL && scan.htinfo != NULL && + (vap->iv_flags_ext & IEEE80211_FEXT_HT)) { ieee80211_ht_updateparams(ni, scan.htcap, scan.htinfo); /* XXX state changes? */ From owner-p4-projects@FreeBSD.ORG Wed Aug 27 16:09:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 117891065683; Wed, 27 Aug 2008 16:09: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 C95F4106567B for ; Wed, 27 Aug 2008 16:09:36 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C07228FC18 for ; Wed, 27 Aug 2008 16:09:36 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RG9auY006192 for ; Wed, 27 Aug 2008 16:09:36 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RG9aok006190 for perforce@freebsd.org; Wed, 27 Aug 2008 16:09:36 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 27 Aug 2008 16:09:36 GMT Message-Id: <200808271609.m7RG9aok006190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 148625 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, 27 Aug 2008 16:09:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=148625 Change 148625 by sson@sson_amd64 on 2008/08/27 16:09:12 Man page update: minfree is configurable. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#19 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#18 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#19 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -63,7 +63,8 @@ .It Va minfree The minimum free space required on the file system audit logs are being written to. When the free space falls below this limit a warning will be issued. -Not currently used as the value of 20 percent is chosen by the kernel. +If no value for the minimum free space is set, the default of 20 percent is +applied by the kernel. .It Va policy A list of global audit policy flags specifying various behaviors, such as fail stop, auditing of paths and arguments, etc. @@ -185,6 +186,7 @@ .It Pa /etc/security/audit_control .El .Sh SEE ALSO +.Xr auditon 2 , .Xr audit 4 , .Xr audit_class 5 , .Xr audit_event 5 , From owner-p4-projects@FreeBSD.ORG Wed Aug 27 16:48:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A4731065676; Wed, 27 Aug 2008 16:48: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 38BB3106568A for ; Wed, 27 Aug 2008 16:48:16 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30EB28FC15 for ; Wed, 27 Aug 2008 16:48:16 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RGmGiV020295 for ; Wed, 27 Aug 2008 16:48:16 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RGmG5d020293 for perforce@freebsd.org; Wed, 27 Aug 2008 16:48:16 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 27 Aug 2008 16:48:16 GMT Message-Id: <200808271648.m7RGmG5d020293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148628 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, 27 Aug 2008 16:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=148628 Change 148628 by ed@ed_dull on 2008/08/27 16:48:04 Fix a deadlock in TTY's. Not a kernel deadlock, but a situation where a TTY could become useless. Because we now only have one contiguous input buffer, there is a way for us to fill up the input buffer without needing to go into the high watermark, namely when we are in canonical mode and type in as much data as possble. Change the TTY discipline code to only enter the high watermark when we can't store any more data *and* when we actually have data available for read(). This means we must also fix up rint_poll() to return something (1) when there isn't actually any place to make pts(4) consumers happy. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#15 edit .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#5 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#15 (text+ko) ==== @@ -307,7 +307,6 @@ ttydisc_read(struct tty *tp, struct uio *uio, int ioflag) { int error; - size_t c; tty_lock_assert(tp, MA_OWNED); @@ -324,8 +323,8 @@ else error = ttydisc_read_raw_interbyte_timer(tp, uio, ioflag); - c = ttyinq_bytesleft(&tp->t_inq); - if (c >= tp->t_inlow) { + if (ttyinq_bytesleft(&tp->t_inq) >= tp->t_inlow || + ttyinq_bytescanonicalized(&tp->t_inq) == 0) { /* Unset the input watermark when we've got enough space. */ tty_hiwat_in_unblock(tp); } @@ -1003,7 +1002,20 @@ print: /* See if we can store this on the input queue. */ if (ttyinq_write_nofrag(&tp->t_inq, ob, ol, quote) != 0) { - /* We cannot. Enable the input watermark. */ + if (CMP_FLAG(i, IMAXBEL)) + ttyoutq_write_nofrag(&tp->t_outq, "\a", 1); + + /* + * Prevent a deadlock here. It may be possible that a + * user has entered so much data, there is no data + * available to read(), but the buffers are full anyway. + * + * Only enter the high watermark if the device driver + * can actually transmit something. + */ + if (ttyinq_bytescanonicalized(&tp->t_inq) == 0) + return (0); + tty_hiwat_in_block(tp); return (-1); } ==== //depot/projects/mpsafetty/sys/sys/ttydisc.h#5 (text+ko) ==== @@ -84,10 +84,21 @@ static __inline size_t ttydisc_rint_poll(struct tty *tp) { + size_t l; tty_lock_assert(tp, MA_OWNED); - return ttyinq_bytesleft(&tp->t_inq); + /* + * XXX: Still allow character input when there's no space in the + * buffers, but we haven't entered the high watermark. This is + * to allow backspace characters to be inserted when in + * canonical mode. + */ + l = ttyinq_bytesleft(&tp->t_inq); + if (l == 0 && (tp->t_flags & TF_HIWAT_IN) == 0) + return (1); + + return (l); } static __inline size_t From owner-p4-projects@FreeBSD.ORG Wed Aug 27 16:52:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D27031065673; Wed, 27 Aug 2008 16:52: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 967A51065670 for ; Wed, 27 Aug 2008 16:52:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E4AD8FC24 for ; Wed, 27 Aug 2008 16:52:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RGqKOo020693 for ; Wed, 27 Aug 2008 16:52:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RGqKD9020691 for perforce@freebsd.org; Wed, 27 Aug 2008 16:52:20 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Aug 2008 16:52:20 GMT Message-Id: <200808271652.m7RGqKD9020691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 148630 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, 27 Aug 2008 16:52:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=148630 Change 148630 by sam@sam_ebb on 2008/08/27 16:51:26 Add current transmit parameters for fixed rate handling so drivers don't duplicate this. These are setup according to the role of the node--the bss node for ap and adhoc modes need to use parameters that are the least common denomimator of all nodes in the bss; otherwise we are setting up params for a station joining a bss and we select those according to the capabilities of the station. This stuff needs more work as we do extra work due to having setup in common code paths shared by nodes using both roles. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#42 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#42 (text+ko) ==== @@ -202,6 +202,29 @@ } /* + * Fix tx parameters for a node according to ``association state''. + */ +static void +node_setuptxparms(struct ieee80211_node *ni) +{ + struct ieee80211vap *vap = ni->ni_vap; + + if (ni->ni_flags & IEEE80211_NODE_HT) { + if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) + ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11NA]; + else + ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11NG]; + } else { /* legacy rate handling */ + if (IEEE80211_IS_CHAN_A(ni->ni_chan)) + ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11A]; + else if (ni->ni_flags & IEEE80211_NODE_ERP) + ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11G]; + else + ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11B]; + } +} + +/* * Set/change the channel. The rate set is also updated as * to insure a consistent view by drivers. * XXX should be private but hostap needs it to deal with CSA @@ -211,10 +234,13 @@ struct ieee80211_channel *chan) { struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap = ni->ni_vap; + enum ieee80211_phymode mode; KASSERT(chan != IEEE80211_CHAN_ANYC, ("no channel")); ni->ni_chan = chan; + mode = ieee80211_chan2mode(chan); if (IEEE80211_IS_CHAN_HT(chan)) { /* * XXX Gotta be careful here; the rate set returned by @@ -224,7 +250,22 @@ * HT rate set in ni_htrates. */ ni->ni_htrates = *ieee80211_get_suphtrates(ic, chan); + /* + * Setup bss tx parameters based on operating mode. We + * use legacy rates when operating in a mixed HT+non-HT bss + * and non-ERP rates in 11g for mixed ERP+non-ERP bss. + */ + if (mode == IEEE80211_MODE_11NA && + (vap->iv_flags_ext & IEEE80211_FEXT_PUREN) == 0) + mode = IEEE80211_MODE_11A; + else if (mode == IEEE80211_MODE_11NG && + (vap->iv_flags_ext & IEEE80211_FEXT_PUREN) == 0) + mode = IEEE80211_MODE_11G; + if (mode == IEEE80211_MODE_11G && + (vap->iv_flags & IEEE80211_F_PUREG) == 0) + mode = IEEE80211_MODE_11B; } + ni->ni_txparms = &vap->iv_txparms[mode]; ni->ni_rates = *ieee80211_get_suprates(ic, chan); } @@ -541,8 +582,8 @@ /* * Check if the current channel needs to change based on whether - * any vap's are using HT20/HT40. This is used sync the state of - * ic_curchan after a channel width change on a running vap. + * any vap's are using HT20/HT40. This is used to sync the state + * of ic_curchan after a channel width change on a running vap. */ void ieee80211_sync_curchan(struct ieee80211com *ic) @@ -965,6 +1006,7 @@ ni->ni_chan = IEEE80211_CHAN_ANYC; ni->ni_authmode = IEEE80211_AUTH_OPEN; ni->ni_txpower = ic->ic_txpowlimit; /* max power */ + ni->ni_txparms = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); ni->ni_avgrssi = IEEE80211_RSSI_DUMMY_MARKER; ni->ni_inact_reload = nt->nt_inact_init; @@ -999,6 +1041,8 @@ ni = ic->ic_node_alloc(vap, macaddr); if (ni != NULL) { + struct ieee80211_node *bss = vap->iv_bss; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, "%s %p<%s>\n", __func__, ni, ether_sprintf(macaddr)); @@ -1007,12 +1051,13 @@ ni->ni_vap = vap; IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr); - IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid); + IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid); ieee80211_node_initref(ni); /* mark referenced */ /* NB: required by ieee80211_fix_rate */ - ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan); + ieee80211_node_set_chan(ni, bss->ni_chan); ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); + ni->ni_txpower = bss->ni_txpower; /* XXX optimize away */ IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); IEEE80211_NODE_WDSQ_INIT(ni, "unknown"); @@ -1032,13 +1077,13 @@ ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr); if (ni != NULL) { + struct ieee80211_node *bss = vap->iv_bss; /* * Inherit from iv_bss. */ - ni->ni_authmode = vap->iv_bss->ni_authmode; - ni->ni_vlan = vap->iv_bss->ni_vlan; /* XXX?? */ - IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid); - ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan); + copy_bss(ni, bss); + IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid); + ieee80211_node_set_chan(ni, bss->ni_chan); } return ni; } @@ -1065,8 +1110,7 @@ /* * Inherit any manually configured settings. */ - ni->ni_authmode = vap->iv_bss->ni_authmode; - ni->ni_vlan = vap->iv_bss->ni_vlan; + copy_bss(ni, vap->iv_bss); ieee80211_node_set_chan(ni, chan); /* NB: propagate ssid so available to WPA supplicant */ ni->ni_esslen = vap->iv_des_ssid[0].len; @@ -1238,6 +1282,7 @@ if (vap->iv_flags & IEEE80211_F_FF) ni->ni_flags |= IEEE80211_NODE_FF; } + node_setuptxparms(ni); if (ic->ic_newassoc != NULL) ic->ic_newassoc(ni, 1); /* XXX not right for 802.1x/WPA */ @@ -1295,6 +1340,7 @@ struct ieee80211com *ic = vap->iv_ic; ieee80211_init_neighbor(ni, wh, sp); + node_setuptxparms(ni); if (ic->ic_newassoc != NULL) ic->ic_newassoc(ni, 1); /* XXX not right for 802.1x/WPA */ @@ -2235,6 +2281,7 @@ ", turbo" : "" ); + node_setuptxparms(ni); /* give driver a chance to setup state like ni_txrate */ if (ic->ic_newassoc != NULL) ic->ic_newassoc(ni, newassoc); ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#21 (text+ko) ==== @@ -126,6 +126,7 @@ uint16_t ni_ath_defkeyix;/* Atheros def key index */ uint16_t ni_associd; /* assoc response */ uint16_t ni_txpower; /* current transmit power */ + const struct ieee80211_txparam *ni_txparms; uint16_t ni_vlan; /* vlan tag */ uint32_t ni_jointime; /* time of join (secs) */ uint32_t *ni_challenge; /* shared-key challenge */ From owner-p4-projects@FreeBSD.ORG Wed Aug 27 17:09:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BCE91065677; Wed, 27 Aug 2008 17:09: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 4F8401065686 for ; Wed, 27 Aug 2008 17:09:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 456878FC12 for ; Wed, 27 Aug 2008 17:09:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RH9hvC023749 for ; Wed, 27 Aug 2008 17:09:43 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RH9hQE023747 for perforce@freebsd.org; Wed, 27 Aug 2008 17:09:43 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 27 Aug 2008 17:09:43 GMT Message-Id: <200808271709.m7RH9hQE023747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148631 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, 27 Aug 2008 17:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=148631 Change 148631 by ed@ed_dull on 2008/08/27 17:09:16 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/Symbol.map#3 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/mpsafetty/lib/libc/sys/execve.2#2 integrate .. //depot/projects/mpsafetty/lib/libc/sys/wait.2#2 integrate .. //depot/projects/mpsafetty/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/mpsafetty/sbin/ping6/ping6.8#2 integrate .. //depot/projects/mpsafetty/sbin/ping6/ping6.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/wi.4#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/mpsafetty/sys/conf/files.mips#2 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#2 integrate .. //depot/projects/mpsafetty/sys/conf/options#10 integrate .. //depot/projects/mpsafetty/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/mpsafetty/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/mpsafetty/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exit.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#33 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#16 edit .. //depot/projects/mpsafetty/sys/modules/wi/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf.h#3 integrate .. //depot/projects/mpsafetty/sys/net/bpf_jitter.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#5 edit .. //depot/projects/mpsafetty/sys/sys/wait.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#3 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/bpf_test.c#3 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0001.h#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0075.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0076.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0077.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0078.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0079.h#1 branch .. //depot/projects/mpsafetty/usr.bin/netstat/inet.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libc/include/libc_private.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.19 2008/06/23 05:22:06 ed Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.20 2008/08/27 02:00:53 jasone Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -158,6 +158,12 @@ extern const char *__progname; /* + * This function is used by the threading libraries to notify malloc that a + * thread is exiting. + */ +void _malloc_thread_cleanup(void); + +/* * These functions are used by the threading libraries in order to protect * malloc across fork(). */ ==== //depot/projects/mpsafetty/lib/libc/stdlib/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.8 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.9 2008/08/27 02:00:53 jasone Exp $ */ FBSD_1.0 { @@ -93,6 +93,7 @@ }; FBSDprivate_1.0 { + _malloc_thread_cleanup; _malloc_prefork; _malloc_postfork; __system; ==== //depot/projects/mpsafetty/lib/libc/stdlib/malloc.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.78 2008/02/17 17:09:24 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.79 2008/08/27 02:00:53 jasone Exp $ .\" -.Dd February 17, 2008 +.Dd August 26, 2008 .Dt MALLOC 3 .Os .Sh NAME @@ -154,7 +154,7 @@ implementation-dependent. .Sh TUNING Once, when the first call is made to one of these memory allocation -routines, various flags will be set or reset, which affect the +routines, various flags will be set or reset, which affects the workings of this allocator implementation. .Pp The @@ -196,6 +196,11 @@ Therefore, some applications may benefit from increasing or decreasing this threshold parameter. This option is not available for some configurations (non-PIC). +.It C +Double/halve the size of the maximum size class that is a multiple of the +cacheline size (64). +Above this size, subpage spacing (256 bytes) is used for size classes. +The default value is 512 bytes. .It D Use .Xr sbrk 2 @@ -214,6 +219,16 @@ The default is 512 pages per arena; .Ev MALLOC_OPTIONS=10f will prevent any dirty unused pages from accumulating. +.It G +When there are multiple threads, use thread-specific caching for objects that +are smaller than one page. +This option is enabled by default. +Thread-specific caching allows many allocations to be satisfied without +performing any thread synchronization, at the cost of increased memory use. +See the +.Dq R +option for related tuning information. +This option is not available for some configurations (non-PIC). .It J Each byte of new memory allocated by .Fn malloc , @@ -248,7 +263,7 @@ acquiring memory. .It N Double/halve the number of arenas. -The default number of arenas is four times the number of CPUs, or one if there +The default number of arenas is two times the number of CPUs, or one if there is a single CPU. .It P Various statistics are printed at program exit via an @@ -259,14 +274,18 @@ Therefore, this option should only be used with care; it is primarily intended as a performance tuning aid during application development. .It Q -Double/halve the size of the allocation quantum. -The default quantum is the minimum allowed by the architecture (typically 8 or -16 bytes). -.It S Double/halve the size of the maximum size class that is a multiple of the -quantum. -Above this size, power-of-two spacing is used for size classes. -The default value is 512 bytes. +quantum (8 or 16 bytes, depending on architecture). +Above this size, cacheline spacing is used for size classes. +The default value is 128 bytes. +.It R +Double/halve magazine size, which approximately doubles/halves the number of +rounds in each magazine. +Magazines are used by the thread-specific caching machinery to acquire and +release objects in bulk. +Increasing the magazine size decreases locking overhead, at the expense of +increased memory usage. +This option is not available for some configurations (non-PIC). .It U Generate .Dq utrace @@ -358,6 +377,13 @@ However, it may make sense to reduce the number of arenas if an application does not make much use of the allocation functions. .Pp +In addition to multiple arenas, this allocator supports thread-specific +caching for small objects (smaller than one page), in order to make it +possible to completely avoid synchronization for most small allocation requests. +Such caching allows very fast allocation in the common case, but it increases +memory usage and fragmentation, since a bounded number of objects can remain +allocated in each thread cache. +.Pp Memory is conceptually broken into equal-sized chunks, where the chunk size is a power of two that is greater than the page size. Chunks are always aligned to multiples of the chunk size. @@ -366,7 +392,7 @@ .Pp User objects are broken into three categories according to size: small, large, and huge. -Small objects are no larger than one half of a page. +Small objects are smaller than one page. Large objects are smaller than the chunk size. Huge objects are a multiple of the chunk size. Small and large objects are managed by arenas; huge objects are managed @@ -378,23 +404,24 @@ contiguous pages (unused, backing a set of small objects, or backing one large object). The combination of chunk alignment and chunk page maps makes it possible to -determine all metadata regarding small and large allocations in -constant and logarithmic time, respectively. +determine all metadata regarding small and large allocations in constant time. .Pp Small objects are managed in groups by page runs. Each run maintains a bitmap that tracks which regions are in use. -Allocation requests that are no more than half the quantum (see the +Allocation requests that are no more than half the quantum (8 or 16, depending +on architecture) are rounded up to the nearest power of two. +Allocation requests that are more than half the quantum, but no more than the +minimum cacheline-multiple size class (see the .Dq Q -option) are rounded up to the nearest power of two (typically 2, 4, or 8). -Allocation requests that are more than half the quantum, but no more than the -maximum quantum-multiple size class (see the -.Dq S option) are rounded up to the nearest multiple of the quantum. -Allocation requests that are larger than the maximum quantum-multiple size -class, but no larger than one half of a page, are rounded up to the nearest -power of two. -Allocation requests that are larger than half of a page, but small enough to -fit in an arena-managed chunk (see the +Allocation requests that are more than the minumum cacheline-multiple size +class, but no more than the minimum subpage-multiple size class (see the +.Dq C +option) are rounded up to the nearest multiple of the cacheline size (64). +Allocation requests that are more than the minimum subpage-multiple size class +are rounded up to the nearest multiple of the subpage size (256). +Allocation requests that are more than one page, but small enough to fit in +an arena-managed chunk (see the .Dq K option), are rounded up to the nearest run size. Allocation requests that are too large to fit in an arena-managed chunk are @@ -402,8 +429,8 @@ .Pp Allocations are packed tightly together, which can be an issue for multi-threaded applications. -If you need to assure that allocations do not suffer from cache line sharing, -round your allocation requests up to the nearest multiple of the cache line +If you need to assure that allocations do not suffer from cacheline sharing, +round your allocation requests up to the nearest multiple of the cacheline size. .Sh DEBUGGING MALLOC PROBLEMS The first thing to do is to set the ==== //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -35,6 +35,9 @@ * + Multiple arenas are used if there are multiple CPUs, which reduces lock * contention and cache sloshing. * + * + Thread-specific caching is used if there are multiple threads, which + * reduces the amount of locking. + * * + Cache line sharing between arenas is avoided for internal data * structures. * @@ -48,37 +51,49 @@ * and a 16 byte quantum on a 32-bit system, the size classes in each category * are as follows: * - * |=====================================| - * | Category | Subcategory | Size | - * |=====================================| - * | Small | Tiny | 2 | - * | | | 4 | - * | | | 8 | - * | |----------------+---------| - * | | Quantum-spaced | 16 | - * | | | 32 | - * | | | 48 | - * | | | ... | - * | | | 480 | - * | | | 496 | - * | | | 512 | - * | |----------------+---------| - * | | Sub-page | 1 kB | - * | | | 2 kB | - * |=====================================| - * | Large | 4 kB | - * | | 8 kB | - * | | 12 kB | - * | | ... | - * | | 1012 kB | - * | | 1016 kB | - * | | 1020 kB | - * |=====================================| - * | Huge | 1 MB | - * | | 2 MB | - * | | 3 MB | - * | | ... | - * |=====================================| + * |=======================================| + * | Category | Subcategory | Size | + * |=======================================| + * | Small | Tiny | 2 | + * | | | 4 | + * | | | 8 | + * | |------------------+---------| + * | | Quantum-spaced | 16 | + * | | | 32 | + * | | | 48 | + * | | | ... | + * | | | 96 | + * | | | 112 | + * | | | 128 | + * | |------------------+---------| + * | | Cacheline-spaced | 192 | + * | | | 256 | + * | | | 320 | + * | | | 384 | + * | | | 448 | + * | | | 512 | + * | |------------------+---------| + * | | Sub-page | 760 | + * | | | 1024 | + * | | | 1280 | + * | | | ... | + * | | | 3328 | + * | | | 3584 | + * | | | 3840 | + * |=======================================| + * | Large | 4 kB | + * | | 8 kB | + * | | 12 kB | + * | | ... | + * | | 1012 kB | + * | | 1016 kB | + * | | 1020 kB | + * |=======================================| + * | Huge | 1 MB | + * | | 2 MB | + * | | 3 MB | + * | | ... | + * |=======================================| * * A different mechanism is used for each category: * @@ -113,6 +128,19 @@ #endif /* + * MALLOC_TINY enables support for tiny objects, which are smaller than one + * quantum. + */ +#define MALLOC_TINY + +/* + * MALLOC_MAG enables a magazine-based thread-specific caching layer for small + * objects. This makes it possible to allocate/deallocate objects without any + * locking when the cache is in the steady state. + */ +#define MALLOC_MAG + +/* * MALLOC_BALANCE enables monitoring of arena lock contention and dynamically * re-balances arena load if exponentially averaged contention exceeds a * certain threshold. @@ -128,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.176 2008/08/14 17:31:42 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.177 2008/08/27 02:00:53 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -184,46 +212,63 @@ /* Size of stack-allocated buffer passed to strerror_r(). */ #define STRERROR_BUF 64 -/* Minimum alignment of allocations is 2^QUANTUM_2POW_MIN bytes. */ +/* + * The const_size2bin table is sized according to PAGESIZE_2POW, but for + * correctness reasons, we never assume that + * (pagesize == (1U << * PAGESIZE_2POW)). + * + * Minimum alignment of allocations is 2^QUANTUM_2POW bytes. + */ #ifdef __i386__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __ia64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 #endif #ifdef __alpha__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 13 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __sparc64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 13 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define NO_TLS #endif #ifdef __amd64__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 3 # define CPU_SPINWAIT __asm__ volatile("pause") #endif #ifdef __arm__ -# define QUANTUM_2POW_MIN 3 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __mips__ -# define QUANTUM_2POW_MIN 3 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif #ifdef __powerpc__ -# define QUANTUM_2POW_MIN 4 +# define PAGESIZE_2POW 12 +# define QUANTUM_2POW 4 # define SIZEOF_PTR_2POW 2 #endif +#define QUANTUM ((size_t)(1U << QUANTUM_2POW)) +#define QUANTUM_MASK (QUANTUM - 1) + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) /* sizeof(int) == (1U << SIZEOF_INT_2POW). */ @@ -237,6 +282,10 @@ #endif #ifdef NO_TLS + /* MALLOC_MAG requires TLS. */ +# ifdef MALLOC_MAG +# undef MALLOC_MAG +# endif /* MALLOC_BALANCE requires TLS. */ # ifdef MALLOC_BALANCE # undef MALLOC_BALANCE @@ -253,23 +302,42 @@ #define DIRTY_MAX_DEFAULT (1U << 9) /* - * Maximum size of L1 cache line. This is used to avoid cache line aliasing, - * so over-estimates are okay (up to a point), but under-estimates will - * negatively affect performance. + * Maximum size of L1 cache line. This is used to avoid cache line aliasing. + * In addition, this controls the spacing of cacheline-spaced size classes. */ #define CACHELINE_2POW 6 #define CACHELINE ((size_t)(1U << CACHELINE_2POW)) +#define CACHELINE_MASK (CACHELINE - 1) -/* Smallest size class to support. */ -#define TINY_MIN_2POW 1 +/* + * Subpages are an artificially designated partitioning of pages. Their only + * purpose is to support subpage-spaced size classes. + * + * There must be at least 4 subpages per page, due to the way size classes are + * handled. + */ +#define SUBPAGE_2POW 8 +#define SUBPAGE ((size_t)(1U << SUBPAGE_2POW)) +#define SUBPAGE_MASK (SUBPAGE - 1) + +#ifdef MALLOC_TINY + /* Smallest size class to support. */ +# define TINY_MIN_2POW 1 +#endif /* * Maximum size class that is a multiple of the quantum, but not (necessarily) * a power of 2. Above this size, allocations are rounded up to the nearest * power of 2. */ -#define SMALL_MAX_2POW_DEFAULT 9 -#define SMALL_MAX_DEFAULT (1U << SMALL_MAX_2POW_DEFAULT) +#define QSPACE_MAX_2POW_DEFAULT 7 + +/* + * Maximum size class that is a multiple of the cacheline, but not (necessarily) + * a power of 2. Above this size, allocations are rounded up to the nearest + * power of 2. + */ +#define CSPACE_MAX_2POW_DEFAULT 9 /* * RUN_MAX_OVRHD indicates maximum desired run header overhead. Runs are sized @@ -293,8 +361,7 @@ #define RUN_MAX_OVRHD_RELAX 0x00001800U /* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */ -#define RUN_MAX_SMALL_2POW 15 -#define RUN_MAX_SMALL (1U << RUN_MAX_SMALL_2POW) +#define RUN_MAX_SMALL (12 * pagesize) /* * Hyper-threaded CPUs may need a special instruction inside spin loops in @@ -319,6 +386,15 @@ */ #define BLOCK_COST_2POW 4 +#ifdef MALLOC_MAG + /* + * Default magazine size, in bytes. max_rounds is calculated to make + * optimal use of the space, leaving just enough room for the magazine + * header. + */ +# define MAG_SIZE_2POW_DEFAULT 9 +#endif + #ifdef MALLOC_BALANCE /* * We use an exponential moving average to track recent lock contention, @@ -369,6 +445,11 @@ */ uint64_t nrequests; +#ifdef MALLOC_MAG + /* Number of magazine reloads from this bin. */ + uint64_t nmags; +#endif + /* Total number of runs created for this bin's size class. */ uint64_t nruns; @@ -678,6 +759,35 @@ /******************************************************************************/ /* + * Magazine data structures. + */ + +#ifdef MALLOC_MAG +typedef struct mag_s mag_t; +struct mag_s { + size_t binind; /* Index of associated bin. */ + size_t nrounds; + void *rounds[1]; /* Dynamically sized. */ +}; + +/* + * Magazines are lazily allocated, but once created, they remain until the + * associated mag_rack is destroyed. + */ +typedef struct bin_mags_s bin_mags_t; +struct bin_mags_s { + mag_t *curmag; + mag_t *sparemag; +}; + +typedef struct mag_rack_s mag_rack_t; +struct mag_rack_s { + bin_mags_t bin_mags[1]; /* Dynamically sized. */ +}; +#endif + +/******************************************************************************/ +/* * Data. */ @@ -690,16 +800,147 @@ static size_t pagesize_2pow; /* Various bin-related settings. */ -static size_t bin_maxclass; /* Max size class for bins. */ -static unsigned ntbins; /* Number of (2^n)-spaced tiny bins. */ +#ifdef MALLOC_TINY /* Number of (2^n)-spaced tiny bins. */ +# define ntbins ((unsigned)(QUANTUM_2POW - TINY_MIN_2POW)) +#else +# define ntbins 0 +#endif static unsigned nqbins; /* Number of quantum-spaced bins. */ -static unsigned nsbins; /* Number of (2^n)-spaced sub-page bins. */ -static size_t small_min; -static size_t small_max; +static unsigned ncbins; /* Number of cacheline-spaced bins. */ +static unsigned nsbins; /* Number of subpage-spaced bins. */ +static unsigned nbins; +#ifdef MALLOC_TINY +# define tspace_max ((size_t)(QUANTUM >> 1)) +#endif +#define qspace_min QUANTUM +static size_t qspace_max; +static size_t cspace_min; +static size_t cspace_max; +static size_t sspace_min; +static size_t sspace_max; +#define bin_maxclass sspace_max + +static uint8_t const *size2bin; +/* + * const_size2bin is a static constant lookup table that in the common case can + * be used as-is for size2bin. For dynamically linked programs, this avoids + * a page of memory overhead per process. + */ +#define S2B_1(i) i, +#define S2B_2(i) S2B_1(i) S2B_1(i) +#define S2B_4(i) S2B_2(i) S2B_2(i) +#define S2B_8(i) S2B_4(i) S2B_4(i) +#define S2B_16(i) S2B_8(i) S2B_8(i) +#define S2B_32(i) S2B_16(i) S2B_16(i) +#define S2B_64(i) S2B_32(i) S2B_32(i) +#define S2B_128(i) S2B_64(i) S2B_64(i) +#define S2B_256(i) S2B_128(i) S2B_128(i) +static const uint8_t const_size2bin[(1U << PAGESIZE_2POW) - 255] = { + S2B_1(0xffU) /* 0 */ +#if (QUANTUM_2POW == 4) +/* 64-bit system ************************/ +# ifdef MALLOC_TINY + S2B_2(0) /* 2 */ + S2B_2(1) /* 4 */ + S2B_4(2) /* 8 */ + S2B_8(3) /* 16 */ +# define S2B_QMIN 3 +# else + S2B_16(0) /* 16 */ +# define S2B_QMIN 0 +# endif + S2B_16(S2B_QMIN + 1) /* 32 */ + S2B_16(S2B_QMIN + 2) /* 48 */ + S2B_16(S2B_QMIN + 3) /* 64 */ + S2B_16(S2B_QMIN + 4) /* 80 */ + S2B_16(S2B_QMIN + 5) /* 96 */ + S2B_16(S2B_QMIN + 6) /* 112 */ + S2B_16(S2B_QMIN + 7) /* 128 */ +# define S2B_CMIN (S2B_QMIN + 8) +#else +/* 32-bit system ************************/ +# ifdef MALLOC_TINY + S2B_2(0) /* 2 */ + S2B_2(1) /* 4 */ + S2B_4(2) /* 8 */ +# define S2B_QMIN 2 +# else + S2B_8(0) /* 8 */ +# define S2B_QMIN 0 +# endif + S2B_8(S2B_QMIN + 1) /* 16 */ + S2B_8(S2B_QMIN + 2) /* 24 */ + S2B_8(S2B_QMIN + 3) /* 32 */ + S2B_8(S2B_QMIN + 4) /* 40 */ + S2B_8(S2B_QMIN + 5) /* 48 */ + S2B_8(S2B_QMIN + 6) /* 56 */ + S2B_8(S2B_QMIN + 7) /* 64 */ + S2B_8(S2B_QMIN + 8) /* 72 */ + S2B_8(S2B_QMIN + 9) /* 80 */ + S2B_8(S2B_QMIN + 10) /* 88 */ + S2B_8(S2B_QMIN + 11) /* 96 */ + S2B_8(S2B_QMIN + 12) /* 104 */ + S2B_8(S2B_QMIN + 13) /* 112 */ + S2B_8(S2B_QMIN + 14) /* 120 */ + S2B_8(S2B_QMIN + 15) /* 128 */ +# define S2B_CMIN (S2B_QMIN + 16) +#endif +/****************************************/ + S2B_64(S2B_CMIN + 0) /* 192 */ + S2B_64(S2B_CMIN + 1) /* 256 */ + S2B_64(S2B_CMIN + 2) /* 320 */ + S2B_64(S2B_CMIN + 3) /* 384 */ + S2B_64(S2B_CMIN + 4) /* 448 */ + S2B_64(S2B_CMIN + 5) /* 512 */ +# define S2B_SMIN (S2B_CMIN + 6) + S2B_256(S2B_SMIN + 0) /* 768 */ + S2B_256(S2B_SMIN + 1) /* 1024 */ + S2B_256(S2B_SMIN + 2) /* 1280 */ + S2B_256(S2B_SMIN + 3) /* 1536 */ + S2B_256(S2B_SMIN + 4) /* 1792 */ + S2B_256(S2B_SMIN + 5) /* 2048 */ + S2B_256(S2B_SMIN + 6) /* 2304 */ + S2B_256(S2B_SMIN + 7) /* 2560 */ + S2B_256(S2B_SMIN + 8) /* 2816 */ + S2B_256(S2B_SMIN + 9) /* 3072 */ + S2B_256(S2B_SMIN + 10) /* 3328 */ + S2B_256(S2B_SMIN + 11) /* 3584 */ + S2B_256(S2B_SMIN + 12) /* 3840 */ +#if (PAGESIZE_2POW == 13) + S2B_256(S2B_SMIN + 13) /* 4096 */ + S2B_256(S2B_SMIN + 14) /* 4352 */ + S2B_256(S2B_SMIN + 15) /* 4608 */ + S2B_256(S2B_SMIN + 16) /* 4864 */ + S2B_256(S2B_SMIN + 17) /* 5120 */ + S2B_256(S2B_SMIN + 18) /* 5376 */ + S2B_256(S2B_SMIN + 19) /* 5632 */ + S2B_256(S2B_SMIN + 20) /* 5888 */ + S2B_256(S2B_SMIN + 21) /* 6144 */ + S2B_256(S2B_SMIN + 22) /* 6400 */ + S2B_256(S2B_SMIN + 23) /* 6656 */ + S2B_256(S2B_SMIN + 24) /* 6912 */ + S2B_256(S2B_SMIN + 25) /* 7168 */ + S2B_256(S2B_SMIN + 26) /* 7424 */ + S2B_256(S2B_SMIN + 27) /* 7680 */ + S2B_256(S2B_SMIN + 28) /* 7936 */ +#endif +}; +#undef S2B_1 +#undef S2B_2 +#undef S2B_4 +#undef S2B_8 +#undef S2B_16 +#undef S2B_32 +#undef S2B_64 +#undef S2B_128 +#undef S2B_256 +#undef S2B_QMIN +#undef S2B_CMIN +#undef S2B_SMIN -/* Various quantum-related settings. */ -static size_t quantum; -static size_t quantum_mask; /* (quantum - 1). */ +#ifdef MALLOC_MAG +static size_t max_rounds; +#endif /* Various chunk-related settings. */ static size_t chunksize; @@ -796,6 +1037,14 @@ static __thread arena_t *arenas_map; #endif +#ifdef MALLOC_MAG +/* + * Map of thread-specific magazine racks, used for thread-specific object + * caching. + */ +static __thread mag_rack_t *mag_rack; +#endif + #ifdef MALLOC_STATS /* Chunk statistics. */ static chunk_stats_t stats_chunks; @@ -818,13 +1067,17 @@ static bool opt_dss = true; static bool opt_mmap = true; #endif +#ifdef MALLOC_MAG +static bool opt_mag = true; +static size_t opt_mag_size_2pow = MAG_SIZE_2POW_DEFAULT; +#endif static size_t opt_dirty_max = DIRTY_MAX_DEFAULT; #ifdef MALLOC_BALANCE static uint64_t opt_balance_threshold = BALANCE_THRESHOLD_DEFAULT; #endif static bool opt_print_stats = false; -static size_t opt_quantum_2pow = QUANTUM_2POW_MIN; -static size_t opt_small_max_2pow = SMALL_MAX_2POW_DEFAULT; +static size_t opt_qspace_max_2pow = QSPACE_MAX_2POW_DEFAULT; +static size_t opt_cspace_max_2pow = CSPACE_MAX_2POW_DEFAULT; static size_t opt_chunk_2pow = CHUNK_2POW_DEFAULT; static bool opt_utrace = false; static bool opt_sysv = false; @@ -902,15 +1155,21 @@ static void arena_run_trim_tail(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize, bool dirty); static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin); -static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); -static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size); +static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin); +static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size); #ifdef MALLOC_BALANCE static void arena_lock_balance_hard(arena_t *arena); #endif +#ifdef MALLOC_MAG +static void mag_load(mag_t *mag); +#endif static void *arena_malloc_large(arena_t *arena, size_t size, bool zero); static void *arena_palloc(arena_t *arena, size_t alignment, size_t size, size_t alloc_size); static size_t arena_salloc(const void *ptr); +#ifdef MALLOC_MAG +static void mag_unload(mag_t *mag); +#endif static void arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr); static void arena_ralloc_large_shrink(arena_t *arena, arena_chunk_t *chunk, @@ -921,11 +1180,22 @@ static void *arena_ralloc(void *ptr, size_t size, size_t oldsize); static bool arena_new(arena_t *arena); static arena_t *arenas_extend(unsigned ind); +#ifdef MALLOC_MAG +static mag_t *mag_create(arena_t *arena, size_t binind); +static void mag_destroy(mag_t *mag); +static mag_rack_t *mag_rack_create(arena_t *arena); +static void mag_rack_destroy(mag_rack_t *rack); +#endif static void *huge_malloc(size_t size, bool zero); static void *huge_palloc(size_t alignment, size_t size); static void *huge_ralloc(void *ptr, size_t size, size_t oldsize); static void huge_dalloc(void *ptr); static void malloc_print_stats(void); +#ifdef MALLOC_DEBUG +static void size2bin_validate(void); +#endif +static bool size2bin_init(void); +static bool size2bin_init_hard(void); static bool malloc_init_hard(void); /* @@ -1063,18 +1333,23 @@ #define CHUNK_CEILING(s) \ (((s) + chunksize_mask) & ~chunksize_mask) +/* Return the smallest quantum multiple that is >= a. */ +#define QUANTUM_CEILING(a) \ + (((a) + QUANTUM_MASK) & ~QUANTUM_MASK) + /* Return the smallest cacheline multiple that is >= s. */ #define CACHELINE_CEILING(s) \ - (((s) + (CACHELINE - 1)) & ~(CACHELINE - 1)) + (((s) + CACHELINE_MASK) & ~CACHELINE_MASK) -/* Return the smallest quantum multiple that is >= a. */ -#define QUANTUM_CEILING(a) \ - (((a) + quantum_mask) & ~quantum_mask) +/* Return the smallest subpage multiple that is >= s. */ +#define SUBPAGE_CEILING(s) \ + (((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK) /* Return the smallest pagesize multiple that is >= s. */ #define PAGE_CEILING(s) \ (((s) + pagesize_mask) & ~pagesize_mask) +#ifdef MALLOC_TINY /* Compute the smallest power of 2 that is >= x. */ static inline size_t pow2_ceil(size_t x) @@ -1092,6 +1367,7 @@ x++; return (x); } +#endif #ifdef MALLOC_BALANCE /* @@ -1382,10 +1658,19 @@ arena->stats.ndalloc_small + arena->stats.ndalloc_large); malloc_printf("mapped: %12zu\n", arena->stats.mapped); - malloc_printf("bins: bin size regs pgs requests newruns" - " reruns maxruns curruns\n"); - for (i = 0, gap_start = UINT_MAX; i < ntbins + nqbins + nsbins; i++) { - if (arena->bins[i].stats.nrequests == 0) { +#ifdef MALLOC_MAG + if (__isthreaded && opt_mag) { + malloc_printf("bins: bin size regs pgs mags " + "newruns reruns maxruns curruns\n"); + } else { +#endif + malloc_printf("bins: bin size regs pgs requests " + "newruns reruns maxruns curruns\n"); +#ifdef MALLOC_MAG + } +#endif + for (i = 0, gap_start = UINT_MAX; i < nbins; i++) { + if (arena->bins[i].stats.nruns == 0) { if (gap_start == UINT_MAX) gap_start = i; } else { @@ -1404,10 +1689,15 @@ "%13u %1s %4u %4u %3u %9llu %9llu" " %9llu %7lu %7lu\n", i, - i < ntbins ? "T" : i < ntbins + nqbins ? "Q" : "S", + i < ntbins ? "T" : i < ntbins + nqbins ? "Q" : + i < ntbins + nqbins + ncbins ? "C" : "S", arena->bins[i].reg_size, arena->bins[i].nregs, arena->bins[i].run_size >> pagesize_2pow, +#ifdef MALLOC_MAG + (__isthreaded && opt_mag) ? + arena->bins[i].stats.nmags : +#endif arena->bins[i].stats.nrequests, arena->bins[i].stats.nruns, arena->bins[i].stats.reruns, @@ -2137,44 +2427,9 @@ static inline void arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size) { - /* - * To divide by a number D that is not a power of two we multiply - * by (2^21 / D) and then right shift by 21 positions. - * - * X / D - * - * becomes - * - * (X * size_invs[(D >> QUANTUM_2POW_MIN) - 3]) >> SIZE_INV_SHIFT - */ -#define SIZE_INV_SHIFT 21 -#define SIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << QUANTUM_2POW_MIN)) + 1) - static const unsigned size_invs[] = { - SIZE_INV(3), - SIZE_INV(4), SIZE_INV(5), SIZE_INV(6), SIZE_INV(7), - SIZE_INV(8), SIZE_INV(9), SIZE_INV(10), SIZE_INV(11), - SIZE_INV(12),SIZE_INV(13), SIZE_INV(14), SIZE_INV(15), - SIZE_INV(16),SIZE_INV(17), SIZE_INV(18), SIZE_INV(19), - SIZE_INV(20),SIZE_INV(21), SIZE_INV(22), SIZE_INV(23), - SIZE_INV(24),SIZE_INV(25), SIZE_INV(26), SIZE_INV(27), - SIZE_INV(28),SIZE_INV(29), SIZE_INV(30), SIZE_INV(31) -#if (QUANTUM_2POW_MIN < 4) - , - SIZE_INV(32), SIZE_INV(33), SIZE_INV(34), SIZE_INV(35), - SIZE_INV(36), SIZE_INV(37), SIZE_INV(38), SIZE_INV(39), - SIZE_INV(40), SIZE_INV(41), SIZE_INV(42), SIZE_INV(43), - SIZE_INV(44), SIZE_INV(45), SIZE_INV(46), SIZE_INV(47), - SIZE_INV(48), SIZE_INV(49), SIZE_INV(50), SIZE_INV(51), - SIZE_INV(52), SIZE_INV(53), SIZE_INV(54), SIZE_INV(55), - SIZE_INV(56), SIZE_INV(57), SIZE_INV(58), SIZE_INV(59), - SIZE_INV(60), SIZE_INV(61), SIZE_INV(62), SIZE_INV(63) -#endif - }; unsigned diff, regind, elm, bit; assert(run->magic == ARENA_RUN_MAGIC); - assert(((sizeof(size_invs)) / sizeof(unsigned)) + 3 - >= (SMALL_MAX_DEFAULT >> QUANTUM_2POW_MIN)); /* * Avoid doing division with a variable divisor if possible. Using @@ -2203,26 +2458,89 @@ regind = (diff >> log2_table[size - 1]); else if (size <= 32768) regind = diff >> (8 + log2_table[(size >> 8) - 1]); - else { - /* - * The run size is too large for us to use the lookup - * table. Use real division. - */ + else regind = diff / size; - } - } else if (size <= (((sizeof(size_invs) / sizeof(unsigned)) + 2) - << QUANTUM_2POW_MIN)) { - regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff; - regind >>= SIZE_INV_SHIFT; - } else { + } else if (size < qspace_max) { /* - * size_invs isn't large enough to handle this size class, so - * calculate regind using actual division. This only happens - * if the user increases small_max via the 'S' runtime - * configuration option. + * To divide by a number D that is not a power of two we + * multiply by (2^21 / D) and then right shift by 21 positions. + * + * X / D + * + * becomes + * + * (X * qsize_invs[(D >> QUANTUM_2POW) - 3]) + * >> SIZE_INV_SHIFT + * + * We can omit the first three elements, because we never + * divide by 0, and QUANTUM and 2*QUANTUM are both powers of + * two, which are handled above. */ - regind = diff / size; - }; +#define SIZE_INV_SHIFT 21 +#define QSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << QUANTUM_2POW)) + 1) + static const unsigned qsize_invs[] = { + QSIZE_INV(3), + QSIZE_INV(4), QSIZE_INV(5), QSIZE_INV(6), QSIZE_INV(7) +#if (QUANTUM_2POW < 4) + , + QSIZE_INV(8), QSIZE_INV(9), QSIZE_INV(10), QSIZE_INV(11), + QSIZE_INV(12),QSIZE_INV(13), QSIZE_INV(14), QSIZE_INV(15) +#endif + }; + assert(QUANTUM * (((sizeof(qsize_invs)) / sizeof(unsigned)) + 3) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 27 17:14:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12F561065745; Wed, 27 Aug 2008 17:14: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 CD36A1065743 for ; Wed, 27 Aug 2008 17:14:48 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB5B08FC1E for ; Wed, 27 Aug 2008 17:14:48 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RHEmJX024247 for ; Wed, 27 Aug 2008 17:14:48 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RHEmvx024245 for perforce@freebsd.org; Wed, 27 Aug 2008 17:14:48 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 27 Aug 2008 17:14:48 GMT Message-Id: <200808271714.m7RHEmvx024245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148633 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, 27 Aug 2008 17:14:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=148633 Change 148633 by ed@ed_dull on 2008/08/27 17:14:00 Hmmm... It seemed I committed my experimental TIOCPKT notification hooks by accident in my previous IFC commit. Well, leave it in for now, to make sure it doesn't get lost, but do make it compile. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#17 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#17 (text+ko) ==== @@ -486,7 +486,7 @@ } static void -ptsdrv_pktnotify(struct tty *tp) +ptsdrv_pktnotify(struct tty *tp, int event) { } From owner-p4-projects@FreeBSD.ORG Wed Aug 27 17:31:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6909106567A; Wed, 27 Aug 2008 17:31: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 69CA81065678 for ; Wed, 27 Aug 2008 17:31:05 +0000 (UTC) (envelope-from vi0@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FA468FC24 for ; Wed, 27 Aug 2008 17:31:05 +0000 (UTC) (envelope-from vi0@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RHV516025532 for ; Wed, 27 Aug 2008 17:31:05 GMT (envelope-from vi0@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RHV5SA025530 for perforce@freebsd.org; Wed, 27 Aug 2008 17:31:05 GMT (envelope-from vi0@FreeBSD.org) Date: Wed, 27 Aug 2008 17:31:05 GMT Message-Id: <200808271731.m7RHV5SA025530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to vi0@FreeBSD.org using -f From: Przemek Witaszczyk To: Perforce Change Reviews Cc: Subject: PERFORCE change 148635 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, 27 Aug 2008 17:31:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=148635 Change 148635 by vi0@vi0_gilgamesh.semihalf.com on 2008/08/27 17:30:58 - added mpc5k2 dedicated directory in sys/powerpc - added A. Turners ofwbus driver - added PIC driver skeleton, creted from sys/powerpc/powermac/hrowpic.c - the driver attach method fails (but is called) - kernel panics on no PIC found Affected files ... .. //depot/projects/soc2008/vi0/efika/contrib/ntp/FREEBSD-Xlist#3 add .. //depot/projects/soc2008/vi0/efika/contrib/ntp/FREEBSD-upgrade#3 add .. //depot/projects/soc2008/vi0/efika/crypto/openssh/FREEBSD-Xlist#3 add .. //depot/projects/soc2008/vi0/efika/crypto/openssh/RFC.nroff#3 add .. //depot/projects/soc2008/vi0/efika/etc/rc.d/kernel#3 add .. //depot/projects/soc2008/vi0/efika/kbuild#1 add .. //depot/projects/soc2008/vi0/efika/kernel/kernel#1 add .. //depot/projects/soc2008/vi0/efika/kernel/kernel.debug#1 add .. //depot/projects/soc2008/vi0/efika/kernel/kernel.symbols#1 add .. //depot/projects/soc2008/vi0/efika/kernel/send#1 add .. //depot/projects/soc2008/vi0/efika/lib/libc/stdlib/grantpt.3#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_aiboost.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_asus.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_fujitsu.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_ibm.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_panasonic.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_sony.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/acpi_toshiba.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/io.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/linux.4#3 add .. //depot/projects/soc2008/vi0/efika/share/man/man4/man4.i386/ndis.4#3 add .. //depot/projects/soc2008/vi0/efika/share/timedef/no_NO.ISO8859-1.src#3 add .. //depot/projects/soc2008/vi0/efika/share/timedef/no_NO.UTF-8.src#3 add .. //depot/projects/soc2008/vi0/efika/share/zoneinfo/Theory#3 add .. //depot/projects/soc2008/vi0/efika/sys/conf/files.powerpc#5 edit .. //depot/projects/soc2008/vi0/efika/sys/conf/files.powerpc.orig#2 delete .. //depot/projects/soc2008/vi0/efika/sys/dev/cxgb/cxgb_lro.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/LICENSE#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/README#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_80003es2lan.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_80003es2lan.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82540.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82541.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82541.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82542.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82543.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82543.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82571.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_82571.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_api.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_api.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_defines.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_hw.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_ich8lan.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_ich8lan.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_mac.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_mac.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_manage.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_manage.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_nvm.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_nvm.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_osdep.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_osdep.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_phy.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_phy.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/e1000_regs.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/if_em.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/em/if_em.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_82575.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_82575.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_api.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_api.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_defines.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_hw.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_mac.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_mac.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_manage.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_manage.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_nvm.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_nvm.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_osdep.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_osdep.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_phy.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_phy.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/e1000_regs.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/if_igb.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/igb/if_igb.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/dev/ofw/openfirm.c.orig#2 delete .. //depot/projects/soc2008/vi0/efika/sys/dev/ofw/openfirm.c.rej#1 add .. //depot/projects/soc2008/vi0/efika/sys/dev/ofw/openfirm.c.rej.orig#1 add .. //depot/projects/soc2008/vi0/efika/sys/kern/tty_conf.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_pcn.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_pcnreg.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_sis.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_sisreg.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_ste.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_stereg.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_tl.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_tlreg.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_wb.c#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_wbreg.h#3 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_xl.c#4 add .. //depot/projects/soc2008/vi0/efika/sys/pci/if_xlreg.h#4 add .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/locore.S#4 edit .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/locore.S.orig#2 delete .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/machdep.c#5 edit .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/machdep.c.orig#2 delete .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/mmu_oea.c#5 edit .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/mmu_oea.c.orig#2 delete .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/trap_subr.S#4 edit .. //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/trap_subr.S.orig#2 delete .. //depot/projects/soc2008/vi0/efika/sys/powerpc/conf/GENERIC#4 edit .. //depot/projects/soc2008/vi0/efika/sys/powerpc/include/psl.h#4 edit .. //depot/projects/soc2008/vi0/efika/sys/powerpc/mpc5k2/mpc5k2_pic.c#1 add .. //depot/projects/soc2008/vi0/efika/sys/powerpc/mpc5k2/mpc5k2_picvar.h#1 add .. //depot/projects/soc2008/vi0/efika/sys/powerpc/mpc5k2/ofwbus.c#1 add .. //depot/projects/soc2008/vi0/efika/sys/sys/linedisc.h#3 add .. //depot/projects/soc2008/vi0/efika/tbuild#1 add .. //depot/projects/soc2008/vi0/efika/usr.bin/window/:tt#3 add .. //depot/projects/soc2008/vi0/efika/usr.bin/window/:tty#3 add .. //depot/projects/soc2008/vi0/efika/usr.bin/window/:var#3 add .. //depot/projects/soc2008/vi0/efika/usr.bin/window/:ww#3 add Differences ... ==== //depot/projects/soc2008/vi0/efika/sys/conf/files.powerpc#5 (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.powerpc,v 1.79 2008/06/07 22:58:32 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.77 2008/04/30 00:50:50 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -27,7 +27,6 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb -dev/bm/if_bm.c optional bm powermac dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -78,6 +77,10 @@ powerpc/aim/uio_machdep.c optional aim powerpc/aim/uma_machdep.c optional aim powerpc/aim/vm_machdep.c optional aim +powerpc/aim/ofw_oea.S optional aim +powerpc/aim/ofwreal.S optional aim +powerpc/mpc5k2/mpc5k2_pic.c standard +powerpc/mpc5k2/ofwbus.c standard powerpc/booke/clock.c optional e500 powerpc/booke/copyinout.c optional e500 powerpc/booke/interrupt.c optional e500 @@ -108,7 +111,6 @@ powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata -powerpc/powermac/dbdma.c optional powermac pci powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci powerpc/powermac/macio.c optional powermac pci ==== //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/locore.S#4 (text+ko) ==== @@ -89,6 +89,9 @@ GLOBAL(esym) .long 0 /* end of symbol table */ +GLOBAL(firmstk) + .space PAGE_SIZE,8 + GLOBAL(ofmsr) .long 0, 0, 0, 0, 0 /* msr/sprg0-3 used in Open Firmware */ @@ -126,14 +129,8 @@ .text .globl __start __start: -#ifdef FIRMWORKSBUGS - mfmsr 0 - andi. 0,0,PSL_IR|PSL_DR - beq 1f - bl ofwr_init -1: -#endif + li 8,0 li 9,0x100 mtctr 9 ==== //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/machdep.c#5 (text+ko) ==== @@ -239,6 +239,9 @@ extern void *extint, *extsize; extern void *dblow, *dbsize; extern void *vectrap, *vectrapsize; +extern void *imisstrap, *imisssize; +extern void *dlmisstrap, *dlmisssize; +extern void *dsmisstrap, *dsmisssize; u_int powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) @@ -332,6 +335,9 @@ bcopy(&trapcode, (void *)EXC_SC, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_TRC, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_FPA, (size_t)&trapsize); + bcopy(&imisstrap, (void *)EXC_IMISS, (size_t)&imisssize); + bcopy(&dlmisstrap, (void *)EXC_DLMISS, (size_t)&dlmisssize); + bcopy(&dsmisstrap, (void *)EXC_DSMISS, (size_t)&dsmisssize); bcopy(&vectrap, (void *)EXC_VEC, (size_t)&vectrapsize); bcopy(&trapcode, (void *)EXC_VECAST, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_THRM, (size_t)&trapsize); ==== //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/mmu_oea.c#5 (text+ko) ==== @@ -661,6 +661,8 @@ trcp[0] = 0x1007; } +extern char *OF_buf; + void moea_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend) { @@ -898,6 +900,8 @@ kernel_pmap->pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT; kernel_pmap->pm_active = ~0; + OF_buf = (char *)moea_bootstrap_alloc(PAGE_SIZE, 0); + pmap_cpu_bootstrap(trace, 0); pmap_bootstrapped++; ==== //depot/projects/soc2008/vi0/efika/sys/powerpc/aim/trap_subr.S#4 (text+ko) ==== @@ -330,6 +330,209 @@ bla s_trap /* LR & 0xff00 is exception # */ CNAME(alisize) = .-CNAME(alitrap) + + /* + * It's G2 specific. Instuction TLB miss. + */ + .globl CNAME(imisstrap),CNAME(imisssize) +CNAME(imisstrap): + mfspr %r2, SPR_HASH1 /* get first pointer */ + addi %r1, 0, 8 /* load 8 for counter */ + mfctr %r0 /* save counter */ + mfspr %r3, SPR_ICMP /* get first compare value */ + addi %r2, %r2, -8 /* pre dec the pointer */ +im0: + mtctr %r1 /* load counter */ +im1: + lwzu %r1, 8(%r2) /* get next pte */ + cmp 0, %r1, %r3 /* see if found pte */ + bdnzf 2, im1 /* dec count br if cmp ne and if + * count not zero */ + bne instr_sec_hash /* if not found set up second hash + * or exit */ + lwz %r1, +4(%r2) /* load tlb entry lower-word */ + andi. %r3, %r1, 8 /* check G bit */ + bne do_isi_prot /* if guarded, take an ISI */ + mtctr %r0 /* restore counter */ + mfspr %r0, SPR_IMISS /* get the miss address for the tlbli */ + mfspr %r3, SPR_SRR1 /* get the saved cr0 bits */ + mtcrf 0x80, %r3 /* restore CR0 */ + mtspr SPR_RPA, %r1 /* set the pte */ + ori %r1, %r1, 0x100 /* set reference bit */ + srwi %r1, %r1, 8 /* get byte 7 of pte */ + tlbli %r0 /* load the itlb */ + stb %r1, +6(%r2) /* update page table */ + rfi /* return to executing program */ + +instr_sec_hash: + andi. %r1, %r3, 0x0040 /* see if we have done second hash */ + bne do_isi /* if so, go to ISI interrupt */ + mfspr %r2, SPR_HASH2 /* get the second pointer */ + ori %r3, %r3, 0x0040 /* change the compare value */ + addi %r1, %r0, 8 /* load 8 for counter */ + addi %r2, %r2, -8 /* pre dec for update on load */ + b im0 /* try second hash */ + +/* Create a faked ISI interrupt as the address was not found */ +do_isi_prot: + mfspr %r3, SPR_SRR1 /* get srr1 */ + andi. %r2, %r3, 0xffff /* clean upper srr1 */ + addis %r2, %r2, 0x0800 /* or in srr<4> = 1 to flag prot + * violation */ + b isi1 +do_isi: + mfspr %r3, SPR_SRR1 /* get srr1 */ + andi. %r2, %r3, 0xffff /* clean srr1 */ + addis %r2, %r2, 0x4000 /* or in srr1<1> = 1 to flag pte + * not found */ +isi1: + mtctr %r0 /* restore counter */ + mtspr SPR_SRR1, %r2 /* set srr1 */ + mfmsr %r0 /* get msr */ + xoris %r0, %r0, 0x2 /* flip the msr bit */ + mtcrf 0x80, %r3 /* restore CR0 */ + mtmsr %r0 /* flip back to the native gprs */ + ba EXC_ISI /* go to instr. access interrupt */ + +CNAME(imisssize) = .-CNAME(imisstrap) + +/* + * It's G2 specific. Data load TLB miss. + */ + .globl CNAME(dlmisstrap),CNAME(dlmisssize) +CNAME(dlmisstrap): + mfspr %r2, SPR_HASH1 /* get first pointer */ + addi %r1, 0, 8 /* load 8 for counter */ + mfctr %r0 /* save counter */ + mfspr %r3, SPR_DCMP /* get first compare value */ + addi %r2, %r2, -8 /* pre dec the pointer */ +dm0: + mtctr %r1 /* load counter */ +dm1: + lwzu %r1, 8(%r2) /* get next pte */ + cmp 0, 0, %r1, %r3 /* see if found pte */ + bdnzf 2, dm1 /* dec count br if cmp ne and if + * count not zero */ + bne data_sec_hash /* if not found set up second hash + * or exit */ + lwz %r1, +4(%r2) /* load tlb entry lower-word */ + mtctr %r0 /* restore counter */ + mfspr %r0, SPR_DMISS /* get the miss address for the tlbld */ + mfspr %r3, SPR_SRR1 /* get the saved cr0 bits */ + mtcrf 0x80, %r3 /* restore CR0 */ + mtspr SPR_RPA, %r1 /* set the pte */ + ori %r1, %r1, 0x100 /* set reference bit */ + srwi %r1, %r1, 8 /* get byte 7 of pte */ + tlbld %r0 /* load the dtlb */ + stb %r1, +6(%r2) /* update page table */ + rfi /* return to executing program */ + +data_sec_hash: + andi. %r1, %r3, 0x0040 /* see if we have done second hash */ + bne do_dsi /* if so, go to DSI interrupt */ + mfspr %r2, SPR_HASH2 /* get the second pointer */ + ori %r3, %r3, 0x0040 /* change the compare value */ + addi %r1, 0, 8 /* load 8 for counter */ + addi %r2, %r2, -8 /* pre dec for update on load */ + b dm0 /* try second hash */ + +CNAME(dlmisssize) = .-CNAME(dlmisstrap) + +/* + * It's G2 specific. Data store TLB miss. + */ + .globl CNAME(dsmisstrap),CNAME(dsmisssize) +CNAME(dsmisstrap): + mfspr %r2, SPR_HASH1 /* get first pointer */ + addi %r1, 0, 8 /* load 8 for counter */ + mfctr %r0 /* save counter */ + mfspr %r3, SPR_DCMP /* get first compare value */ + addi %r2, %r2, -8 /* pre dec the pointer */ +ds0: + mtctr %r1 /* load counter */ +ds1: + lwzu %r1, 8(%r2) /* get next pte */ + cmp 0, 0, %r1, %r3 /* see if found pte */ + bdnzf 2, ds1 /* dec count br if cmp ne and if + * count not zero */ + bne data_store_sec_hash /* if not found set up second hash + * or exit */ + lwz %r1, +4(%r2) /* load tlb entry lower-word */ + andi. %r3, %r1, 0x80 /* check the C-bit */ + beq data_store_chk_prot /* if (C==0) + * go check protection modes */ +ds2: + mtctr %r0 /* restore counter */ + mfspr %r0, SPR_DMISS /* get the miss address for the tlbld */ + mfspr %r3, SPR_SRR1 /* get the saved cr0 bits */ + mtcrf 0x80, %r3 /* restore CR0 */ + mtspr SPR_RPA, %r1 /* set the pte */ + tlbld %r0 /* load the dtlb */ + rfi /* return to executing program */ + +data_store_sec_hash: + andi. %r1, %r3, 0x0040 /* see if we have done second hash */ + bne do_dsi /* if so, go to DSI interrupt */ + mfspr %r2, SPR_HASH2 /* get the second pointer */ + ori %r3, %r3, 0x0040 /* change the compare value */ + addi %r1, 0, 8 /* load 8 for counter */ + addi %r2, %r2, -8 /* pre dec for update on load */ + b ds0 /* try second hash */ + +/* Check the protection before setting PTE(c-bit) */ +data_store_chk_prot: + rlwinm. %r3,%r1,30,0,1 /* test PP */ + bge- chk0 /* if (PP == 00 or PP == 01) + * goto chk0: */ + andi. %r3, %r1, 1 /* test PP[0] */ + beq+ chk2 /* return if PP[0] == 0 */ + b do_dsi_prot /* else DSIp */ +chk0: + mfspr %r3,SPR_SRR1 /* get old msr */ + andis. %r3,%r3,0x0008 /* test the KEY bit (SRR1-bit 12) */ + beq chk2 /* if (KEY==0) goto chk2: */ + b do_dsi_prot /* else do_dsi_prot */ +chk2: + ori %r1, %r1, 0x180 /* set reference and change bit */ + sth %r1, 6(%r2) /* update page table */ + b ds2 /* and back we go */ + +/* Create a faked DSI interrupt as the address was not found */ +do_dsi: + mfspr %r3, SPR_SRR1 /* get srr1 */ + rlwinm %r1,%r3,9,6,6 /* get srr1 to bit 6 for + * load/store, zero rest */ + addis %r1, %r1, 0x4000 /* or in dsisr<1> = 1 to flag pte + * not found */ + b dsi1 + +do_dsi_prot: + mfspr %r3, SPR_SRR1 /* get srr1 */ + rlwinm %r1,%r3,9,6,6 /* get srr1 to bit 6 for + *load/store, zero rest */ + addis %r1, %r1, 0x0800 /* or in dsisr<4> = 1 to flag prot + * violation */ + +dsi1: + mtctr %r0 /* restore counter */ + andi. %r2, %r3, 0xffff /* clear upper bits of srr1 */ + mtspr SPR_SRR1, %r2 /* set srr1 */ + mtspr SPR_DSISR, %r1 /* load the dsisr */ + mfspr %r1, SPR_DMISS /* get miss address */ + rlwinm. %r2,%r2,0,31,31 /* test LE bit */ + beq dsi2 /* if little endian then: */ + xor %r1, %r1, 0x07 /* de-mung the data address */ +dsi2: + mtspr SPR_DAR, %r1 /* put in dar */ + mfmsr %r0 /* get msr */ + xoris %r0, %r0, 0x2 /* flip the msr bit */ + mtcrf 0x80, %r3 /* restore CR0 */ + mtmsr %r0 /* flip back to the native gprs */ + ba EXC_DSI /* branch to DSI interrupt */ + +CNAME(dsmisssize) = .-CNAME(dsmisstrap) + + /* * Similar to the above for DSI * Has to handle BAT spills ==== //depot/projects/soc2008/vi0/efika/sys/powerpc/conf/GENERIC#4 (text+ko) ==== @@ -107,7 +107,8 @@ # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support device bge # Broadcom BCM570xx Gigabit Ethernet -device bm # Apple BMAC Ethernet +#??? config claims it's unknown device: ??? +#device bm # Apple BMAC Ethernet device gem # Sun GEM/Sun ERI/Apple GMAC device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) ==== //depot/projects/soc2008/vi0/efika/sys/powerpc/include/psl.h#4 (text+ko) ==== @@ -77,6 +77,7 @@ */ #define PSL_VEC 0x02000000 /* AltiVec vector unit available */ #define PSL_POW 0x00040000 /* power management */ +#define PSL_TGPR 0x00020000 /* temp. gpr remapping (mpc603e) */ #define PSL_ILE 0x00010000 /* interrupt endian mode (1 == le) */ #define PSL_EE 0x00008000 /* external interrupt enable */ #define PSL_PR 0x00004000 /* privilege mode (1 == user) */ @@ -86,6 +87,7 @@ #define PSL_SE 0x00000400 /* single-step trace enable */ #define PSL_BE 0x00000200 /* branch trace enable */ #define PSL_FE1 0x00000100 /* floating point interrupt mode 1 */ +#define PSL_CE 0x00000080 /* critical exception enable */ #define PSL_IP 0x00000040 /* interrupt prefix */ #define PSL_IR 0x00000020 /* instruction address relocation */ #define PSL_DR 0x00000010 /* data address relocation */ From owner-p4-projects@FreeBSD.ORG Wed Aug 27 19:51:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB0FA1065674; Wed, 27 Aug 2008 19:51:33 +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 6607F106564A for ; Wed, 27 Aug 2008 19:51:33 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B9E08FC18 for ; Wed, 27 Aug 2008 19:51:33 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RJpXij039692 for ; Wed, 27 Aug 2008 19:51:33 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RJpXKJ039690 for perforce@freebsd.org; Wed, 27 Aug 2008 19:51:33 GMT (envelope-from mayur@FreeBSD.org) Date: Wed, 27 Aug 2008 19:51:33 GMT Message-Id: <200808271951.m7RJpXKJ039690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 148645 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, 27 Aug 2008 19:51:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=148645 Change 148645 by mayur@mayur_freebsd_vm on 2008/08/27 19:51:04 Bug fixes and cleanup. Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/default_pager.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/device_pager.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/memguard.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/memguard.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/phys_pager.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/pmap.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.c#3 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.h#3 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/redzone.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/redzone.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/swap_pager.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/swap_pager.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_core.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_dbg.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_dbg.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_int.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_contig.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_extern.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_fault.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_glue.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_init.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_kern.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_kern.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.c#3 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_meter.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_mmap.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.c#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.h#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_page.c#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_page.h#3 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pageout.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pageout.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pager.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pager.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_param.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_phys.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_phys.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#4 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.h#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_unix.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_zeroidle.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vnode_pager.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vnode_pager.h#2 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/default_pager.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/device_pager.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/memguard.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/memguard.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/phys_pager.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/pmap.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.c#3 (text+ko) ==== @@ -253,6 +253,9 @@ rtidx_t slot; struct radix_node *tmp; + if(index > MASK(rtree->rt_height * rtree->rt_bits_per_level)){ + return NULL; + } level = rtree->rt_height - 1; tmp = rtree->rt_root; while (tmp){ @@ -278,6 +281,9 @@ SLIST_HEAD(, radix_node) rtree_path = SLIST_HEAD_INITIALIZER(rtree_path); + if(index > MASK(rtree->rt_height * rtree->rt_bits_per_level)) + return NULL; + level = rtree->rt_height - 1; tmp = rtree->rt_root; while (tmp){ @@ -294,9 +300,9 @@ */ tmp = SLIST_FIRST(&rtree_path); SLIST_REMOVE_HEAD(&rtree_path, next); - while (level != 0) + while (1) { - while(slot <= MASK(rtree->rt_bits_per_level) + while (slot <= MASK(rtree->rt_bits_per_level) && tmp->rn_children[slot] == NULL) slot++; if(slot > MASK(rtree->rt_bits_per_level)){ @@ -316,7 +322,6 @@ slot = 0; level--; } - return tmp; } level--; } @@ -336,6 +341,9 @@ SLIST_HEAD(, radix_node) rtree_path = SLIST_HEAD_INITIALIZER(rtree_path); + if(index > MASK(rtree->rt_height * rtree->rt_bits_per_level)) + index = MASK(rtree->rt_height * rtree->rt_bits_per_level); + level = rtree->rt_height - 1; tmp = rtree->rt_root; while (tmp){ @@ -352,11 +360,13 @@ */ tmp = SLIST_FIRST(&rtree_path); SLIST_REMOVE_HEAD(&rtree_path, next); - while (level != 0) - { - while(slot >= 0 - && tmp->rn_children[slot] == NULL) + while (1){ + while (slot > 0 + && tmp->rn_children[slot] == NULL) + slot--; + if(tmp->rn_children[slot] == NULL){ slot--; + } if(slot > MASK(rtree->rt_bits_per_level)){ if(level == rtree->rt_height - 1) return NULL; @@ -366,15 +376,13 @@ slot = get_slot(index,rtree,level) - 1; continue; } - if(level == 0){ + if(level == 0) return tmp->rn_children[slot]; - } SLIST_INSERT_HEAD(&rtree_path, tmp, next); tmp = tmp->rn_children[slot]; slot = MASK(rtree->rt_bits_per_level); level--; } - return tmp; } level--; } ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/radix_tree.h#3 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/redzone.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/redzone.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/swap_pager.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/swap_pager.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_core.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_dbg.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_dbg.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/uma_int.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_contig.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_extern.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_fault.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_glue.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_init.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_kern.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_kern.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.c#3 (text+ko) ==== @@ -1501,14 +1501,19 @@ start = 0; p_start = NULL; + /* if ((p = TAILQ_FIRST(&object->memq)) != NULL) { if (p->pindex < pindex) { - p = vm_page_lookup_geidx(pindex, object); - //p = vm_page_splay(pindex, object->root); - //if ((object->root = p)->pindex < pindex) - // p = TAILQ_NEXT(p, listq); + + p = vm_page_splay(pindex, object->root); + if ((object->root = p)->pindex < pindex) + p = TAILQ_NEXT(p, listq); + + r = radix_tree_lookup_ge(pindex, &object->rtree); + KASSERT(r == p, ("r != p, lookup_ge failed\n")); } - } + }*/ + p = radix_tree_lookup_ge(pindex, &object->rtree); /* * Assert: the variable p is either (1) the page with the * least pindex greater than or equal to the parameter pindex ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_map.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_meter.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_mmap.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.c#4 (text+ko) ==== @@ -216,12 +216,13 @@ TAILQ_INIT(&object->memq); LIST_INIT(&object->shadow_head); + //object->root = NULL; object->rtree.rt_bits_per_level = 4; object->rtree.rt_height = 0; object->rtree.rt_root = NULL; object->rtree.rt_max_height = (8*sizeof(rtidx_t))/4; object->rtree.rt_max_index = ~((rtidx_t)0); - //object->root = NULL; + object->type = type; object->size = size; object->generation = 1; @@ -696,10 +697,6 @@ #endif if (__predict_false(object->cache != NULL)) vm_page_cache_free(object, 0, 0); - radix_tree_shrink(&object->rtree); - if(object->rtree.rt_root != NULL) - panic("VM_ALGO: rt_root != NULL\n"); - /* * Let the pager know object is dead. @@ -1365,10 +1362,17 @@ retry: if ((m = TAILQ_FIRST(&orig_object->memq)) != NULL) { if (m->pindex < offidxstart) { - m = vm_page_lookup_geidx(offidxstart, orig_object); - //m = vm_page_splay(offidxstart, orig_object->root); - //if ((orig_object->root = m)->pindex < offidxstart) - // m = TAILQ_NEXT(m, listq); + /* + m = vm_page_splay(offidxstart, orig_object->root); + if ((orig_object->root = m)->pindex < offidxstart) + m = TAILQ_NEXT(m, listq); + */ + m = radix_tree_lookup_ge(offidxstart, + &orig_object->rtree); + /* + KASSERT( r == m, ("VM_ALGO: vm_object_split " + "lookup_ge failed")); + */ } } vm_page_lock_queues(); @@ -1888,10 +1892,16 @@ vm_page_lock_queues(); if ((p = TAILQ_FIRST(&object->memq)) != NULL) { if (p->pindex < start) { - p = vm_page_lookup_geidx(start,object); - //p = vm_page_splay(start, object->root); - //if ((object->root = p)->pindex < start) - // p = TAILQ_NEXT(p, listq); + /* + p = vm_page_splay(start, object->root); + if ((object->root = p)->pindex < start) + p = TAILQ_NEXT(p, listq); + */ + p = radix_tree_lookup_ge(start, &object->rtree); + /* + KASSERT(r == p, ("VM_ALGO: vm_object_page_remove " + "lookup_ge failed\n")); + */ } } /* ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_object.h#4 (text+ko) ==== @@ -90,7 +90,7 @@ LIST_ENTRY(vm_object) shadow_list; /* chain of shadow objects */ TAILQ_HEAD(, vm_page) memq; /* list of resident pages */ //vm_page_t root; /* root of the resident page splay tree */ - struct radix_tree rtree; /* root of the resident page radix tree */ + struct radix_tree rtree; vm_pindex_t size; /* Object size */ int generation; /* generation ID */ int ref_count; /* How many refs?? */ ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_page.c#4 (text+ko) ==== @@ -289,7 +289,6 @@ next); mapped += rnode_size; } - /* * Allocate memory for use when boot strapping the kernel memory * allocator. @@ -350,6 +349,9 @@ mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); vm_page_array = (vm_page_t) mapped; + + + #if VM_NRESERVLEVEL > 0 /* * Allocate memory for the reservation management system's data @@ -655,7 +657,7 @@ void vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) { - //vm_page_t root; + vm_page_t neighbour; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); if (m->object != NULL) @@ -692,9 +694,26 @@ TAILQ_INSERT_AFTER(&object->memq, root, m, listq); } } - object->root = m;*/ + object->root = m; + */ + if(object->resident_page_count == 0){ + TAILQ_INSERT_TAIL(&object->memq, m, listq); + } + else{ + if((neighbour = radix_tree_lookup_ge(pindex, + &object->rtree)) != NULL){ + KASSERT( pindex != neighbour->pindex, ("vm_page_insert" + ": offset already allocated")); + TAILQ_INSERT_BEFORE(neighbour, m, listq); + }else{ + neighbour = radix_tree_lookup_le(pindex, + &object->rtree); + TAILQ_INSERT_AFTER(&object->memq, neighbour, m, listq); + } + } + object->generation++; - radix_tree_insert(pindex,&object->rtree,m); + radix_tree_insert(pindex, &object->rtree, m); /* * show that the object has one more resident page. @@ -753,9 +772,8 @@ root = vm_page_splay(m->pindex, m->left); root->right = m->right; } - object->root = root;*/ - - radix_tree_remove(m->pindex,&object->rtree); + object->root = root; + */ TAILQ_REMOVE(&object->memq, m, listq); /* @@ -763,6 +781,7 @@ */ object->resident_page_count--; object->generation++; + radix_tree_remove(m->pindex,&object->rtree); /* * The vnode may now be recycled. */ @@ -785,19 +804,18 @@ vm_page_t vm_page_lookup(vm_object_t object, vm_pindex_t pindex) { - vm_page_t m; + + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); /* - VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); if ((m = object->root) != NULL && m->pindex != pindex) { m = vm_page_splay(pindex, m); if ((object->root = m)->pindex != pindex) m = NULL; } */ - m = radix_tree_lookup(pindex,&object->rtree); - //if(r != m && m != NULL && m->pindex == pindex) - // panic("VM_ALGO: vm_page_lookup r != m\n"); + m = radix_tree_lookup(pindex, &object->rtree); + //KASSERT( r == m, ("VM_ALGO: r != m, lookup failed.")); return (m); } @@ -1678,10 +1696,10 @@ } object->root = root; */ + radix_tree_remove(m->pindex, &object->rtree); TAILQ_REMOVE(&object->memq, m, listq); object->resident_page_count--; object->generation++; - radix_tree_remove(m->pindex,&object->rtree); /* * Insert the page into the object's collection of cached pages @@ -2144,33 +2162,6 @@ pmap_remove_write(m); } -/* - * vm_page_lookup_geidx: - * returns index which is grater than or equal to given index from the tree. - * - */ - -vm_page_t -vm_page_lookup_geidx(vm_pindex_t index, vm_object_t object) -{ - vm_pindex_t i = 0; - vm_page_t p; - - do{ - p = (vm_page_t) radix_tree_lookup(index - i, - &object->rtree); - i++; - }while (i <= index); - if(i > index) - return NULL; - if(p != NULL){ - if(i == 0) - return p; - return TAILQ_NEXT(p, listq); - } - return p; -} - #include "opt_ddb.h" #ifdef DDB #include ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_page.h#3 (text+ko) ==== @@ -325,7 +325,6 @@ void vm_page_deactivate (vm_page_t); void vm_page_insert (vm_page_t, vm_object_t, vm_pindex_t); vm_page_t vm_page_lookup (vm_object_t, vm_pindex_t); -vm_page_t vm_page_lookup_geidx (vm_pindex_t , vm_object_t); void vm_page_remove (vm_page_t); void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); void vm_page_requeue(vm_page_t m); ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pageout.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pageout.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pager.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_pager.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_param.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_phys.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_phys.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#4 (text+ko) ==== @@ -311,51 +311,16 @@ /* * Look for an existing reservation. */ - msucc = NULL; + //msucc = NULL; //mpred = object->root; - mpred = radix_tree_lookup_le(pindex, &object->rtree); - if(mpred != NULL && mpred->object == object){ - KASSERT(mpred->pindex != pindex, - ("vm_reserv_alloc_page: pindex already allocated")); - rv = vm_reserv_from_page(mpred); - KASSERT( rv != NULL, ("vm_reserv_alloc_page: null rv")); - if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { - m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - //Handle vm_page_rename(m, new_object, ...). - if ((m->flags & (PG_CACHED | PG_FREE)) == 0) - return (NULL); - vm_reserv_populate(rv); - return (m); - } - }else{ - mpred = NULL; - } - - msucc = radix_tree_lookup_ge(pindex, &object->rtree); - if(msucc != NULL && msucc->object == object){ - KASSERT(msucc->pindex != pindex, - ("vm_reserv_alloc_page: pindex already allocated")); - rv = vm_reserv_from_page(msucc); - KASSERT( rv != NULL, ("vm_reserv_alloc_page: null rv")); - if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { - m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - //Handle vm_page_rename(m, new_object, ...). - if ((m->flags & (PG_CACHED | PG_FREE)) == 0) - return (NULL); - vm_reserv_populate(rv); - return (m); - } - }else{ - msucc = NULL; - } /* - while (mpred != NULL) { + while (mpred != NULL) { KASSERT(mpred->pindex != pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - Handle vm_page_rename(m, new_object, ...). + // Handle vm_page_rename(m, new_object, ...). if ((m->flags & (PG_CACHED | PG_FREE)) == 0) return (NULL); vm_reserv_populate(rv); @@ -370,7 +335,7 @@ if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; - Handle vm_page_rename(m, new_object, ...). + // Handle vm_page_rename(m, new_object, ...). if ((m->flags & (PG_CACHED | PG_FREE)) == 0) return (NULL); vm_reserv_populate(rv); @@ -386,7 +351,37 @@ mpred = object->root = vm_page_splay(pindex, object->root); } */ + mpred = radix_tree_lookup_le(pindex, &object->rtree); + if(mpred != NULL){ + KASSERT(mpred->pindex != pindex, + ("vm_reserv_alloc_page: pindex already allocated")); + rv = vm_reserv_from_page(mpred); + if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { + m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; + // Handle vm_page_rename(m, new_object, ...). + if ((m->flags & (PG_CACHED | PG_FREE)) == 0) + return (NULL); + vm_reserv_populate(rv); + return (m); + } + } + msucc = radix_tree_lookup_ge(pindex, &object->rtree); + if(msucc != NULL){ + KASSERT(msucc->pindex != pindex, + ("vm_reserv_alloc_page: pindex already allocated")); + rv = vm_reserv_from_page(msucc); + if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { + m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; + // Handle vm_page_rename(m, new_object, ...). + if ((m->flags & (PG_CACHED | PG_FREE)) == 0) + return (NULL); + vm_reserv_populate(rv); + return (m); + } + } + //KASSERT(rpred == mpred, ("rpred != mpred\n")); + //KASSERT(msucc == rsucc, ("msucc != rsucc\n")); /* * Determine the first index to the left that can be used. */ ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.h#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_unix.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_zeroidle.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vnode_pager.c#2 (text+ko) ==== ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vnode_pager.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Aug 27 20:00:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33C951065675; Wed, 27 Aug 2008 20: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 EB153106566C for ; Wed, 27 Aug 2008 20:00:42 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1FE88FC25 for ; Wed, 27 Aug 2008 20:00:42 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RK0gb5040521 for ; Wed, 27 Aug 2008 20:00:42 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RK0gVR040519 for perforce@freebsd.org; Wed, 27 Aug 2008 20:00:42 GMT (envelope-from mayur@FreeBSD.org) Date: Wed, 27 Aug 2008 20:00:42 GMT Message-Id: <200808272000.m7RK0gVR040519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 148646 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, 27 Aug 2008 20:00:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=148646 Change 148646 by mayur@mayur_freebsd_vm on 2008/08/27 20:00:07 Updated README and TODO, same fixes to the radix_tree.c. Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/README#3 edit .. //depot/projects/soc2008/mayur_vmalgo/TODO#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#6 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/README#3 (text+ko) ==== @@ -13,3 +13,8 @@ both splay and radix trees are used in parallel with asserts on return values. Once the integration is complete and tested the splay tree will be removed. + +Benchmarking is done, check the wiki page for updates. +http://wiki.freebsd.org/MayurShardul/VM_Algorithm_Improvement + + ==== //depot/projects/soc2008/mayur_vmalgo/TODO#3 (text+ko) ==== @@ -1,7 +1,11 @@ 1. Implement radix tree in user-space. complete 2. Test and preliminary performance evaluation. + complete 3. Integrate with kernel. 3a. Preallocate memory for radix nodes. complete + 3b. Removal of splay trees. + complete 4. Testing and performance evaluation. + complete ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#6 (text+ko) ==== @@ -108,6 +108,8 @@ put_radix_node( struct radix_node *rnode, struct radix_tree *rtree) { //free(rnode); + bzero((void *)rnode, sizeof(struct radix_node) + + sizeof(void *) * (MASK(rtree->rt_bits_per_level) + 1)); SLIST_INSERT_HEAD(&res_rnodes_head,rnode,next); } @@ -247,6 +249,7 @@ int level, slot; struct radix_node *tmp; + level = rtree->rt_height - 1; tmp = rtree->rt_root; while (tmp){ @@ -326,8 +329,8 @@ /* cut the branch before we return*/ if (branch != NULL){ - slot = get_slot(index,rtree, - branch_level); + slot = get_slot(index, rtree, + branch_level); tmp = branch->rn_children[slot]; branch->rn_children[slot] = NULL; branch->rn_children_count--; @@ -359,6 +362,9 @@ SLIST_HEAD(, radix_node) rtree_path = SLIST_HEAD_INITIALIZER(rtree_path); + if(index > MASK(rtree->rt_height * rtree->rt_bits_per_level)) + index = MASK(rtree->rt_height * rtree->rt_bits_per_level); + level = rtree->rt_height - 1; tmp = rtree->rt_root; while (tmp){ @@ -378,7 +384,7 @@ SLIST_REMOVE_HEAD(&rtree_path, next); while (1) { - while(slot <= MASK(rtree->rt_bits_per_level) + while (slot <= MASK(rtree->rt_bits_per_level) && tmp->rn_children[slot] == NULL) slot++; if(slot > MASK(rtree->rt_bits_per_level)){ @@ -393,6 +399,12 @@ if(level == 0){ return tmp->rn_children[slot]; } + if(((struct radix_node *) + (tmp->rn_children[slot])) + ->rn_children_count == 0){ + slot++; + continue; + } SLIST_INSERT_HEAD(&rtree_path, tmp, next); tmp = tmp->rn_children[slot]; slot = 0; @@ -415,6 +427,9 @@ SLIST_HEAD(, radix_node) rtree_path = SLIST_HEAD_INITIALIZER(rtree_path); + if(index > MASK(rtree->rt_height * rtree->rt_bits_per_level)) + index = MASK(rtree->rt_height * rtree->rt_bits_per_level); + level = rtree->rt_height - 1; tmp = rtree->rt_root; while (tmp){ @@ -431,11 +446,13 @@ */ tmp = SLIST_FIRST(&rtree_path); SLIST_REMOVE_HEAD(&rtree_path, next); - while (1) - { - while(slot >= 0 - && tmp->rn_children[slot] == NULL) + while (1){ + while (slot > 0 + && tmp->rn_children[slot] == NULL) + slot--; + if(tmp->rn_children[slot] == NULL){ slot--; + } if(slot > MASK(rtree->rt_bits_per_level)){ if(level == rtree->rt_height - 1) return NULL; @@ -445,6 +462,12 @@ slot = get_slot(index,rtree,level) - 1; continue; } + if(((struct radix_node *) + (tmp->rn_children[slot])) + ->rn_children_count == 0){ + slot--; + continue; + } if(level == 0) return tmp->rn_children[slot]; SLIST_INSERT_HEAD(&rtree_path, tmp, next); @@ -456,8 +479,6 @@ level--; } return NULL; - - } /* * radix_tree_shrink: if possible reduces the height of the tree. From owner-p4-projects@FreeBSD.ORG Wed Aug 27 22:07:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E1261065694; Wed, 27 Aug 2008 22:07:02 +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 5245E1065692 for ; Wed, 27 Aug 2008 22:07:02 +0000 (UTC) (envelope-from vi0@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27F6C8FC0C for ; Wed, 27 Aug 2008 22:07:02 +0000 (UTC) (envelope-from vi0@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7RM72oT064875 for ; Wed, 27 Aug 2008 22:07:02 GMT (envelope-from vi0@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7RM72r8064873 for perforce@freebsd.org; Wed, 27 Aug 2008 22:07:02 GMT (envelope-from vi0@FreeBSD.org) Date: Wed, 27 Aug 2008 22:07:02 GMT Message-Id: <200808272207.m7RM72r8064873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to vi0@FreeBSD.org using -f From: Przemek Witaszczyk To: Perforce Change Reviews Cc: Subject: PERFORCE change 148665 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, 27 Aug 2008 22:07:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=148665 Change 148665 by vi0@vi0_gilgamesh.semihalf.com on 2008/08/27 22:06:24 Cleaning... Affected files ... .. //depot/projects/soc2008/vi0/efika/kernel/kernel#2 delete .. //depot/projects/soc2008/vi0/efika/kernel/kernel.debug#2 delete .. //depot/projects/soc2008/vi0/efika/kernel/kernel.symbols#2 delete .. //depot/projects/soc2008/vi0/efika/kernel/send#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 28 04:02:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40838106567C; Thu, 28 Aug 2008 04:02: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 04A1E1065676 for ; Thu, 28 Aug 2008 04:02:37 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0D048FC17 for ; Thu, 28 Aug 2008 04:02:36 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S42aSp009855 for ; Thu, 28 Aug 2008 04:02:36 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S42aPD009853 for perforce@freebsd.org; Thu, 28 Aug 2008 04:02:36 GMT (envelope-from mayur@FreeBSD.org) Date: Thu, 28 Aug 2008 04:02:36 GMT Message-Id: <200808280402.m7S42aPD009853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 148674 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, 28 Aug 2008 04:02:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=148674 Change 148674 by mayur@mayur_freebsd_vm on 2008/08/28 04:02:08 Creating new directory for benchmarking files Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/splay_tree.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 28 04:03:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69671106567C; Thu, 28 Aug 2008 04:03: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 2CEF41065674 for ; Thu, 28 Aug 2008 04:03:38 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04F1B8FC1A for ; Thu, 28 Aug 2008 04:03:38 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S43bTk011080 for ; Thu, 28 Aug 2008 04:03:37 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S43bc1011078 for perforce@freebsd.org; Thu, 28 Aug 2008 04:03:37 GMT (envelope-from mayur@FreeBSD.org) Date: Thu, 28 Aug 2008 04:03:37 GMT Message-Id: <200808280403.m7S43bc1011078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 148675 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, 28 Aug 2008 04:03:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=148675 Change 148675 by mayur@mayur_freebsd_vm on 2008/08/28 04:02:41 New directory for benchmarking files. Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/rtree_stree.c#1 branch .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.c#1 branch .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.h#1 branch .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#6 delete .. //depot/projects/soc2008/mayur_vmalgo/uspace/splay_tree.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 28 04:16:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C85071065674; Thu, 28 Aug 2008 04:16:51 +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 8C8D7106566C for ; Thu, 28 Aug 2008 04:16:51 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7EF218FC16 for ; Thu, 28 Aug 2008 04:16:51 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S4GpEC012303 for ; Thu, 28 Aug 2008 04:16:51 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S4Gp4A012301 for perforce@freebsd.org; Thu, 28 Aug 2008 04:16:51 GMT (envelope-from mayur@FreeBSD.org) Date: Thu, 28 Aug 2008 04:16:51 GMT Message-Id: <200808280416.m7S4Gp4A012301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 148676 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, 28 Aug 2008 04:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148676 Change 148676 by mayur@mayur_freebsd_vm on 2008/08/28 04:15:57 Makefile and README for Benchmarking and code cleanup. Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/Makefile#1 add .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/README#1 add .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/rtree_stree.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.h#2 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/rtree_stree.c#2 (text+ko) ==== @@ -3,16 +3,15 @@ #include #include "splay_tree.h" -#include "radix_tree.h" +#include "../radix_tree.h" #define N 0xffff #define X 0xfff void benchmark(int max_idx){ - unsigned long long splay, radix; struct radix_tree *rtree; int i,j; - int vals[N], lookups[N],inserts[N],removes[N]; + int vals[N], lookups[N],inserts[N]; unsigned long long t_start, t_end,t; radix_tree_init(); @@ -90,6 +89,7 @@ max_idx[i]); benchmark(max_idx[i]); } + return 0; } ==== //depot/projects/soc2008/mayur_vmalgo/uspace/benchmarking/splay_tree.h#2 (text+ko) ==== @@ -25,6 +25,7 @@ unsigned long long splay_insert(int ); unsigned long long splay_remove(int ); +unsigned long long splay_lookup(int ); static int From owner-p4-projects@FreeBSD.ORG Thu Aug 28 06:09:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 778F11065671; Thu, 28 Aug 2008 06:09: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 237CB106566B for ; Thu, 28 Aug 2008 06:09:54 +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 163B98FC14 for ; Thu, 28 Aug 2008 06:09:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S69rDA034913 for ; Thu, 28 Aug 2008 06:09:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S69rMW034911 for perforce@freebsd.org; Thu, 28 Aug 2008 06:09:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 28 Aug 2008 06:09:53 GMT Message-Id: <200808280609.m7S69rMW034911@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 148679 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, 28 Aug 2008 06:09:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=148679 Change 148679 by hselasky@hselasky_laptop001 on 2008/08/28 06:08:54 Fix a comment and optimise the data transfer path. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#8 (text+ko) ==== @@ -271,7 +271,7 @@ DPRINTFN(4, "csr=0x%02x\n", csr); /* - * UNDOCUMENTED: If DATAEND is set we should not call the + * NOTE: If DATAEND is set we should not call the * callback, hence the status stage is not complete. */ if (csr & MUSB2_MASK_CSR0L_DATAEND) { @@ -427,6 +427,24 @@ if (buf_res.length > count) { buf_res.length = count; } + /* check if we can optimise */ + if ((!(USB_P2U(buf_res.buffer) & 3)) && + (buf_res.length >= 4)) { + uint32_t temp; + + /* receive data 4 bytes at a time */ + bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(0), buf_res.buffer, + buf_res.length / 4); + + temp = buf_res.length & ~3; + + /* update counters */ + count -= temp; + td->offset += temp; + td->remainder -= temp; + continue; + } /* receive data */ bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(0), buf_res.buffer, buf_res.length); @@ -502,6 +520,24 @@ if (buf_res.length > count) { buf_res.length = count; } + /* check if we can optimise */ + if ((!(USB_P2U(buf_res.buffer) & 3)) && + (buf_res.length >= 4)) { + uint32_t temp; + + /* transmit data 4 bytes at a time */ + bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(0), buf_res.buffer, + buf_res.length / 4); + + temp = buf_res.length & ~3; + + /* update counters */ + count -= temp; + td->offset += temp; + td->remainder -= temp; + continue; + } /* transmit data */ bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, MUSB2_REG_EPFIFO(0), buf_res.buffer, buf_res.length); @@ -571,7 +607,7 @@ uint8_t to; uint8_t got_short; - to = 2; /* don't loop forever! */ + to = 8; /* don't loop forever! */ got_short = 0; /* get pointer to softc */ @@ -624,9 +660,28 @@ if (buf_res.length > count) { buf_res.length = count; } + /* check if we can optimise */ + if ((!(USB_P2U(buf_res.buffer) & 3)) && + (buf_res.length >= 4)) { + uint32_t temp; + + /* receive data 4 bytes at a time */ + bus_space_read_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, + buf_res.length / 4); + + temp = buf_res.length & ~3; + + /* update counters */ + count -= temp; + td->offset += temp; + td->remainder -= temp; + continue; + } /* receive data */ bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl, - MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, buf_res.length); + MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, + buf_res.length); /* update counters */ count -= buf_res.length; @@ -660,7 +715,7 @@ uint8_t csr; uint8_t to; - to = 2; /* don't loop forever! */ + to = 8; /* don't loop forever! */ /* get pointer to softc */ sc = MUSBOTG_PC2SC(td->pc); @@ -697,9 +752,28 @@ if (buf_res.length > count) { buf_res.length = count; } + /* check if we can optimise */ + if ((!(USB_P2U(buf_res.buffer) & 3)) && + (buf_res.length >= 4)) { + uint32_t temp; + + /* transmit data 4 bytes at a time */ + bus_space_write_multi_4(sc->sc_io_tag, sc->sc_io_hdl, + MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, + buf_res.length / 4); + + temp = buf_res.length & ~3; + + /* update counters */ + count -= temp; + td->offset += temp; + td->remainder -= temp; + continue; + } /* transmit data */ bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl, - MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, buf_res.length); + MUSB2_REG_EPFIFO(td->ep_no), buf_res.buffer, + buf_res.length); /* update counters */ count -= buf_res.length; @@ -775,6 +849,7 @@ musbotg_interrupt_poll(struct musbotg_softc *sc) { struct usb2_xfer *xfer; + uint8_t to = 2; repeat: TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { @@ -783,6 +858,8 @@ goto repeat; } } + if (--to) + goto repeat; return; } From owner-p4-projects@FreeBSD.ORG Thu Aug 28 06:10:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84FE31065687; Thu, 28 Aug 2008 06:10: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 4A4FA1065684 for ; Thu, 28 Aug 2008 06:10:55 +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 3DA1F8FC13 for ; Thu, 28 Aug 2008 06:10:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S6Atap035067 for ; Thu, 28 Aug 2008 06:10:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S6AtZ1035065 for perforce@freebsd.org; Thu, 28 Aug 2008 06:10:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 28 Aug 2008 06:10:55 GMT Message-Id: <200808280610.m7S6AtZ1035065@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 148680 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, 28 Aug 2008 06:10:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=148680 Change 148680 by hselasky@hselasky_laptop001 on 2008/08/28 06:10:14 Do not allow endpoint packet size override. It does not work for HighSpeed USB. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#7 (text+ko) ==== @@ -562,15 +562,6 @@ best_n = n; ep->pf = pf; } - } else if ((ep->needs_ep_type == UE_BULK) || - (ep->needs_ep_type == UE_CONTROL)) { - /* frame size is not so important */ - temp = (ep->max_frame_size - max_frame_size); - if (distance > temp) { - distance = temp; - best_n = n; - ep->pf = pf; - } } } @@ -597,14 +588,6 @@ (1 << (best_n % 8)); ep->hw_endpoint_out = best_n | UE_DIR_OUT; } - /* - * In case we choose an endpoint having a smaller Maximum - * Frame Size than we wanted, we need to update the Maximum - * Frame Size ! - */ - if (ep->max_frame_size > max_frame_size) { - ep->max_frame_size = max_frame_size; - } return (0); /* got a match */ } return (1); /* failure */ @@ -633,7 +616,6 @@ struct usb2_endpoint_descriptor *ed; uint16_t wMaxPacketSize; uint16_t temp; - uint8_t allow_override; uint8_t speed; ep_iface = ues->ep_max; @@ -683,7 +665,7 @@ wMaxPacketSize = UGETW(ed->wMaxPacketSize); if ((wMaxPacketSize & 0xF800) && (speed == USB_SPEED_HIGH)) { - /* handle frame multiplier */ + /* handle packet multiplier */ temp = (wMaxPacketSize >> 11) & 3; wMaxPacketSize &= 0x7FF; if (temp == 2) { @@ -691,46 +673,14 @@ } else { wMaxPacketSize *= 3; } - allow_override = 0; - } else { - if ((ep_type == UE_BULK) || - (ep_type == UE_CONTROL)) { - allow_override = 1; - } else { - allow_override = 0; - } } if (is_complete) { - /* - * We assume that - * "ep_curr->max_frame_size" - * is correct according to the - * speed we are connected at ! - */ - while (1) { - - if (wMaxPacketSize <= - ep_curr->max_frame_size) { - break; - } - if (wMaxPacketSize < 8) { - return (1); /* failure */ - } - if (!allow_override) { - return (1); /* failure */ - } - /* - * We have a BULK or CONTROL - * endpoint having a packet - * size that the hardware - * cannot handle ! Try to - * work it around! - */ - wMaxPacketSize /= 2; - USETW(ed->wMaxPacketSize, - wMaxPacketSize); + /* check if we have enough buffer space */ + if (wMaxPacketSize > + ep_curr->max_frame_size) { + return (1); /* failure */ } if (ed->bEndpointAddress & UE_DIR_IN) { From owner-p4-projects@FreeBSD.ORG Thu Aug 28 07:41:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7902F106567D; Thu, 28 Aug 2008 07:41:33 +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 3C2771065676 for ; Thu, 28 Aug 2008 07:41:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FFDB8FC1C for ; Thu, 28 Aug 2008 07:41:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S7fX7x044134 for ; Thu, 28 Aug 2008 07:41:33 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S7fXIQ044132 for perforce@freebsd.org; Thu, 28 Aug 2008 07:41:33 GMT (envelope-from trasz@freebsd.org) Date: Thu, 28 Aug 2008 07:41:33 GMT Message-Id: <200808280741.m7S7fXIQ044132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 148685 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, 28 Aug 2008 07:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148685 Change 148685 by trasz@trasz_traszkan on 2008/08/28 07:41:31 Update VOP_ACCESS manual page. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#2 (text+ko) ==== @@ -39,7 +39,7 @@ .In sys/param.h .In sys/vnode.h .Ft int -.Fn VOP_ACCESS "struct vnode *vp" "int mode" "struct ucred *cred" "struct thread *td" +.Fn VOP_ACCESS "struct vnode *vp" "vaccess_t mode" "struct ucred *cred" "struct thread *td" .Sh DESCRIPTION This entry point checks the access permissions of the file against the given credentials. @@ -58,11 +58,7 @@ .Pp The .Fa mode -is a mask which can contain -.Dv VREAD , -.Dv VWRITE -or -.Dv VEXEC . +is a mask which can contain flags described in . .Sh LOCKS The vnode will be locked on entry and should remain locked on return. .Sh RETURN VALUES @@ -71,11 +67,17 @@ .Sh PSEUDOCODE .Bd -literal int -vop_access(struct vnode *vp, int mode, struct ucred *cred, struct thread *td) +vop_access(struct vnode *vp, vaccess_t mode, struct ucred *cred, struct thread *td) { int error; /* + * Our example does not implement granular access control. + */ + if (unixify_vaccess(&mode, &error)) + return (error); + + /* * Disallow write attempts on read-only file systems; * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. @@ -145,6 +147,7 @@ .El .Sh SEE ALSO .Xr vaccess 9 , +.Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , .Xr vnode 9 .Sh AUTHORS From owner-p4-projects@FreeBSD.ORG Thu Aug 28 08:04:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6668D106567A; Thu, 28 Aug 2008 08:04: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 2A6371065678 for ; Thu, 28 Aug 2008 08:04:57 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE8C88FC2B for ; Thu, 28 Aug 2008 08:04:56 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7S84uL1047255 for ; Thu, 28 Aug 2008 08:04:56 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7S84uGC047253 for perforce@freebsd.org; Thu, 28 Aug 2008 08:04:56 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Aug 2008 08:04:56 GMT Message-Id: <200808280804.m7S84uGC047253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148686 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, 28 Aug 2008 08:04:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=148686 Change 148686 by raj@raj_mimi on 2008/08/28 08:04:15 Remove old and unused kernel config files. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/ORION2#2 delete .. //depot/projects/arm/src/sys/arm/conf/ORION2.hints#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 28 12:36:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD9481065677; Thu, 28 Aug 2008 12:36: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 71090106568D for ; Thu, 28 Aug 2008 12:36:37 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 627C38FC22 for ; Thu, 28 Aug 2008 12:36:37 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SCabQc083250 for ; Thu, 28 Aug 2008 12:36:37 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SCablN083248 for perforce@freebsd.org; Thu, 28 Aug 2008 12:36:37 GMT (envelope-from strauss@FreeBSD.org) Date: Thu, 28 Aug 2008 12:36:37 GMT Message-Id: <200808281236.m7SCablN083248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 148692 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, 28 Aug 2008 12:36:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=148692 Change 148692 by strauss@strauss_marvelman on 2008/08/28 12:36:13 Integration Affected files ... .. //depot/projects/soc2008/strauss_libarchive/Makefile.am#11 integrate .. //depot/projects/soc2008/strauss_libarchive/PROJECTS#4 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cmdline.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/config_freebsd.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cpio.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cpio.h#4 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/main.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_basic.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_format_newc.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_gcpio_compat.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_L.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_a.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_y.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_passthrough_dotdot.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_passthrough_reverse.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry_link_resolver.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_private.h#3 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_mtree.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_disk.3#4 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_disk.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_compression_compress.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_ar.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_by_name.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_shar.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/config_freebsd.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/main.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_gtar_1.tgz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_tar_hardlink.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_zip_1.zip.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_pax_filename_encoding.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_mtree.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_zip.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_zip.zip.uu#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_tar_large.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_ustar_filenames.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_disk.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_disk_hardlink.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_tar_ustar.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/bsdtar.1#4 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/bsdtar.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/bsdtar.h#4 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/config_freebsd.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/matching.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/read.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/main.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/test.h#8 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_copy.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_option_T.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_option_q.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_patterns.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_patterns_2.tgz.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_patterns_3.tgz.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/tar/write.c#8 integrate Differences ... ==== //depot/projects/soc2008/strauss_libarchive/Makefile.am#11 (text+ko) ==== @@ -130,6 +130,7 @@ libarchive/archive_write_set_format_by_name.c \ libarchive/archive_write_set_format_cpio.c \ libarchive/archive_write_set_format_cpio_newc.c \ + libarchive/archive_write_set_format_mtree.c \ libarchive/archive_write_set_format_pax.c \ libarchive/archive_write_set_format_shar.c \ libarchive/archive_write_set_format_ustar.c \ @@ -139,8 +140,9 @@ libarchive/filter_fork.c \ libarchive/filter_fork.h -# cygwin barfs without -no-undefined; I don't know what it does or -# whether it helps or hurts other platforms... +libarchive_la_CPPFLAGS=-I $(top_builddir)/libarchive +# -no-undefined marks that libarchive doesn't rely on symbols +# defined in the application. This is mandatory for cygwin. libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) # Manpages to install @@ -317,6 +319,7 @@ tar/test/test_copy.c \ tar/test/test_getdate.c \ tar/test/test_help.c \ + tar/test/test_option_q.c \ tar/test/test_option_T.c \ tar/test/test_patterns.c \ tar/test/test_stdio.c \ @@ -335,7 +338,11 @@ bsdtar_TESTS_ENVIRONMENT= endif +bsdtar_test_EXTRA_DIST= \ + tar/test/test_patterns_2.tgz.uu \ + tar/test/test_patterns_3.tgz.uu + # # # bsdcpio source, docs, etc. @@ -392,14 +399,14 @@ cpio/test/test_basic.c \ cpio/test/test_format_newc.c \ cpio/test/test_gcpio_compat.c \ + cpio/test/test_option_B.c \ + cpio/test/test_option_L.c \ cpio/test/test_option_a.c \ - cpio/test/test_option_B.c \ cpio/test/test_option_c.c \ cpio/test/test_option_d.c \ + cpio/test/test_option_ell.c \ cpio/test/test_option_f.c \ cpio/test/test_option_help.c \ - cpio/test/test_option_L.c \ - cpio/test/test_option_ell.c \ cpio/test/test_option_m.c \ cpio/test/test_option_t.c \ cpio/test/test_option_u.c \ @@ -407,6 +414,8 @@ cpio/test/test_option_y.c \ cpio/test/test_option_z.c \ cpio/test/test_owner_parse.c \ + cpio/test/test_passthrough_dotdot.c \ + cpio/test/test_passthrough_reverse.c \ cpio/test/test_pathmatch.c bsdcpio_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive -I$(top_builddir)/cpio/test ==== //depot/projects/soc2008/strauss_libarchive/PROJECTS#4 (text+ko) ==== @@ -4,9 +4,9 @@ on the list. If you think you have time to work on any of these, please let me know. -* mtree format. libarchive can now read mtree files, - though there are still some missing details. The - ability to write mtree format is desirable. +* NetBSD's mtree supports various checksum algorithms. + It would be useful if the reader could verify them and + the writer could compute them. * archive_entry_from_file(). This would be very useful. Ideally, it would accept a pathname (required) and an ==== //depot/projects/soc2008/strauss_libarchive/cpio/cmdline.c#7 (ktext) ==== @@ -26,7 +26,7 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.3 2008/06/21 02:20:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.4 2008/07/29 15:23:31 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -91,6 +91,7 @@ { "link", no_argument, NULL, 'l' }, { "list", no_argument, NULL, 't' }, { "make-directories", no_argument, NULL, 'd' }, + { "no-preserve-owner", no_argument, NULL, OPTION_NO_PRESERVE_OWNER }, { "null", no_argument, NULL, '0' }, { "owner", required_argument, NULL, 'R' }, { "pass-through", no_argument, NULL, 'p' }, ==== //depot/projects/soc2008/strauss_libarchive/cpio/config_freebsd.h#5 (ktext) ==== @@ -22,7 +22,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$ + * $FreeBSD: src/usr.bin/cpio/config_freebsd.h,v 1.2 2008/07/05 05:15:07 kientzle Exp $ */ /* A default configuration for FreeBSD, used if there is no config.h. */ ==== //depot/projects/soc2008/strauss_libarchive/cpio/cpio.c#8 (ktext) ==== @@ -26,7 +26,7 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.4 2008/06/24 15:18:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.12 2008/08/24 06:21:00 kientzle Exp $"); #include #include @@ -111,6 +111,9 @@ cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER; cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS; cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT; + cpio->extract_flags |= ARCHIVE_EXTRACT_PERM; + cpio->extract_flags |= ARCHIVE_EXTRACT_FFLAGS; + cpio->extract_flags |= ARCHIVE_EXTRACT_ACL; if (geteuid() == 0) cpio->extract_flags |= ARCHIVE_EXTRACT_OWNER; cpio->bytes_per_block = 512; @@ -175,6 +178,9 @@ case 'm': /* POSIX 1997 */ cpio->extract_flags |= ARCHIVE_EXTRACT_TIME; break; + case OPTION_NO_PRESERVE_OWNER: /* GNU cpio */ + cpio->extract_flags &= ~ARCHIVE_EXTRACT_OWNER; + break; case 'O': /* GNU cpio */ cpio->filename = optarg; break; @@ -829,6 +835,7 @@ static void mode_pass(struct cpio *cpio, const char *destdir) { + unsigned long blocks; struct line_reader *lr; const char *p; int r; @@ -857,6 +864,14 @@ if (r != ARCHIVE_OK) cpio_errc(1, 0, archive_error_string(cpio->archive)); archive_write_finish(cpio->archive); + + if (!cpio->quiet) { + blocks = (archive_position_uncompressed(cpio->archive) + 511) + / 512; + fprintf(stderr, "%lu %s\n", blocks, + blocks == 1 ? "block" : "blocks"); + } + } /* ==== //depot/projects/soc2008/strauss_libarchive/cpio/cpio.h#4 (text+ko) ==== @@ -22,7 +22,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/usr.bin/cpio/cpio.h,v 1.2 2008/06/21 02:20:20 kientzle Exp $ + * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.4 2008/08/04 01:25:48 cperciva Exp $ */ #ifndef CPIO_H_INCLUDED @@ -85,7 +85,7 @@ /* Name of this program; used in error reporting, initialized in main(). */ const char *cpio_progname; -void cpio_errc(int _eval, int _code, const char *fmt, ...); +void cpio_errc(int _eval, int _code, const char *fmt, ...) __dead2; void cpio_warnc(int _code, const char *fmt, ...); int owner_parse(const char *, int *, int *); @@ -94,6 +94,7 @@ /* Fake short equivalents for long options that otherwise lack them. */ enum { OPTION_INSECURE = 1, + OPTION_NO_PRESERVE_OWNER, OPTION_QUIET, OPTION_VERSION }; ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/main.c#7 (ktext) ==== @@ -44,7 +44,7 @@ #undef EXTRA_DUMP /* How to dump extra data */ /* How to generate extra version info. */ #define EXTRA_VERSION (systemf("%s --version", testprog) ? "" : "") -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/main.c,v 1.2 2008/06/21 02:17:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/main.c,v 1.3 2008/08/24 04:58:22 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -598,8 +598,8 @@ va_end(ap); fd = open(f, O_RDONLY); - contents = malloc(s * 2); - n = read(fd, contents, s * 2); + contents = malloc(s * 2 + 128); + n = read(fd, contents, s * 2 + 128); if (n == s && memcmp(buff, contents, s) == 0) { free(contents); return (1); ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_basic.c#6 (ktext) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_basic.c,v 1.4 2008/08/25 06:39:29 kientzle Exp $"); static void verify_files(const char *target) @@ -81,11 +81,25 @@ } } + /* Another file with 1 link and different permissions. */ + r = lstat("file2", &st); + failure("Failed to stat file %s/file2, errno=%d", target, errno); + assertEqualInt(r, 0); + if (r == 0) { + assert(S_ISREG(st.st_mode)); + failure("%s/file2: st.st_mode = %o", target, st.st_mode); + assertEqualInt(0777, st.st_mode & 0777); + assertEqualInt(10, st.st_size); + failure("file %s/file2 should have 1 link", target); + assertEqualInt(1, st.st_nlink); + } + /* dir */ r = lstat("dir", &st); if (r == 0) { assertEqualInt(r, 0); assert(S_ISDIR(st.st_mode)); + failure("%s/dir: st.st_mode = %o", target, st.st_mode); assertEqualInt(0775, st.st_mode & 0777); } } @@ -141,7 +155,7 @@ /* * Use cpio passthrough mode to copy files to another directory. */ - r = systemf("%s -p -W quiet %s %s/stdout 2>%s/stderr", + r = systemf("%s -p %s %s/stdout 2>%s/stderr", testprog, target, target, target); failure("Error invoking %s -p", testprog); assertEqualInt(r, 0); @@ -151,7 +165,7 @@ /* Verify stderr. */ failure("Error invoking %s -p in dir %s", testprog, target); - assertEmptyFile("stderr"); + assertFileContents("1 block\n", 8, "stderr"); verify_files(target); chdir(".."); @@ -185,18 +199,27 @@ assertEqualInt(0, symlink("file", "symlink")); write(filelist, "symlink\n", 8); + /* Another file with different permissions. */ + fd = open("file2", O_CREAT | O_WRONLY, 0777); + assert(fd >= 0); + assertEqualInt(10, write(fd, "123456789", 10)); + close(fd); + write(filelist, "file2\n", 6); + /* Directory. */ assertEqualInt(0, mkdir("dir", 0775)); write(filelist, "dir\n", 4); /* All done. */ close(filelist); + umask(022); + /* Archive/dearchive with a variety of options. */ - basic_cpio("copy", "", "", "1 block\n"); - basic_cpio("copy_odc", "--format=odc", "", "1 block\n"); + basic_cpio("copy", "", "", "2 blocks\n"); + basic_cpio("copy_odc", "--format=odc", "", "2 blocks\n"); basic_cpio("copy_newc", "-H newc", "", "2 blocks\n"); - basic_cpio("copy_cpio", "-H odc", "", "1 block\n"); - basic_cpio("copy_ustar", "-H ustar", "", "7 blocks\n"); + basic_cpio("copy_cpio", "-H odc", "", "2 blocks\n"); + basic_cpio("copy_ustar", "-H ustar", "", "9 blocks\n"); /* Copy in one step using -p */ passthrough("passthrough"); ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_format_newc.c#6 (ktext) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_format_newc.c,v 1.2 2008/08/22 02:09:10 kientzle Exp $"); static int is_hex(const char *p, size_t l) @@ -68,7 +68,7 @@ int devmajor, devminor, ino, gid; time_t t, t2, now; char *p, *e; - size_t s; + size_t s, fs, ns; mode_t oldmask; oldmask = umask(0); @@ -141,16 +141,21 @@ " first appearance should be empty, so this file size\n" " field should be zero"); assertEqualInt(0, from_hex(e + 54, 8)); /* File size */ + fs = from_hex(e + 54, 8); + fs += 3 & -fs; devmajor = from_hex(e + 62, 8); /* devmajor */ devminor = from_hex(e + 70, 8); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000006", 8); /* Name size */ + ns = from_hex(e + 94, 8); + ns += 3 & (-ns - 2); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "file1\0", 6); /* Name contents */ /* Since there's another link, no file contents here. */ /* But add in file size so that an error here doesn't cascade. */ - e += 116 + from_hex(e + 54, 8) + (3 & -from_hex(e + 54, 8)); + e += 110 + fs + ns; + /* "symlink" pointing to "file1" */ assert(is_hex(e, 110)); assertEqualMem(e + 0, "070701", 6); /* Magic */ @@ -163,15 +168,19 @@ failure("First entry created at t=0x%08x this entry created at t2=0x%08x", t, t2); assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */ assertEqualMem(e + 54, "00000005", 8); /* File size */ + fs = from_hex(e + 54, 8); + fs += 3 & -fs; assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */ assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000008", 8); /* Name size */ + ns = from_hex(e + 94, 8); + ns += 3 & (-ns - 2); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "symlink\0\0\0", 10); /* Name contents */ - assertEqualMem(e + 120, "file1\0\0\0", 8); /* symlink target */ - e += 120 + from_hex(e + 54, 8) + (3 & -from_hex(e + 54, 8)); + assertEqualMem(e + 110 + ns, "file1\0\0\0", 8); /* symlink target */ + e += 110 + fs + ns; /* "dir" */ assert(is_hex(e, 110)); @@ -185,16 +194,18 @@ failure("First entry created at t=0x%08x this entry created at t2=0x%08x", t, t2); assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */ assertEqualMem(e + 54, "00000000", 8); /* File size */ + fs = from_hex(e + 54, 8); + fs += 3 & -fs; assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */ assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000004", 8); /* Name size */ + ns = from_hex(e + 94, 8); + ns += 3 & (-ns - 2); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "dir\0\0\0", 6); /* Name contents */ - e += 116; - - /* TODO: Verify other types of entries. */ + e += 110 + fs + ns; /* Hardlink identical to "file1" */ /* Since we only wrote two of the three links to this @@ -211,15 +222,19 @@ failure("First entry created at t=0x%08x this entry created at t2=0x%08x", t, t2); assert(t2 == t || t2 == t + 1); /* Almost same as first entry. */ assertEqualInt(10, from_hex(e + 54, 8)); /* File size */ + fs = from_hex(e + 54, 8); + fs += 3 & -fs; assertEqualInt(devmajor, from_hex(e + 62, 8)); /* devmajor */ assertEqualInt(devminor, from_hex(e + 70, 8)); /* devminor */ assert(is_hex(e + 78, 8)); /* rdevmajor */ assert(is_hex(e + 86, 8)); /* rdevminor */ assertEqualMem(e + 94, "00000009", 8); /* Name size */ + ns = from_hex(e + 94, 8); + ns += 3 & (-ns - 2); assertEqualInt(0, from_hex(e + 102, 8)); /* check field */ assertEqualMem(e + 110, "hardlink\0\0", 10); /* Name contents */ - assertEqualMem(e + 120, "123456789\0\0\0", 12); /* File contents */ - e += 120 + from_hex(e + 54, 8) + (3 & -from_hex(e + 54, 8)); + assertEqualMem(e + 110 + ns, "123456789\0\0\0", 12); /* File contents */ + e += 110 + ns + fs; /* Last entry is end-of-archive marker. */ assert(is_hex(e, 110)); ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_gcpio_compat.c#6 (ktext) ==== @@ -23,8 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); - +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_gcpio_compat.c,v 1.2 2008/08/22 02:27:06 kientzle Exp $"); static void unpack_test(const char *from, const char *options, const char *se) @@ -48,6 +47,7 @@ assertEqualInt(r, 0); /* Verify that nothing went to stderr. */ + failure("Error invoking %s -i %s < %s", testprog, options, from); assertFileContents(se, strlen(se), "unpack.err"); /* @@ -121,6 +121,7 @@ unpack_test("test_gcpio_compat_ref.bin", "", "1 block\n"); unpack_test("test_gcpio_compat_ref.crc", "", "2 blocks\n"); unpack_test("test_gcpio_compat_ref.newc", "", "2 blocks\n"); + /* gcpio-2.9 only reads 6 blocks here */ unpack_test("test_gcpio_compat_ref.ustar", "", "7 blocks\n"); umask(oldumask); ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_L.c#6 (ktext) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_L.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $"); DEFINE_TEST(test_option_L) { @@ -55,7 +55,7 @@ r = systemf("cat filelist | %s -pd -L copy-L >copy-L.out 2>copy-L.err", testprog); assertEqualInt(r, 0); assertEmptyFile("copy-L.out"); - assertEmptyFile("copy-L.err"); + assertFileContents("1 block\n", 8, "copy-L.err"); assertEqualInt(0, lstat("copy-L/symlink", &st)); failure("-pdL should dereference symlinks and turn them into files."); assert(!S_ISLNK(st.st_mode)); ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_a.c#6 (ktext) ==== @@ -24,7 +24,7 @@ */ #include "test.h" #include -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_a.c,v 1.3 2008/08/24 06:21:00 kientzle Exp $"); static struct { const char *name; @@ -118,7 +118,7 @@ /* Copy the file without -a; should change the atime. */ r = systemf("echo %s | %s -pd copy-no-a > copy-no-a.out 2>copy-no-a.err", files[1].name, testprog); assertEqualInt(r, 0); - assertEmptyFile("copy-no-a.err"); + assertFileContents("1 block\n", 8, "copy-no-a.err"); assertEmptyFile("copy-no-a.out"); assertEqualInt(0, stat(files[1].name, &st)); failure("Copying file without -a should have changed atime."); @@ -127,7 +127,7 @@ /* Archive the file without -a; should change the atime. */ r = systemf("echo %s | %s -o > archive-no-a.out 2>archive-no-a.err", files[2].name, testprog); assertEqualInt(r, 0); - assertEmptyFile("copy-no-a.err"); + assertFileContents("1 block\n", 8, "copy-no-a.err"); assertEqualInt(0, stat(files[2].name, &st)); failure("Archiving file without -a should have changed atime."); assert(st.st_atime != files[2].atime_sec); @@ -142,7 +142,7 @@ r = systemf("echo %s | %s -pad copy-a > copy-a.out 2>copy-a.err", files[3].name, testprog); assertEqualInt(r, 0); - assertEmptyFile("copy-a.err"); + assertFileContents("1 block\n", 8, "copy-a.err"); assertEmptyFile("copy-a.out"); assertEqualInt(0, stat(files[3].name, &st)); failure("Copying file with -a should not have changed atime."); @@ -152,7 +152,7 @@ r = systemf("echo %s | %s -oa > archive-a.out 2>archive-a.err", files[4].name, testprog); assertEqualInt(r, 0); - assertEmptyFile("copy-a.err"); + assertFileContents("1 block\n", 8, "copy-a.err"); assertEqualInt(0, stat(files[4].name, &st)); failure("Archiving file with -a should not have changed atime."); assertEqualInt(st.st_atime, files[4].atime_sec); ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_y.c#6 (ktext) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_y.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $"); DEFINE_TEST(test_option_y) { @@ -41,9 +41,9 @@ /* Archive it with bzip2 compression. */ r = systemf("echo f | %s -oy >archive.out 2>archive.err", testprog); - assertFileContents("1 block\n", 8, "archive.err"); failure("-y (bzip) option seems to be broken"); if (assertEqualInt(r, 0)) { + assertFileContents("1 block\n", 8, "archive.err"); /* Check that the archive file has a bzip2 signature. */ p = slurpfile(&s, "archive.out"); assert(s > 2); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#6 (ktext) ==== @@ -247,8 +247,6 @@ #define ARCHIVE_FORMAT_AR_GNU (ARCHIVE_FORMAT_AR | 1) #define ARCHIVE_FORMAT_AR_BSD (ARCHIVE_FORMAT_AR | 2) #define ARCHIVE_FORMAT_MTREE 0x80000 -#define ARCHIVE_FORMAT_MTREE_V1 (ARCHIVE_FORMAT_MTREE | 1) -#define ARCHIVE_FORMAT_MTREE_V2 (ARCHIVE_FORMAT_MTREE | 2) /*- * Basic outline for reading an archive: @@ -465,13 +463,13 @@ __LA_DECL int archive_write_set_format_ar_svr4(struct archive *); __LA_DECL int archive_write_set_format_cpio(struct archive *); __LA_DECL int archive_write_set_format_cpio_newc(struct archive *); +__LA_DECL int archive_write_set_format_mtree(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ __LA_DECL int archive_write_set_format_pax(struct archive *); __LA_DECL int archive_write_set_format_pax_restricted(struct archive *); __LA_DECL int archive_write_set_format_shar(struct archive *); __LA_DECL int archive_write_set_format_shar_dump(struct archive *); __LA_DECL int archive_write_set_format_ustar(struct archive *); -__LA_DECL int archive_write_set_format_zip(struct archive *); __LA_DECL int archive_write_open(struct archive *, void *, archive_open_callback *, archive_write_callback *, archive_close_callback *); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry.c#7 (ktext) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.52 2008/05/26 17:00:22 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -395,8 +395,7 @@ aes_copy(&entry2->ae_hardlink, &entry->ae_hardlink); aes_copy(&entry2->ae_pathname, &entry->ae_pathname); aes_copy(&entry2->ae_symlink, &entry->ae_symlink); - entry2->ae_hardlinkset = entry->ae_hardlinkset; - entry2->ae_symlinkset = entry->ae_symlinkset; + entry2->ae_set = entry->ae_set; aes_copy(&entry2->ae_uname, &entry->ae_uname); /* Copy ACL data over. */ @@ -455,6 +454,12 @@ return (entry->ae_stat.aest_atime_nsec); } +int +archive_entry_atime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_ATIME); +} + time_t archive_entry_ctime(struct archive_entry *entry) { @@ -562,17 +567,17 @@ const char * archive_entry_hardlink(struct archive_entry *entry) { - if (!entry->ae_hardlinkset) - return (NULL); - return (aes_get_mbs(&entry->ae_hardlink)); + if (entry->ae_set & AE_SET_HARDLINK) + return (aes_get_mbs(&entry->ae_hardlink)); + return (NULL); } const wchar_t * archive_entry_hardlink_w(struct archive_entry *entry) { - if (!entry->ae_hardlinkset) - return (NULL); - return (aes_get_wcs(&entry->ae_hardlink)); + if (entry->ae_set & AE_SET_HARDLINK) + return (aes_get_wcs(&entry->ae_hardlink)); + return (NULL); } ino_t @@ -651,6 +656,12 @@ return (entry->ae_stat.aest_size); } +int +archive_entry_size_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_SIZE); +} + const char * archive_entry_sourcepath(struct archive_entry *entry) { @@ -660,17 +671,17 @@ const char * archive_entry_symlink(struct archive_entry *entry) { - if (!entry->ae_symlinkset) - return (NULL); - return (aes_get_mbs(&entry->ae_symlink)); + if (entry->ae_set & AE_SET_SYMLINK) + return (aes_get_mbs(&entry->ae_symlink)); + return (NULL); } const wchar_t * archive_entry_symlink_w(struct archive_entry *entry) { - if (!entry->ae_symlinkset) - return (NULL); - return (aes_get_wcs(&entry->ae_symlink)); + if (entry->ae_set & AE_SET_SYMLINK) + return (aes_get_wcs(&entry->ae_symlink)); + return (NULL); } uid_t @@ -773,7 +784,9 @@ { aes_set_mbs(&entry->ae_hardlink, target); if (target != NULL) - entry->ae_hardlinkset = 1; + entry->ae_set |= AE_SET_HARDLINK; + else + entry->ae_set &= ~AE_SET_HARDLINK; } void @@ -781,7 +794,9 @@ { aes_copy_mbs(&entry->ae_hardlink, target); if (target != NULL) - entry->ae_hardlinkset = 1; + entry->ae_set |= AE_SET_HARDLINK; + else + entry->ae_set &= ~AE_SET_HARDLINK; } void @@ -789,13 +804,16 @@ { aes_copy_wcs(&entry->ae_hardlink, target); if (target != NULL) - entry->ae_hardlinkset = 1; + entry->ae_set |= AE_SET_HARDLINK; + else + entry->ae_set &= ~AE_SET_HARDLINK; } void archive_entry_set_atime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; + entry->ae_set |= AE_SET_ATIME; entry->ae_stat.aest_atime = t; entry->ae_stat.aest_atime_nsec = ns; } @@ -836,7 +854,7 @@ void archive_entry_set_link(struct archive_entry *entry, const char *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) aes_set_mbs(&entry->ae_symlink, target); else aes_set_mbs(&entry->ae_hardlink, target); @@ -846,7 +864,7 @@ void archive_entry_copy_link(struct archive_entry *entry, const char *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) aes_copy_mbs(&entry->ae_symlink, target); else aes_copy_mbs(&entry->ae_hardlink, target); @@ -856,7 +874,7 @@ void archive_entry_copy_link_w(struct archive_entry *entry, const wchar_t *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) aes_copy_wcs(&entry->ae_symlink, target); else aes_copy_wcs(&entry->ae_hardlink, target); @@ -865,7 +883,7 @@ int archive_entry_update_link_utf8(struct archive_entry *entry, const char *target) { - if (entry->ae_symlinkset) + if (entry->ae_set & AE_SET_SYMLINK) return (aes_update_utf8(&entry->ae_symlink, target)); else return (aes_update_utf8(&entry->ae_hardlink, target)); @@ -954,6 +972,14 @@ { entry->stat_valid = 0; entry->ae_stat.aest_size = s; + entry->ae_set |= AE_SET_SIZE; +} + +void +archive_entry_unset_size(struct archive_entry *entry) +{ + archive_entry_set_size(entry, 0); + entry->ae_set &= ~AE_SET_SIZE; } void @@ -967,7 +993,9 @@ { aes_set_mbs(&entry->ae_symlink, linkname); if (linkname != NULL) - entry->ae_symlinkset = 1; + entry->ae_set |= AE_SET_SYMLINK; + else + entry->ae_set &= ~AE_SET_SYMLINK; } void @@ -975,7 +1003,9 @@ { aes_copy_mbs(&entry->ae_symlink, linkname); if (linkname != NULL) - entry->ae_symlinkset = 1; + entry->ae_set |= AE_SET_SYMLINK; + else + entry->ae_set &= ~AE_SET_SYMLINK; } void @@ -983,7 +1013,9 @@ { aes_copy_wcs(&entry->ae_symlink, linkname); if (linkname != NULL) - entry->ae_symlinkset = 1; + entry->ae_set |= AE_SET_SYMLINK; + else + entry->ae_set &= ~AE_SET_SYMLINK; } void ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry.h#5 (ktext) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Tim Kientzle + * Copyright (c) 2003-2008 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,7 +22,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. * - * $Id$ $Change: 143014 $ $DateTime$ $Author$ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.27 2008/05/26 17:00:22 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -152,10 +152,26 @@ /* * Retrieve fields from an archive_entry. + * + * There are a number of implicit conversions among these fields. For + * example, if a regular string field is set and you read the _w wide + * character field, the entry will implicitly convert narrow-to-wide + * using the current locale. Similarly, dev values are automatically + * updated when you write devmajor or devminor and vice versa. + * + * In addition, fields can be "set" or "unset." Unset string fields + * return NULL, non-string fields have _is_set() functions to test + * whether they've been set. You can "unset" a string field by + * assigning NULL; there is currently no way to unset a non-string + * field. + * + * Note: There is one ambiguity in the above; string fields will + * also return NULL when implicit character set conversions fail. + * This is usually what you want. */ - __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_atime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL dev_t archive_entry_dev(struct archive_entry *); @@ -183,6 +199,7 @@ __LA_DECL dev_t archive_entry_rdevminor(struct archive_entry *); __LA_DECL const char *archive_entry_sourcepath(struct archive_entry *); __LA_DECL int64_t archive_entry_size(struct archive_entry *); +__LA_DECL int archive_entry_size_is_set(struct archive_entry *); __LA_DECL const char *archive_entry_strmode(struct archive_entry *); __LA_DECL const char *archive_entry_symlink(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_symlink_w(struct archive_entry *); @@ -195,6 +212,10 @@ * * Note that string 'set' functions do not copy the string, only the pointer. * In contrast, 'copy' functions do copy the object pointed to. + * + * Note: As of libarchive 2.4, 'set' functions do copy the string and + * are therefore exact synonyms for the 'copy' versions. The 'copy' + * names will be retired in libarchive 3.0. */ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); @@ -236,6 +257,7 @@ __LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t); __LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t); __LA_DECL void archive_entry_set_size(struct archive_entry *, int64_t); +__LA_DECL void archive_entry_unset_size(struct archive_entry *); __LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *); __LA_DECL void archive_entry_set_symlink(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_symlink(struct archive_entry *, const char *); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry_link_resolver.c#8 (ktext) ==== @@ -189,7 +189,7 @@ case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR: le = find_entry(res, *e); if (le != NULL) { - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); } else @@ -217,7 +217,7 @@ *e = le->entry; le->entry = t; /* Make the old entry into a hardlink. */ - archive_entry_set_size(*e, 0); + archive_entry_unset_size(*e); archive_entry_copy_hardlink(*e, archive_entry_pathname(le->canonical)); /* If we ran out of links, return the ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry_private.h#5 (ktext) ==== @@ -22,7 +22,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. * - * $Id$ $Change: 143014 $ $DateTime$ $Author$ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.4 2008/05/26 17:00:22 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -136,6 +136,12 @@ dev_t aest_rdevminor; } ae_stat; + int ae_set; /* bitmap of fields that are currently set */ +#define AE_SET_HARDLINK 1 +#define AE_SET_SYMLINK 2 +#define AE_SET_ATIME 4 +#define AE_SET_SIZE 32 + /* * Use aes here so that we get transparent mbs<->wcs conversions. */ @@ -147,8 +153,6 @@ struct aes ae_pathname; /* Name of entry */ struct aes ae_symlink; /* symlink contents */ struct aes ae_uname; /* Name of owner */ - unsigned char ae_hardlinkset; - unsigned char ae_symlinkset; /* Not used within libarchive; useful for some clients. */ struct aes ae_sourcepath; /* Path this entry is sourced from. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 28 12:57:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B7D106567B; Thu, 28 Aug 2008 12:57: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 5FE3C1065677 for ; Thu, 28 Aug 2008 12:57:59 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52CC08FC15 for ; Thu, 28 Aug 2008 12:57:59 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SCvxL0094129 for ; Thu, 28 Aug 2008 12:57:59 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SCvxb8094127 for perforce@freebsd.org; Thu, 28 Aug 2008 12:57:59 GMT (envelope-from strauss@FreeBSD.org) Date: Thu, 28 Aug 2008 12:57:59 GMT Message-Id: <200808281257.m7SCvxb8094127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 148693 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, 28 Aug 2008 12:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=148693 Change 148693 by strauss@strauss_marvelman on 2008/08/28 12:57:18 Google credits Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#39 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#4 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_empty.c#3 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#13 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#39 (text+ko) ==== @@ -24,6 +24,10 @@ */ /* + * Development supported by Google Summer of Code 2008. + */ + +/* * The current implementation is very limited: * * - No compression support. ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#4 (text+ko) ==== @@ -1,28 +1,32 @@ /*- -* Copyright (c) 2003-2008 Tim Kientzle -* Copyright (c) 2008 Anselm Strauss -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (c) 2003-2008 Tim Kientzle + * Copyright (c) 2008 Anselm Strauss + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Development supported by Google Summer of Code 2008. + */ #include "test.h" __FBSDID("$Id$ $Change$ $DateTime$ $Author$"); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_empty.c#3 (text+ko) ==== @@ -23,6 +23,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Development supported by Google Summer of Code 2008. + */ + #include "test.h" __FBSDID("$Id$ $Change$ $DateTime$ $Author$"); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#13 (text+ko) ==== @@ -23,6 +23,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Development supported by Google Summer of Code 2008. + */ + #include "test.h" #include __FBSDID("$Id$ $Change$ $DateTime$ $Author$"); From owner-p4-projects@FreeBSD.ORG Thu Aug 28 13:14:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E56301065674; Thu, 28 Aug 2008 13:14: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 A1E50106567B for ; Thu, 28 Aug 2008 13:14:24 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 929798FC22 for ; Thu, 28 Aug 2008 13:14:24 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SDEOeQ096613 for ; Thu, 28 Aug 2008 13:14:24 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SDDScI096527 for perforce@freebsd.org; Thu, 28 Aug 2008 13:13:28 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Aug 2008 13:13:28 GMT Message-Id: <200808281313.m7SDDScI096527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148695 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, 28 Aug 2008 13:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=148695 Change 148695 by raj@raj_mimi on 2008/08/28 13:13:20 IFC @148684 Affected files ... .. //depot/projects/arm/src/LOCKS#3 integrate .. //depot/projects/arm/src/MAINTAINERS#9 integrate .. //depot/projects/arm/src/Makefile#20 integrate .. //depot/projects/arm/src/Makefile.inc1#38 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#37 integrate .. //depot/projects/arm/src/UPDATING#28 integrate .. //depot/projects/arm/src/bin/cp/utils.c#5 integrate .. //depot/projects/arm/src/bin/echo/echo.c#2 integrate .. //depot/projects/arm/src/bin/ln/ln.1#3 integrate .. //depot/projects/arm/src/bin/ln/ln.c#3 integrate .. //depot/projects/arm/src/bin/mv/mv.c#3 integrate .. //depot/projects/arm/src/bin/ps/ps.c#4 integrate .. //depot/projects/arm/src/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/arm/src/bin/sh/alias.c#2 integrate .. //depot/projects/arm/src/bin/sh/eval.c#3 integrate .. //depot/projects/arm/src/bin/sh/expand.c#4 integrate .. //depot/projects/arm/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/arm/src/bin/sh/mknodes.c#2 integrate .. //depot/projects/arm/src/bin/sh/options.c#3 integrate .. //depot/projects/arm/src/bin/sh/parser.c#4 integrate .. //depot/projects/arm/src/bin/sh/parser.h#3 integrate .. //depot/projects/arm/src/bin/stty/gfmt.c#2 integrate .. //depot/projects/arm/src/bin/stty/modes.c#2 integrate .. //depot/projects/arm/src/bin/stty/print.c#2 integrate .. //depot/projects/arm/src/bin/stty/stty.1#2 integrate .. //depot/projects/arm/src/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/arm/src/cddl/lib/Makefile#7 integrate .. //depot/projects/arm/src/cddl/lib/drti/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libctf/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/Makefile#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/errno.d#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/net.d#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/psinfo.d#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/sched.d#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/signal.d#1 branch .. //depot/projects/arm/src/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/projects/arm/src/cddl/usr.bin/Makefile#7 integrate .. //depot/projects/arm/src/cddl/usr.bin/ctfconvert/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.bin/ctfdump/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.bin/ctfmerge/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.bin/sgsmsg/Makefile#1 branch .. //depot/projects/arm/src/cddl/usr.sbin/Makefile#7 integrate .. //depot/projects/arm/src/cddl/usr.sbin/dtrace/Makefile#1 branch .. //depot/projects/arm/src/contrib/bind9/CHANGES#9 integrate .. //depot/projects/arm/src/contrib/bind9/FREEBSD-Upgrade#3 delete .. //depot/projects/arm/src/contrib/bind9/FREEBSD-Xlist#2 delete .. //depot/projects/arm/src/contrib/bind9/bin/named/client.c#6 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/server.c#6 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.pdf#6 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/arm/src/contrib/bind9/lib/bind/config.h.in#4 delete .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure#5 delete .. //depot/projects/arm/src/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dispatch.c#6 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/arm/src/contrib/bind9/version#9 integrate .. //depot/projects/arm/src/contrib/binutils/bfd/coff-mips.c#3 branch .. //depot/projects/arm/src/contrib/binutils/bfd/cpu-mips.c#3 branch .. //depot/projects/arm/src/contrib/binutils/bfd/elf32-mips.c#3 branch .. //depot/projects/arm/src/contrib/binutils/bfd/elf64-mips.c#3 branch .. //depot/projects/arm/src/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/arm/src/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/arm/src/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/arm/src/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/arm/src/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/arm/src/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/arm/src/contrib/binutils/bfd/mipsbsd.c#3 branch .. //depot/projects/arm/src/contrib/binutils/bfd/pe-mips.c#3 branch .. //depot/projects/arm/src/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/projects/arm/src/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/projects/arm/src/contrib/binutils/gprof/mips.c#1 branch .. //depot/projects/arm/src/contrib/binutils/include/coff/mips.h#1 branch .. //depot/projects/arm/src/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/projects/arm/src/contrib/binutils/include/opcode/mips.h#3 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/projects/arm/src/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/projects/arm/src/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/projects/arm/src/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/projects/arm/src/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/com_err/com_err.c#2 integrate .. //depot/projects/arm/src/contrib/com_err/com_err.h#2 integrate .. //depot/projects/arm/src/contrib/com_err/com_right.h#2 integrate .. //depot/projects/arm/src/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/arm/src/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/arm/src/contrib/com_err/error.c#2 integrate .. //depot/projects/arm/src/contrib/com_err/lex.c#1 branch .. //depot/projects/arm/src/contrib/com_err/lex.h#2 integrate .. //depot/projects/arm/src/contrib/com_err/lex.l#2 integrate .. //depot/projects/arm/src/contrib/com_err/parse.c#1 branch .. //depot/projects/arm/src/contrib/com_err/parse.h#1 branch .. //depot/projects/arm/src/contrib/com_err/parse.y#2 integrate .. //depot/projects/arm/src/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/arm/src/contrib/com_err/version-script.map#1 branch .. //depot/projects/arm/src/contrib/cpio/ABOUT-NLS#2 integrate .. //depot/projects/arm/src/contrib/cpio/COPYING#2 integrate .. //depot/projects/arm/src/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cpio/INSTALL#2 integrate .. //depot/projects/arm/src/contrib/cpio/NEWS#2 integrate .. //depot/projects/arm/src/contrib/cpio/THANKS#2 integrate .. //depot/projects/arm/src/contrib/cpio/TODO#2 integrate .. //depot/projects/arm/src/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/arm/src/contrib/cpio/doc/version.texi#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/alloca_.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-ba.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-eexst.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-fmtstream.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-fmtstream.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-fs-xinl.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-help.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-namefrob.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-parse.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-pin.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/argp-pv.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-pvh.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp-xinl.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/argp.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/basename.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/dirname.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/dirname.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/error.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/error.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/exit.h#2 delete .. //depot/projects/arm/src/contrib/cpio/lib/exitfail.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/exitfail.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/fatal.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/full-write.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/full-write.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/getopt.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/getopt1.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/getopt_.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/getopt_int.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/gettext.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/hash.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/hash.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/intprops.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/inttostr.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/inttostr.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/localedir.h#2 delete .. //depot/projects/arm/src/contrib/cpio/lib/mempcpy.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/mempcpy.h#2 delete .. //depot/projects/arm/src/contrib/cpio/lib/paxerror.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/paxexit.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/paxlib.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/paxnames.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/quote.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/quote.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/quotearg.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/quotearg.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/rmt-command.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/rmt.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/rtapelib.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/safe-read.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/safe-read.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/safe-write.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/safe-write.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/savedir.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/savedir.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/strcase.h#2 delete .. //depot/projects/arm/src/contrib/cpio/lib/strchrnul.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/strchrnul.h#2 delete .. //depot/projects/arm/src/contrib/cpio/lib/stripslash.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/strndup.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/strndup.h#2 delete .. //depot/projects/arm/src/contrib/cpio/lib/strnlen.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/system-ioctl.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/system.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/umaxtostr.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/unlocked-io.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/utimens.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/utimens.h#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/xalloc-die.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/xalloc.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/xmalloc.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/lib/xstrndup.c#1 branch .. //depot/projects/arm/src/contrib/cpio/lib/xstrndup.h#1 branch .. //depot/projects/arm/src/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/cpio.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/cpiohdr.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/defer.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/defer.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/dstring.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/dstring.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/filemode.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/filetypes.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/global.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/idcache.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/main.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/makepath.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/tar.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/tar.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/tarhdr.h#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/userspec.c#2 integrate .. //depot/projects/arm/src/contrib/cpio/src/util.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/HACKING.DOCS#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/classify.c#4 integrate .. //depot/projects/arm/src/contrib/expat/COPYING#2 integrate .. //depot/projects/arm/src/contrib/expat/Changes#2 integrate .. //depot/projects/arm/src/contrib/expat/FREEBSD-upgrade#2 integrate .. //depot/projects/arm/src/contrib/expat/MANIFEST#2 integrate .. //depot/projects/arm/src/contrib/expat/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/expat/README#2 integrate .. //depot/projects/arm/src/contrib/expat/configure#2 integrate .. //depot/projects/arm/src/contrib/expat/configure.in#2 integrate .. //depot/projects/arm/src/contrib/expat/doc/expat.png#1 branch .. //depot/projects/arm/src/contrib/expat/doc/reference.html#2 integrate .. //depot/projects/arm/src/contrib/expat/doc/style.css#2 integrate .. //depot/projects/arm/src/contrib/expat/doc/valid-xhtml10.png#1 branch .. //depot/projects/arm/src/contrib/expat/doc/xmlwf.1#2 integrate .. //depot/projects/arm/src/contrib/expat/doc/xmlwf.sgml#2 integrate .. //depot/projects/arm/src/contrib/expat/examples/elements.c#2 integrate .. //depot/projects/arm/src/contrib/expat/examples/outline.c#2 integrate .. //depot/projects/arm/src/contrib/expat/expat_config.h.in#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/ascii.h#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/expat.h#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/expat_external.h#1 branch .. //depot/projects/arm/src/contrib/expat/lib/internal.h#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/winconfig.h#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmlrole.c#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmlrole.h#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmltok.c#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmltok.h#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/projects/arm/src/contrib/expat/lib/xmltok_ns.c#2 integrate .. //depot/projects/arm/src/contrib/expat/tests/README.txt#2 integrate .. //depot/projects/arm/src/contrib/expat/tests/benchmark/README.txt#1 branch .. //depot/projects/arm/src/contrib/expat/tests/benchmark/benchmark.c#1 branch .. //depot/projects/arm/src/contrib/expat/tests/benchmark/benchmark.dsp#1 branch .. //depot/projects/arm/src/contrib/expat/tests/benchmark/benchmark.dsw#1 branch .. //depot/projects/arm/src/contrib/expat/tests/chardata.c#2 integrate .. //depot/projects/arm/src/contrib/expat/tests/chardata.h#2 integrate .. //depot/projects/arm/src/contrib/expat/tests/minicheck.c#1 branch .. //depot/projects/arm/src/contrib/expat/tests/minicheck.h#1 branch .. //depot/projects/arm/src/contrib/expat/tests/runtests.c#2 integrate .. //depot/projects/arm/src/contrib/expat/tests/runtestspp.cpp#1 branch .. //depot/projects/arm/src/contrib/expat/tests/xmltest.sh#2 integrate .. //depot/projects/arm/src/contrib/expat/xmlwf/codepage.c#2 integrate .. //depot/projects/arm/src/contrib/expat/xmlwf/readfilemap.c#2 integrate .. //depot/projects/arm/src/contrib/expat/xmlwf/unixfilemap.c#2 integrate .. //depot/projects/arm/src/contrib/expat/xmlwf/xmlfile.c#2 integrate .. //depot/projects/arm/src/contrib/expat/xmlwf/xmlfile.h#2 integrate .. //depot/projects/arm/src/contrib/expat/xmlwf/xmlwf.c#2 integrate .. //depot/projects/arm/src/contrib/gcc/common.opt#3 integrate .. //depot/projects/arm/src/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/arm/src/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/arm/src/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#5 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/sock.c#5 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni1.nat#3 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/arm/src/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/projects/arm/src/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/projects/arm/src/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/arm/src/contrib/ncurses/NEWS#4 integrate .. //depot/projects/arm/src/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/arm/src/contrib/ncurses/config.guess#4 integrate .. //depot/projects/arm/src/contrib/ncurses/config.sub#4 integrate .. //depot/projects/arm/src/contrib/ncurses/configure#4 integrate .. //depot/projects/arm/src/contrib/ncurses/configure.in#4 integrate .. //depot/projects/arm/src/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/arm/src/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/arm/src/contrib/ncurses/man/curs_threads.3x#2 integrate .. //depot/projects/arm/src/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/arm/src/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/projects/arm/src/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_bkgd.c#3 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_restart.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/curses.priv.h#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/fifo_defs.h#2 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/lib_napms.c#3 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tty/lib_tstp.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate .. //depot/projects/arm/src/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/arm/src/contrib/netcat/nc.1#5 integrate .. //depot/projects/arm/src/contrib/netcat/netcat.c#5 integrate .. //depot/projects/arm/src/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/arm/src/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/arm/src/contrib/ntp/CommitLog#1 branch .. //depot/projects/arm/src/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/arm/src/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/arm/src/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/arm/src/contrib/ntp/INSTALL#2 integrate .. //depot/projects/arm/src/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/NEWS#2 integrate .. //depot/projects/arm/src/contrib/ntp/README#2 integrate .. //depot/projects/arm/src/contrib/ntp/README.bk#2 integrate .. //depot/projects/arm/src/contrib/ntp/README.patches#2 integrate .. //depot/projects/arm/src/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/arm/src/contrib/ntp/README.versions#2 integrate .. //depot/projects/arm/src/contrib/ntp/TODO#2 integrate .. //depot/projects/arm/src/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/arm/src/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/arm/src/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/arm/src/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/arm/src/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/arm/src/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/arm/src/contrib/ntp/bootstrap#1 branch .. //depot/projects/arm/src/contrib/ntp/build#2 integrate .. //depot/projects/arm/src/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/compile#2 integrate .. //depot/projects/arm/src/contrib/ntp/config.guess#2 integrate .. //depot/projects/arm/src/contrib/ntp/config.h.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/config.sub#2 integrate .. //depot/projects/arm/src/contrib/ntp/configure#2 integrate .. //depot/projects/arm/src/contrib/ntp/configure.ac#1 branch .. //depot/projects/arm/src/contrib/ntp/configure.in#2 delete .. //depot/projects/arm/src/contrib/ntp/depcomp#2 integrate .. //depot/projects/arm/src/contrib/ntp/flock-build#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/build.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/arm/src/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/config.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/arm/src/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/arm/src/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/groups.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/hints.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/index.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/arm/src/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/patches.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/porting.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/quick.html#2 delete .. //depot/projects/arm/src/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/release.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/arm/src/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/arm/src/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/arm/src/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/arm/src/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/arm/src/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/arm/src/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/include/version.def#1 branch .. //depot/projects/arm/src/contrib/ntp/install-sh#2 integrate .. //depot/projects/arm/src/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/arm/src/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/README#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/README#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/arm/src/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/arm/src/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/missing#2 integrate .. //depot/projects/arm/src/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/arm/src/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/arm/src/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/arm/src/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/arm/src/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/arm/src/contrib/ntp/scripts/genver#1 branch .. //depot/projects/arm/src/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/arm/src/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/arm/src/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/arm/src/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/README#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/compile#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/arm/src/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/arm/src/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/arm/src/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/arm/src/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/arm/src/contrib/ntp/util/tg.c#1 branch .. //depot/projects/arm/src/contrib/ntp/version#2 integrate .. //depot/projects/arm/src/contrib/ntp/version.m4#1 branch .. //depot/projects/arm/src/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/arm/src/contrib/sendmail/FREEBSD-upgrade#5 integrate .. //depot/projects/arm/src/contrib/sendmail/KNOWNBUGS#3 integrate .. //depot/projects/arm/src/contrib/sendmail/PGPKEYS#3 integrate .. //depot/projects/arm/src/contrib/sendmail/README#2 integrate .. //depot/projects/arm/src/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/README#3 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/arm/src/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/arm/src/contrib/sendmail/include/libmilter/mfapi.h#3 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#3 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/engine.c#5 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/mail.local/mail.local.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/arm/src/contrib/sendmail/makemap/makemap.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/arm/src/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/Makefile.m4#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/README#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/conf.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/daemon.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/err.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/mailq.1#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/main.c#5 integrate .. //depot/projects/arm/src/contrib/sendmail/src/mci.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/parseaddr.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/arm/src/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/savemail.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/arm/src/contrib/sendmail/src/sm_resolve.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/arm/src/contrib/sendmail/src/usersmtp.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/arm/src/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/arm/src/contrib/tcsh/tc.func.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 28 13:29:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01B1210656A7; Thu, 28 Aug 2008 13:29: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 7EE0C1065676 for ; Thu, 28 Aug 2008 13:29:04 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7263D8FC2B for ; Thu, 28 Aug 2008 13:29:04 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SDT4qL097782 for ; Thu, 28 Aug 2008 13:29:04 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SDT4qY097780 for perforce@freebsd.org; Thu, 28 Aug 2008 13:29:04 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Aug 2008 13:29:04 GMT Message-Id: <200808281329.m7SDT4qY097780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148698 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, 28 Aug 2008 13:29:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=148698 Change 148698 by raj@raj_mimi on 2008/08/28 13:28:05 Fix SMC phy after the IFC. Affected files ... .. //depot/projects/arm/src/sys/dev/mii/smcphy.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mii/smcphy.c#3 (text+ko) ==== @@ -83,11 +83,11 @@ ma = device_get_ivars(dev); - if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_SMC || - MII_MODEL(ma->mii_id2) != MII_MODEL_SMC_LAN83C183) + if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_SMSC || + MII_MODEL(ma->mii_id2) != MII_MODEL_SMSC_LAN83C183) return (ENXIO); - device_set_desc(dev, MII_STR_SMC_LAN83C183); + device_set_desc(dev, MII_STR_SMSC_LAN83C183); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Aug 28 13:45:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D6BA106567A; Thu, 28 Aug 2008 13:45: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 21D0E1065678 for ; Thu, 28 Aug 2008 13:45:21 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF4D18FC18 for ; Thu, 28 Aug 2008 13:45:20 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SDjK5l002270 for ; Thu, 28 Aug 2008 13:45:20 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SDjK8h002268 for perforce@freebsd.org; Thu, 28 Aug 2008 13:45:20 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Aug 2008 13:45:20 GMT Message-Id: <200808281345.m7SDjK8h002268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 148699 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, 28 Aug 2008 13:45:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=148699 Change 148699 by raj@raj_mimi on 2008/08/28 13:44:56 Remove [the retired] genclock entry from Orion kernel config. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#2 (text+ko) ==== @@ -47,7 +47,6 @@ #options WITNESS_KDB # Pseudo devices -device genclock device random device pty device loop From owner-p4-projects@FreeBSD.ORG Thu Aug 28 14:16:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 221DE1065684; Thu, 28 Aug 2008 14:16: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 D94B81065680 for ; Thu, 28 Aug 2008 14:16:53 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC3228FC1E for ; Thu, 28 Aug 2008 14:16:53 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SEGr1S005854 for ; Thu, 28 Aug 2008 14:16:53 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SEGrnj005852 for perforce@freebsd.org; Thu, 28 Aug 2008 14:16:53 GMT (envelope-from strauss@FreeBSD.org) Date: Thu, 28 Aug 2008 14:16:53 GMT Message-Id: <200808281416.m7SEGrnj005852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 148706 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, 28 Aug 2008 14:16:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=148706 Change 148706 by strauss@strauss_marvelman on 2008/08/28 14:16:08 Accidentally removed ZIP from the supported write formats by name. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#7 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_by_name.c#7 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#7 (ktext) ==== @@ -470,6 +470,7 @@ __LA_DECL int archive_write_set_format_shar(struct archive *); __LA_DECL int archive_write_set_format_shar_dump(struct archive *); __LA_DECL int archive_write_set_format_ustar(struct archive *); +__LA_DECL int archive_write_set_format_zip(struct archive *); __LA_DECL int archive_write_open(struct archive *, void *, archive_open_callback *, archive_write_callback *, archive_close_callback *); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_by_name.c#7 (ktext) ==== @@ -57,6 +57,7 @@ { "shar", archive_write_set_format_shar }, { "shardump", archive_write_set_format_shar_dump }, { "ustar", archive_write_set_format_ustar }, + { "zip", archive_write_set_format_zip }, { NULL, NULL } }; From owner-p4-projects@FreeBSD.ORG Thu Aug 28 15:11:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29DBC1065672; Thu, 28 Aug 2008 15:11: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 E38951065670 for ; Thu, 28 Aug 2008 15:11:49 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D48D68FC1F for ; Thu, 28 Aug 2008 15:11:49 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SFBn5c011409 for ; Thu, 28 Aug 2008 15:11:49 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SFBnUG011397 for perforce@freebsd.org; Thu, 28 Aug 2008 15:11:49 GMT (envelope-from strauss@FreeBSD.org) Date: Thu, 28 Aug 2008 15:11:49 GMT Message-Id: <200808281511.m7SFBnUG011397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 148708 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, 28 Aug 2008 15:11:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=148708 Change 148708 by strauss@strauss_marvelman on 2008/08/28 15:09:59 - Writing compressed and uncompressed sizes in local file header. - Uncommented remaining tests, except for permission restoring. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#40 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#5 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#14 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#40 (text+ko) ==== @@ -268,7 +268,7 @@ * The fields this is true for and the reason why are: * * - compression: Not yet supported (TODO) - * - crc32, compressed_size, uncompressed_size: written in data descriptor + * - crc32: written in data descriptor * - extra_length: not used (TODO) */ memset(&h, 0, sizeof(h)); @@ -278,6 +278,10 @@ zip_encode(dos_time(archive_entry_mtime(entry)), &h.timedate, sizeof(h.timedate)); zip_encode(path_length(entry), &h.filename_length, sizeof(h.filename_length)); zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); + /* Setting compressed and uncompressed sizes even when specification says + * to set to zero when using data descriptors. */ + zip_encode(size, &h.compressed_size, sizeof(h.compressed_size)); + zip_encode(size, &h.uncompressed_size, sizeof(h.uncompressed_size)); /* Formatting extra data. */ zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); @@ -536,6 +540,7 @@ return (ARCHIVE_FATAL); written_bytes += strlen(path); + /* Folders are recognized by a traling slash. */ if ((type == AE_IFDIR) & (path[strlen(path) - 1] != '/')) { ret = (archive->compressor.write)(archive, "/", 1); if (ret != ARCHIVE_OK) ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#5 (text+ko) ==== @@ -28,6 +28,8 @@ * Development supported by Google Summer of Code 2008. */ +/* TODO: reader does not yet restore permissions. */ + #include "test.h" __FBSDID("$Id$ $Change$ $DateTime$ $Author$"); @@ -125,46 +127,44 @@ assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file", archive_entry_pathname(ae)); - /* TODO: reader does not yet restore permissions. */ - /* TODO: reader does not yet respect data descriptors. */ - /*assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae)); + //assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae)); assertEqualInt(8, archive_entry_size(ae)); assertEqualIntA(a, archive_entry_size(ae), archive_read_data(a, filedata, sizeof(filedata))); - assertEqualMem(filedata, "12345678", 8);*/ + assertEqualMem(filedata, "12345678", 8); /* * Read the second file back. */ - /*assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt(1, archive_entry_mtime(ae)); assertEqualInt(0, archive_entry_mtime_nsec(ae)); assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file2", archive_entry_pathname(ae)); - assert((S_IFREG | 0755) == archive_entry_mode(ae)); + //assert((S_IFREG | 0755) == archive_entry_mode(ae)); assertEqualInt(4, archive_entry_size(ae)); assertEqualIntA(a, archive_entry_size(ae), archive_read_data(a, filedata, sizeof(filedata))); - assertEqualMem(filedata, "1234", 4);*/ + assertEqualMem(filedata, "1234", 4); /* * Read the dir entry back. */ - /*assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt(11, archive_entry_mtime(ae)); assertEqualInt(0, archive_entry_mtime_nsec(ae)); assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); - assertEqualString("dir", archive_entry_pathname(ae)); - assertEqualInt((S_IFDIR | 0755), archive_entry_mode(ae)); + assertEqualString("dir/", archive_entry_pathname(ae)); + //assertEqualInt((S_IFDIR | 0755), archive_entry_mode(ae)); assertEqualInt(0, archive_entry_size(ae)); - assertEqualIntA(a, 0, archive_read_data(a, filedata, 10));*/ + assertEqualIntA(a, 0, archive_read_data(a, filedata, 10)); /* Verify the end of the archive. */ - /*assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); - free(buff);*/ + free(buff); } ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#14 (text+ko) ==== @@ -178,8 +178,8 @@ assertEqualInt(i2(q + 10), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */ assertEqualInt(i2(q + 12), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */ assertEqualInt(i4(q + 14), 0); /* CRC-32 */ - assertEqualInt(i4(q + 18), 0); /* Compressed size */ - assertEqualInt(i4(q + 22), 0); /* Uncompressed size */ + assertEqualInt(i4(q + 18), sizeof(file_data1) + sizeof(file_data2)); /* Compressed size */ + assertEqualInt(i4(q + 22), sizeof(file_data1) + sizeof(file_data2)); /* Uncompressed size */ assertEqualInt(i2(q + 26), strlen(file_name)); /* Pathname length */ assertEqualInt(i2(q + 28), 25); /* Extra field length */ assertEqualMem(q + 30, file_name, strlen(file_name)); /* Pathname */ From owner-p4-projects@FreeBSD.ORG Thu Aug 28 18:54:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BEA11065675; Thu, 28 Aug 2008 18:54: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 4FD95106568C for ; Thu, 28 Aug 2008 18:54:14 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AF368FC20 for ; Thu, 28 Aug 2008 18:54:14 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SIsExP054479 for ; Thu, 28 Aug 2008 18:54:14 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SIsEwR054477 for perforce@freebsd.org; Thu, 28 Aug 2008 18:54:14 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 28 Aug 2008 18:54:14 GMT Message-Id: <200808281854.m7SIsEwR054477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148734 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, 28 Aug 2008 18:54:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=148734 Change 148734 by ed@ed_dull on 2008/08/28 18:53:25 Already add a first prototype of the packet mode code. This means we can now happily use ^S and ^Q while inside screen. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#34 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#18 edit .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#6 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#34 (text+ko) ==== @@ -818,7 +818,7 @@ } static void -ttydevsw_defpktnotify(struct tty *tp, int event) +ttydevsw_defpktnotify(struct tty *tp, char event) { } @@ -1382,6 +1382,17 @@ ttyinq_canonicalize(&tp->t_inq); tty_wakeup(tp, FREAD); } + + /* + * For packet mode: notify the PTY consumer that VSTOP + * and VSTART may have been changed. + */ + if (tp->t_termios.c_iflag & IXON && + tp->t_termios.c_cc[VSTOP] == CTRL('S') && + tp->t_termios.c_cc[VSTART] == CTRL('Q')) + ttydevsw_pktnotify(tp, TIOCPKT_DOSTOP); + else + ttydevsw_pktnotify(tp, TIOCPKT_NOSTOP); return (0); } case TIOCGETD: ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#18 (text+ko) ==== @@ -82,6 +82,7 @@ int pts_unit; /* (c) Device unit number. */ unsigned int pts_flags; /* (t) Device flags. */ #define PTS_PKT 0x1 /* Packet mode. */ + char pts_pkt; /* (t) Unread packet mode data. */ struct cv pts_inwait; /* (t) Blocking write() on master. */ struct selinfo pts_inpoll; /* (t) Select queue for write(). */ @@ -105,34 +106,54 @@ { struct tty *tp = fp->f_data; struct pts_softc *psc = tty_softc(tp); - int error, oresid; + int error = 0; + char pkt; if (uio->uio_resid == 0) return (0); - - /* - * Implement packet mode. When packet mode is turned on, the - * first byte contains a bitmask of events that occured (start, - * stop, flush, window size, etc). - */ + + tty_lock(tp); + + for (;;) { + /* + * Implement packet mode. When packet mode is turned on, + * the first byte contains a bitmask of events that + * occured (start, stop, flush, window size, etc). + */ + if (psc->pts_flags & PTS_PKT && psc->pts_pkt) { + pkt = psc->pts_pkt; + psc->pts_pkt = 0; + tty_unlock(tp); - if (psc->pts_flags & PTS_PKT) { - /* XXX: return proper bits. */ - error = ureadc(0, uio); - if (error != 0) + error = ureadc(pkt, uio); return (error); - if (uio->uio_resid == 0) - return (0); - } + } + + /* + * Transmit regular data. + * + * XXX: We shouldn't use ttydisc_getc_poll()! Even + * though in this implementation, there is likely going + * to be data, we should just call ttydisc_getc_uio() + * and use its return value to sleep. + */ + if (ttydisc_getc_poll(tp)) { + if (psc->pts_flags & PTS_PKT) { + /* + * XXX: Small race. Fortunately PTY + * consumers aren't multithreaded. + */ - oresid = uio->uio_resid; + tty_unlock(tp); + error = ureadc(TIOCPKT_DATA, uio); + if (error) + return (error); + tty_lock(tp); + } - tty_lock(tp); - for (;;) { - error = ttydisc_getc_uio(tp, uio); - /* We've got data (or an error). */ - if (error != 0 || uio->uio_resid != oresid) + error = ttydisc_getc_uio(tp, uio); break; + } /* Maybe the device isn't used anyway. */ if (tty_opened(tp) == 0) @@ -147,6 +168,7 @@ if (error != 0) break; } + tty_unlock(tp); return (error); @@ -367,7 +389,8 @@ if (events & (POLLIN|POLLRDNORM)) { /* See if we can getc something. */ - if (ttydisc_getc_poll(tp)) + if (ttydisc_getc_poll(tp) || + (psc->pts_flags & PTS_PKT && psc->pts_pkt)) revents |= events & (POLLIN|POLLRDNORM); } if (events & (POLLOUT|POLLWRNORM)) { @@ -486,8 +509,31 @@ } static void -ptsdrv_pktnotify(struct tty *tp, int event) +ptsdrv_pktnotify(struct tty *tp, char event) { + struct pts_softc *psc = tty_softc(tp); + + /* + * Clear conflicting flags. + */ + + switch (event) { + case TIOCPKT_STOP: + psc->pts_pkt &= ~TIOCPKT_START; + break; + case TIOCPKT_START: + psc->pts_pkt &= ~TIOCPKT_STOP; + break; + case TIOCPKT_NOSTOP: + psc->pts_pkt &= ~TIOCPKT_DOSTOP; + break; + case TIOCPKT_DOSTOP: + psc->pts_pkt &= ~TIOCPKT_NOSTOP; + break; + } + + psc->pts_pkt |= event; + ptsdrv_outwakeup(tp); } static void ==== //depot/projects/mpsafetty/sys/sys/ttydevsw.h#6 (text+ko) ==== @@ -48,7 +48,7 @@ typedef int tsw_param_t(struct tty *, struct termios *); typedef int tsw_modem_t(struct tty *, int, int); typedef int tsw_mmap_t(struct tty *, vm_offset_t, vm_paddr_t *, int); -typedef void tsw_pktnotify_t(struct tty *, int); +typedef void tsw_pktnotify_t(struct tty *, char); typedef void tsw_free_t(void *); struct ttydevsw { @@ -150,7 +150,7 @@ } static __inline void -ttydevsw_pktnotify(struct tty *tp, int event) +ttydevsw_pktnotify(struct tty *tp, char event) { tty_lock_assert(tp, MA_OWNED); MPASS(!tty_gone(tp)); From owner-p4-projects@FreeBSD.ORG Thu Aug 28 19:07:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D6CC1065670; Thu, 28 Aug 2008 19:07:02 +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 E494D106566C for ; Thu, 28 Aug 2008 19:07:01 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD8168FC08 for ; Thu, 28 Aug 2008 19:07:01 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SJ717B056655 for ; Thu, 28 Aug 2008 19:07:01 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SJ6Qxb056618 for perforce@freebsd.org; Thu, 28 Aug 2008 19:06:26 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 28 Aug 2008 19:06:26 GMT Message-Id: <200808281906.m7SJ6Qxb056618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148735 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, 28 Aug 2008 19:07:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=148735 Change 148735 by ed@ed_dull on 2008/08/28 19:05:38 IFC. Affected files ... .. //depot/projects/mpsafetty/bin/sh/options.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/README#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/mpsafetty/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/mpsafetty/lib/libpcap/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libstand/mips/_setjmp.S#1 branch .. //depot/projects/mpsafetty/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/mpsafetty/share/man/man9/Makefile#4 integrate .. //depot/projects/mpsafetty/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_smp.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#35 integrate .. //depot/projects/mpsafetty/sys/net/ethernet.h#2 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_options.c#3 integrate .. //depot/projects/mpsafetty/tools/regression/bin/sh/builtins/getopts2.0#1 branch .. //depot/projects/mpsafetty/tools/regression/bin/sh/builtins/getopts2.0.stdout#1 branch Differences ... ==== //depot/projects/mpsafetty/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.27 2008/08/27 20:16:06 stefanf Exp $"); #include #include @@ -338,6 +338,7 @@ shellparam.malloc = 1; shellparam.nparam = nparam; shellparam.p = newparam; + shellparam.reset = 1; shellparam.optnext = NULL; } @@ -405,7 +406,6 @@ if (*argptr != NULL) { setparam(argptr); } - shellparam.reset = 1; INTON; return 0; } ==== //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -356,7 +356,7 @@ #define VOP_CLOSE(vp, f, c, o, cr) 0 #define VOP_PUTPAGE(vp, of, sz, fl, cr) 0 -#define VOP_GETATTR(vp, vap, fl, cr) ((vap)->va_size = (vp)->v_size, 0) +#define VOP_GETATTR(vp, vap, fl) ((vap)->va_size = (vp)->v_size, 0) #define VOP_FSYNC(vp, f, cr) fsync((vp)->v_fd) ==== //depot/projects/mpsafetty/contrib/sendmail/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,9 +1,13 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.34 2007/11/05 00:21:32 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.35 2008/08/28 06:20:43 gshapiro Exp $ -sendmail 8.14.2 +sendmail 8.14.3 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ -For the import of sendmail, the following files were removed: +For the import of sendmail, the following directories were renamed: + + sendmail -> src + +For the merge of sendmail, the following files were removed: Build cf/cf/Build @@ -15,23 +19,32 @@ sendmail/makesendmail sendmail/sysexits.h -The following directories were renamed: +Imported using the instructions at: - sendmail -> src +http://wiki.freebsd.org/SubversionPrimer/VendorImports -Imported using: +Then merged using: - cvs import -m 'Import sendmail 8.14.2' \ - src/contrib/sendmail SENDMAIL v8_14_2 +% set FSVN=svn+ssh://svn.freebsd.org/base +% svn checkout $FSVN/head/contrib/sendmail head +% cd head +% svn merge --accept=postpone $FSVN/vendor/sendmail/dist . +% svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build +% svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h +% svn propset -R svn:keywords FreeBSD=%H . +% svn propdel svn:keywords libmilter/docs/*.jpg +% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. +% svn status +% svn diff +% svn commit After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: - cvs commit -f src/etc/sendmail/freebsd*mc + (svn command TBD) cvs commit -f src/etc/sendmail/freebsd*mc -To make local changes to sendmail, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the vendor (SENDMAIL) -branch. +To make local changes to sendmail, simply patch and commit to the head. +Never make local changes in the vendor area (/vendor/sendmail/). All local changes should be submitted to the Sendmail Consortium for inclusion in the next vendor release. @@ -97,4 +110,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -04-November-2007 +27-August-2008 ==== //depot/projects/mpsafetty/contrib/sendmail/KNOWNBUGS#2 (text+ko) ==== @@ -47,6 +47,17 @@ but some characters might be lost. Fix: obey RFC (2)822 and do not send lines that are longer than 1000 characters. +* milter communication fails if a single header is larger than 64K. + + If a single header is larger than 64KB (which is not possible in the + default configuration) then it cannot be transferred in one block to + libmilter and hence the communication fails. This can be avoided by + increasing the constant MILTER_CHUNK_SIZE in + include/libmilter/mfdef.h and recompiling sendmail, libmilter, and + all (statically linked) milters (or by using an undocumented compile + time option: _FFR_MAXDATASIZE; you have to read the source code in + order to use this properly). + * Sender addresses whose domain part cause a temporary A record lookup failure but have a valid MX record will be temporarily rejected in the default configuration. Solution: fix the DNS at the sender side. @@ -247,4 +258,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $ +$Revision: 8.60 $, Last updated $Date: 2007/12/04 01:16:50 $ ==== //depot/projects/mpsafetty/contrib/sendmail/PGPKEYS#2 (text+ko) ==== @@ -142,6 +142,69 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0xF6B30729 2008-01-18 ---------- RSA Sign & Encrypt +f16 Fingerprint16 = 07 FB 9A F9 F7 94 4B E4 0F 28 D1 8E 23 6F A2 B0 +uid Sendmail Signing Key/2008 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.8 (Darwin) + +mQCNA0eP9NsAAAEEAM5xPc5UXm01Mnqad8NPc5RkbeWcotxNOZXwrz4qQM6sr/E2 +lEMGgo5FOjWJX3tjtys8gfXZJihz3XMD5RleniW3RIhc2tbTJotNq9Qq9+LmiuBs +lT32O3ZSKsQtHQSfZ0j2bIabC/aQ4Dhfz13wz7x6VvRGwDbX3Niq8Mr2swcpAAUR +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDA4IDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQCVAwUQR4/029iq8Mr2swcpAQGa3QP+O6q/DvRLzM03AwIrEPRjdswejima +4BjKYYVQ1Qa7m4pyQeY/0CJScqu5A7p+kCrLqznmHu5aeezvjZy1mW7OCScPrCN9 +yC3IJdu7oX6mGZwPdUnsEyJvtHmiRXkumJtncmhcTZyplmt9ZDHVADQUQWRnyuex +oToSOeMPjS8YBpSJAJUDBRBHj/Xol0MBGHCTuEEBAYnzBAC5U2c8RtxNwwV4wh7V +Q4isNyXcYqUlUL5ZjtsP5+vuHz4d1CtT/tD4jGagy6J30xUuwUcF7AlNLIcn4z98 +GqF/aMCANut3dpGbzzvLYg+SkKkrZKH6fF4QPbdotp8NWKeiihoqD+hD6sVNc3zZ +/JymsmD1T346VpRTwKf4JzkJG4kAlQMFEEeP9hEee7PIr5WWJQEBP1sD/3I5VeiC +lW9fmwaAyOt/BrPIfsieL2TLysXCQbXFObNqqdR9APPlmQAtFdERjopQZu+VKvZd +pInWGaIegibPr4ZyGHmGxmJwYyHCt0MNvjY2oA1WPVRvXz2dno7Q5SFDR0sQaFKe +4knKfzGu8fngy//R1vlO+UE3vTQ3cgTaIpDsiQCVAwUQR4/2GXCgJE0e+ZJRAQEH +6QP9FVDSFnXCSPy+tNFlLhtpjVOEqREG30iezAVZlx+yJVSb3/sG0LRCvXB1w3td +jzW7A1iCvEQVb1yuNSFPb6Dq7TKoSpS8XZyCIetCpzab06D319Ubfcs2lHaDioY6 +ibSaysDrBDETyXg1eQBIUQ+9iltfkI6HRpm5vgz8d4iwieqJAJUDBRBHj/YgyNXt +KZX2F3EBASjtBACNzoDfjET153Zd3PQlj2X6b9BzjS8XHsjMuo+F04u9o3g78MSt ++g2HW5Xi1ORh/LFSrkK7Qi9jLREr3dKQM9jjhfvxidN80H8jNyUIUJ3d1/K123rP +z7GuXhXCfDCq/tjveUiVkoxQ1Q5h2OsXKqC0p7C7qpXKTg2CHLdbYTg/rIkAlQMF +EEeP9mAhg+GxOW8HiQEBRpAEAI9MQwE6xoG08vdkrn8/tZEfK/h3zc3UgT5sjME3 +NPbWD9o0W/KlIA7JKIpIYbX1M3GgGU5rlWmFyuRD5XVvu4NJ761PXAHenhg3wEk9 +TySAwH7Edlhr0M1goALxpjiAzrh+hc0x2rz2jMcuRQlSh19MMe9sc9pDgUaXl7QJ +Z51oiQCVAwUQR4/2colpYrhnjAoDAQHWPAP6AlqqzMhKJtWxVP4k10r06MwuUkOn +tAeuPL4semoKb8lTtuBG14vADXsoavifuq2iv4KQCncGn3yWglCUjG46DKLluZyG +uWjE44PEEiIs1zYzWo9F1Nw2C5VDR41/rzLqNctqr+bXac0lO3aRLgW1SkqJLI41 +M+yXMYkf99dM4cuJAJUDBRBHj/Z6OCLbR8w3Ty0BAUwaBACH9QViBa/sejJULNu8 +3i8B5tq0HOKvAzAQp/a79MxdFnhL8XrIhsTrprh3+/JvljrWLkfMe2tsVBTdTMJf +snjjCijgtuCKaR5ESyu1Kl2E8mhp1A032LWRYYrxSyJqklqNem4HeZAN4N1CzMoS +Iw5ELNeocuNmkBQn1xmkMYXiC4kAlQMFEEeP9pKcHL3i41xWNQEBqjgD/i9sEpQo +0YTW77za+n2rQD3141UZwql/F4cO0ds4sLSwJ3h4Ba8OkATHU1W2LbpogvpfvL6B +1H+4D7vo/VY/fSiNGUb8TjZfcj65ACToYokxK6PwBHL85jaWGh83kMS8pYDBL7zP +sJ3sCyayKwAXOFpT7doaZU5FsC7tNMwlnRCuiQCVAwUQR4/2t29Sk9ijm6ZVAQGP +TQP/Qbj1ZsqZfQn+7SXPmW0Y9+xUUQ351ecD1UX3yhuL195djP/O7ebeTiCBFkaG +gWfMZtNCtaPQr1BhXBF9Xkum4IseUlRz1mTsdrhbAVtL6mGWMYcxQFTx13pHiGYS +IaJhc+XQIxc7wmfW2LjOZpcHi0E2dhcjMEoWZGyEzKI/cJ2JAJUDBRBHj/bE71iW +ZNQy4Z0BAe8aA/4oiv/MRmiRdDrVY8kTIZWb4whGYLqKEScOEuqir0PrMtyEUkzP +YpkM1u3Cf4+zbtmgN16sx6DfyHAVGyI0U14hvnQhuVrrBs23dxGj2iciu14BvNJU +YVaAoAWSp8qA14fDOAGd1H/InQmDZJrAiH61wQwjLrU1oI44Dr+55KHgO4kAlQMF +EEeP9s3BnB0lEtNGHQEBxk4D/2WTAGSVuwDUGeIaHM1NVrgRcFFqrz37farxYNKx +7jZ1EqJXZXTqtSAUVc5LB8ko7V0P8w7CLso3Jj3hvFdYOt+6howpI/FO1Ur6RbTC +ik6RUMbHRvIxpcTzZvRmWlMGcMdJFcCxsliOG7cyjpeuisaGJFIhyqfpAdqMKRn2 +jOrqiQCVAwUQR4/5GcApykAW9MzpAQFuCgQAjaPwttPvJNegPa/KqZFVVO/VDaRm +9Aeiktw8lWlTE7BJ9SIePdsTEbKIzER/gVt85bOptJo6xpXaodoIjXWiSD+PHbdz +tuEp88zv0B0mJcKSRIPt/u+baAgR2dKR1jlNvEjbpCm9rei+vqRNREpdrk32ls5d +VwtrkbnFDuzLcgKJAJUDBRBHj/r11uCh/k++Kt0BAQvcBACq594Jrh+y+Pqf4bCL +8LrBqspvPL9MTMWDdwWvT7Yoaa+cyApuUWqpkyh8alWAwxnJmyw9I14zBr219862 +0Rb1oCo2TDL/pMz8WVpyjD0RIxs4FcoJODD52kYxhLadKk0OrCXfrpWvIcp4sRJa +kOWK3QzpD/0NtFJLZ+BnNq39h4kAlQMFEEeP+wK92o/WP+p9/QEBtVID/1AxNsk7 +/ktDwz/khcTsCLILgtuKh+7jZa6K8FhhoqNXbjyUhZYjGne6No72KJ52P6P7iPLu +SPDOmhu+z0kNTTm0KsWRSzQeUD08qyoB3qNcdxcRgAOJHl0MCXUwSxumfBb4iJq2 +5282RCnsKroyWAhV8KjoJer1hTKCsu58Lqrv +=jDs3 +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits KeyID Created Expires Algorithm Use pub 1024 0x7093B841 2006-12-16 ---------- RSA Sign & Encrypt f16 Fingerprint16 = D9 FD C5 6B EE 1E 7A A8 CE 27 D9 B9 55 8B 56 B6 uid Sendmail Signing Key/2007 @@ -1729,4 +1792,4 @@ =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.25 $, Last updated $Date: 2007/01/02 22:38:08 $ +$Revision: 8.26 $, Last updated $Date: 2008/01/22 06:20:27 $ ==== //depot/projects/mpsafetty/contrib/sendmail/README#2 (text+ko) ==== @@ -312,7 +312,7 @@ are installed in a location other than those which your compiler searches, you will need to provide that directory when building: - Build -I/path/to/include/directory + ./Build -I/path/to/include/directory If you are using Berkeley DB versions 1.85 or 1.86, you are *strongly* urged to upgrade to DB version 2 or later, available from @@ -464,4 +464,4 @@ test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.93 $, Last updated $Date: 2005/09/16 20:08:50 $ +$Revision: 8.94 $, Last updated $Date: 2008/02/12 16:40:05 $ ==== //depot/projects/mpsafetty/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ==== @@ -1,11 +1,47 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1909 2007/10/31 16:04:13 ca Exp $ + $Id: RELEASE_NOTES,v 8.1926 2008/05/03 03:34:26 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.3/8.14.3 2008/05/03 + During ruleset processing the generation of a key for a map + lookup and the parsing of the default value was broken + for some macros, e.g., $|, which caused the BlankSub + character to be inserted into the workspace and thus + failures, e.g., rules that should have matched did not. + 8.14.2 caused a regression: it accessed (macro) storage which was + freed before. First instance of the problem reported by + Matthew Dillon of DragonFlyBSD; variations of the same + bug reported by Todd C. Miller of OpenBSD, Moritz + Jodeit, and Dave Hayes. + Improve pathname length checks for persistent host status. Patch + from Joerg Sonnenberger of DragonFlyBSD. + Reword misleading SMTP reply text for FEATURE(`badmx'). Problem + noted by Beth Halsema. + The read timeout was fixed to be Timeout.datablock if STARTTLS + was activated. This may cause problems if that value + is lowered from its default. Problem noted by Jens Elkner. + CONFIG: Using LOCAL_TLS_CLIENT caused the tls_client ruleset + to operate incorrectly. Problem found by Werner Wiethege. + LIBMILTER: Omitting some protocol steps via the xxfi_negotiate() + callback did not work properly. The patchlevel of + libmilter has been set to 1 so a milter can determine + whether libmilter contains this fix. + MAKEMAP: If a delimiter is specified (-t) use that also when + dumping a map. Patch from Todd C. Miller of OpenBSD. + Portability: + Add support for Darwin 9.x (Mac OS X 10.5). + Support shared libraries in Darwin 8 and 9. Patch from + Chris Behrens of Concentric. + Add support for SCO OpenServer 6, patch from Boyd Gerber. + DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing path. + Added Files: + devtools/OS/Darwin.9.x + devtools/OS/OSR.i386 + 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 @@ -24,7 +60,7 @@ 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 + 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. ==== //depot/projects/mpsafetty/contrib/sendmail/cf/README#2 (text+ko) ==== @@ -1008,7 +1008,9 @@ MASQUERADE_DOMAIN_FILE, see below). If VIRTUSER_DOMAIN or VIRTUSER_DOMAIN_FILE is used, then the entries of class {VirtHost} are added to class {R}, i.e., relaying is allowed - to (and from) those domains. The default map definition is: + to (and from) those domains, which by default includes also + all subdomains (see relay_hosts_only). The default map + definition is: hash /etc/mail/virtusertable @@ -4699,4 +4701,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.722 $, Last updated $Date: 2007/04/03 21:26:58 $ +$Revision: 8.724 $, Last updated $Date: 2008/02/15 23:05:32 $ ==== //depot/projects/mpsafetty/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ==== @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### 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 +##### built by ca@wiz.smi.sendmail.com on Fri May 2 20:39:00 PDT 2008 +##### in /extra/home/ca/sm-8.14.3/OpenSource/sendmail-8.14.3/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.732 2007/04/20 00:53:30 ca Exp $ ##### +##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ ##### # level 10 config file format V10/Berkeley @@ -114,7 +114,7 @@ # Configuration version number -DZ8.14.2/Submit +DZ8.14.3/Submit ############### ==== //depot/projects/mpsafetty/contrib/sendmail/cf/m4/proto.m4#2 (text+ko) ==== @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -1956,7 +1956,7 @@ # Recursively run badmx check on each mx. R<$*><:$+:$*><:$*> <$1><:$3><: $4 $(badmx $2 $):> # See if any of them fail. -R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Illegal MX record for recipient host "$1 +R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Illegal MX record for host "$1 # Reverse the mxlists so we can use the same argument order again. R<$*><$*><$*> $:<$1><$3><$2> R<$*><:$+:$*><:$*> <$1><:$3><:$4 $(dnsA $2 $) :> @@ -1965,7 +1965,7 @@ R<$*><$*><$*> $:<$1><$3><$2> R<$*><:$+:$*><:$*> <$1><:$3><:$4 $(BadMXIP $2 $) :> -R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Invalid MX record for recipient host "$1', +R<$*><$*><$*:$*> $#error $@ 5.1.2 $:"550 Invalid MX record for host "$1', `dnl') @@ -2686,9 +2686,9 @@ dnl STARTTLS: called from smtp() after STARTTLS has been accepted Stls_client ifdef(`_LOCAL_TLS_CLIENT_', `dnl -R$* $: $1 $| $>"Local_tls_client" $1 -R$* $| $#$* $#$2 -R$* $| $* $: $1', `dnl') +R$* $: $1 $>"Local_tls_client" $1 +R$* $#$* $#$2 +R$* $* $: $1', `dnl') ifdef(`_ACCESS_TABLE_', `dnl dnl store name of other side R$* $: $(macro {TLS_Name} $@ $&{server_name} $) $1 ==== //depot/projects/mpsafetty/contrib/sendmail/cf/m4/version.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2007 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2008 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.195 2008/04/17 17:04:30 ca Exp $') # divert(0) # Configuration version number -DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.14.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/mpsafetty/contrib/sendmail/include/libmilter/mfapi.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2008 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -7,7 +7,7 @@ * the sendmail distribution. * * - * $Id: mfapi.h,v 8.77 2006/11/02 02:44:07 ca Exp $ + * $Id: mfapi.h,v 8.78 2008/02/27 22:30:34 ca Exp $ */ /* @@ -18,7 +18,7 @@ # define _LIBMILTER_MFAPI_H 1 #ifndef SMFI_VERSION -# define SMFI_VERSION 0x01000000 /* libmilter version number */ +# define SMFI_VERSION 0x01000001 /* libmilter version number */ #endif /* ! SMFI_VERSION */ #define SM_LM_VRS_MAJOR(v) (((v) & 0x7f000000) >> 24) ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/Makefile.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.78 2007/02/05 19:21:29 ca Exp $ +dnl $Id: Makefile.m4,v 8.80 2008/04/08 05:23:44 ca Exp $ include(confBUILDTOOLSDIR`/M4/switch.m4') dnl only required for compilation of EXTRAS ==== //depot/projects/mpsafetty/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 (text+ko) ==== @@ -2,7 +2,7 @@ smfi_opensocket

      smfi_opensocket

      @@ -24,16 +24,21 @@
      From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:42:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 029E4106566B; Mon, 25 Aug 2008 20:42: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 BA9821065674 for ; Mon, 25 Aug 2008 20:42:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B9228FC1B for ; Mon, 25 Aug 2008 20:42:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKgRmv090375 for ; Mon, 25 Aug 2008 20:42:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKgRmW090373 for perforce@freebsd.org; Mon, 25 Aug 2008 20:42:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:42:27 GMT Message-Id: <200808252042.m7PKgRmW090373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148441 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, 25 Aug 2008 20:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=148441 Change 148441 by rwatson@rwatson_fledge on 2008/08/25 20:42:11 Enhanced use of paragraph break. Affected files ... .. //depot/projects/trustedbsd/www/extattr.page#2 edit Differences ... ==== //depot/projects/trustedbsd/www/extattr.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/extattr.page#1 $ + $P4: //depot/projects/trustedbsd/www/extattr.page#2 $ @@ -41,8 +41,9 @@

      Extended attributes allow the kernel and userland processes to tag files with arbitrary named data. This provides a location to store the extensive security data required for the various TrustedBSD - security extensions, including ACLs, privileges and MAC labels. - Extended attribute support has been developed for FreeBSD's UFS1 file + security extensions, including ACLs, privileges and MAC labels.

      + +

      Extended attribute support has been developed for FreeBSD's UFS1 file system and integrated with the FreeBSD development tree, and was included in FreeBSD 5.0. UFS2 was implemented to provide improved performance and reliability for extended attributes, and has been From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:44:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32CAC1065673; Mon, 25 Aug 2008 20:44:30 +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 EAAD5106564A for ; Mon, 25 Aug 2008 20:44:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBBEC8FC1E for ; Mon, 25 Aug 2008 20:44:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKiTwa090598 for ; Mon, 25 Aug 2008 20:44:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKiTLv090596 for perforce@freebsd.org; Mon, 25 Aug 2008 20:44:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:44:29 GMT Message-Id: <200808252044.m7PKiTLv090596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148442 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, 25 Aug 2008 20:44:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=148442 Change 148442 by rwatson@rwatson_fledge on 2008/08/25 20:44:10 Update text a little, add paragraph break. Affected files ... .. //depot/projects/trustedbsd/www/geom.page#2 edit Differences ... ==== //depot/projects/trustedbsd/www/geom.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/geom.page#1 $ + $P4: //depot/projects/trustedbsd/www/geom.page#2 $ @@ -42,8 +42,12 @@ kernel modules to attach to I/O devices providing a variety of layout and data transformations. GEOM was created as part of the TrustedBSD Project in order to support cryptographic disk services, such as - GBDE, on the FreeBSD platform. GEOM has been present in FreeBSD since - FreeBSD 5.0-RELEASE, with increasing numbers of transform modules.

      + GBDE, on the FreeBSD platform. GBDE implements strong crypographic + protection of file systems at the GEOM layer.

      + +

      GEOM has been present in FreeBSD since FreeBSD 5.0-RELEASE, with + increasing numbers of transform modules over time, including the + GELI encryption and integrity protection module..

      GEOM and GBDE were implemented by Poul-Henning Kamp.

      From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:47:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89F3F1065696; Mon, 25 Aug 2008 20:47:33 +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 4CFF2106568C for ; Mon, 25 Aug 2008 20:47:33 +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 2F51E8FC1A for ; Mon, 25 Aug 2008 20:47:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKlXHf000242 for ; Mon, 25 Aug 2008 20:47:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKlXx3000240 for perforce@freebsd.org; Mon, 25 Aug 2008 20:47:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 25 Aug 2008 20:47:33 GMT Message-Id: <200808252047.m7PKlXx3000240@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 148444 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, 25 Aug 2008 20:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=148444 Change 148444 by hselasky@hselasky_laptop001 on 2008/08/25 20:47:07 Small bugfix. We should clear the Out-endpoint after the In-endpoint according to USB Mass Storage specification chapter 5.3.4 about Reset Recovery. ATA-USB has this right. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#6 (text+ko) ==== @@ -1743,7 +1743,7 @@ umass_t_bbb_reset3_callback(struct usb2_xfer *xfer) { umass_t_bbb_data_clear_stall_callback(xfer, UMASS_T_BBB_COMMAND, - UMASS_T_BBB_DATA_READ); + UMASS_T_BBB_DATA_WRITE); return; } From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:51:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C62131065682; Mon, 25 Aug 2008 20:51: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 8A27D106567E for ; Mon, 25 Aug 2008 20:51:37 +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 6BD118FC32 for ; Mon, 25 Aug 2008 20:51:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKpbUh003305 for ; Mon, 25 Aug 2008 20:51:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKpboZ003303 for perforce@freebsd.org; Mon, 25 Aug 2008 20:51:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 25 Aug 2008 20:51:37 GMT Message-Id: <200808252051.m7PKpboZ003303@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 148445 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, 25 Aug 2008 20:51:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=148445 Change 148445 by hselasky@hselasky_laptop001 on 2008/08/25 20:51:01 Various bugfixes and improvements. 1) xfer->udev is not initialised during transfer setup. 2) Improvements to musbotg driver. It is almost working. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#9 (text+ko) ==== @@ -2405,7 +2405,7 @@ if (ntd) { ep_no = xfer->endpoint & UE_ADDR; - at91dci_get_hw_ep_profile(xfer->udev, &pf, ep_no); + at91dci_get_hw_ep_profile(parm->udev, &pf, ep_no); if (pf == NULL) { /* should not happen */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#6 (text+ko) ==== @@ -99,7 +99,7 @@ /* * Here is a configuration that the chip supports. */ -static const struct usb2_hw_ep_profile musbotg_ep_profile[2] = { +static const struct usb2_hw_ep_profile musbotg_ep_profile[4] = { [0] = { .max_frame_size = 64, /* fixed */ @@ -117,6 +117,27 @@ .support_in = 1, .support_out = 1, }, + + + [2] = { + .max_frame_size = (3 * 1024), + .is_simplex = 1, /* simplex */ + .support_multi_buffer = 1, + .support_bulk = 1, + .support_interrupt = 1, + .support_isochronous = 1, + .support_in = 1, + }, + + [3] = { + .max_frame_size = (3 * 1024), + .is_simplex = 1, /* simplex */ + .support_multi_buffer = 1, + .support_bulk = 1, + .support_interrupt = 1, + .support_isochronous = 1, + .support_out = 1, + }, }; static void @@ -127,14 +148,18 @@ sc = MUSBOTG_BUS2SC(udev->bus); - if (ep_addr <= sc->sc_ep_max) { - if (ep_addr == 0) { - /* control endpoint */ - *ppf = musbotg_ep_profile; - } else { - /* non-control endpoints */ - *ppf = musbotg_ep_profile + 1; - } + if (ep_addr == 0) { + /* control endpoint */ + *ppf = musbotg_ep_profile; + } else if (ep_addr <= sc->sc_ep_max) { + /* non-control duplex endpoints */ + *ppf = musbotg_ep_profile + 1; + } else if (ep_addr <= sc->sc_ep_tx_max) { + /* non-control simplex TX endpoints */ + *ppf = musbotg_ep_profile + 2; + } else if (ep_addr <= sc->sc_ep_rx_max) { + /* non-control simplex RX endpoints */ + *ppf = musbotg_ep_profile + 3; } else { *ppf = NULL; } @@ -497,7 +522,7 @@ td->error = 1; return (0); /* complete */ } - if (!(csr & MUSB2_MASK_CSR0L_TXPKTRDY)) { + if (csr & MUSB2_MASK_CSR0L_TXPKTRDY) { return (1); /* not complete */ } count = td->max_frame_size; @@ -874,12 +899,19 @@ else sc->sc_flags.status_high_speed = 0; - temp = MUSB2_READ_1(sc, MUSB2_REG_INTUSBE); + /* + * After reset all interrupts are on and we need to + * turn them off! + */ + temp = MUSB2_MASK_IRESET; /* disable resume interrupt */ temp &= ~MUSB2_MASK_IRESUME; /* enable suspend interrupt */ temp |= MUSB2_MASK_ISUSP; MUSB2_WRITE_1(sc, MUSB2_REG_INTUSBE, temp); + /* disable TX and RX interrupts */ + MUSB2_WRITE_2(sc, MUSB2_REG_INTTXE, 0); + MUSB2_WRITE_2(sc, MUSB2_REG_INTRXE, 0); } /* * If RXRSM and RXSUSP is set at the same time we interpret @@ -1564,9 +1596,13 @@ ntx = (MUSB2_READ_1(sc, MUSB2_REG_EPINFO) % 16); + /* these numbers exclude the control endpoint */ + DPRINTFN(2, "RX/TX endpoints: %u/%u\n", nrx, ntx); sc->sc_ep_max = (nrx < ntx) ? nrx : ntx; + sc->sc_ep_rx_max = nrx; + sc->sc_ep_tx_max = ntx; /* read out configuration data */ @@ -2541,7 +2577,7 @@ if (ntd) { ep_no = xfer->endpoint & UE_ADDR; - musbotg_get_hw_ep_profile(xfer->udev, &pf, ep_no); + musbotg_get_hw_ep_profile(parm->udev, &pf, ep_no); if (pf == NULL) { /* should not happen */ @@ -2566,8 +2602,7 @@ /* init TD */ td->max_frame_size = xfer->max_frame_size; - td->ep_no = - (xfer->pipe->edesc->bEndpointAddress & UE_ADDR); + td->ep_no = ep_no; td->obj_next = last_obj; last_obj = td; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#2 (text+ko) ==== @@ -365,7 +365,11 @@ void (*sc_clocks_off) (void *arg); void *sc_clocks_arg; - uint8_t sc_ep_max; /* maximum number of endpoints */ + uint8_t sc_ep_max; /* maximum number of duplex endpoints */ + uint8_t sc_ep_rx_max; /* maximum number of simplex RX + * endpoints */ + uint8_t sc_ep_tx_max; /* maximum number of simplex TX + * endpoints */ uint8_t sc_rt_addr; /* root HUB address */ uint8_t sc_dv_addr; /* device address */ uint8_t sc_conf; /* root HUB config */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ static void musbotg_vbus_interrupt(struct musbotg_super_softc *sc) { - uint8_t vbus_val = 0; + uint8_t vbus_val = 1; /* fake VBUS on - TODO */ /* just forward it */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#8 (text+ko) ==== @@ -2427,7 +2427,7 @@ if (ntd) { ep_no = xfer->endpoint & UE_ADDR; - uss820dci_get_hw_ep_profile(xfer->udev, &pf, ep_no); + uss820dci_get_hw_ep_profile(parm->udev, &pf, ep_no); if (pf == NULL) { /* should not happen */ From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:54:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44DCC106570B; Mon, 25 Aug 2008 20:54:41 +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 06CBE10656FB for ; Mon, 25 Aug 2008 20:54:41 +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 DCF2A8FC15 for ; Mon, 25 Aug 2008 20:54:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKseY8003492 for ; Mon, 25 Aug 2008 20:54:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKsea3003490 for perforce@freebsd.org; Mon, 25 Aug 2008 20:54:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 25 Aug 2008 20:54:40 GMT Message-Id: <200808252054.m7PKsea3003490@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 148446 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, 25 Aug 2008 20:54:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=148446 Change 148446 by hselasky@hselasky_laptop001 on 2008/08/25 20:54:16 Some bugfixes: 1) "usb2_transfer_timeout_ms" must be called with usb2_mtx locked. 2) Fix regression: If the pipe is stalled we should return from starting the transfer. This only affects USB device side mode. 3) Simplify dma-delay logic. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#22 (text+ko) ==== @@ -1312,13 +1312,8 @@ usb2_transfer_dequeue(xfer); mtx_unlock(xfer->usb2_mtx); } - if (xfer->flags_int.bdma_enable) { - /* no need for DMA delay */ - xfer->flags_int.did_dma_delay = 1; - } else { - /* clear "did_dma_delay" flag */ - xfer->flags_int.did_dma_delay = 0; - } + /* clear "did_dma_delay" flag */ + xfer->flags_int.did_dma_delay = 0; /* clear "did_close" flag */ xfer->flags_int.did_close = 0; @@ -2115,7 +2110,14 @@ &udev->cs_msg[0], &(udev->cs_msg[1]))) { /* ignore */ } + } else { + /* should not happen */ + DPRINTFN(0, "No stall handler!\n"); } + /* + * We get started again when the stall is cleared! + */ + return; } } /* @@ -2230,9 +2232,13 @@ DPRINTFN(3, "DMA delay, %u ms, " "on %p\n", temp, xfer); - usb2_transfer_timeout_ms(xfer, - &usb2_dma_delay_done_cb, temp); - return (1); /* wait for new callback */ + if (temp != 0) { + mtx_lock(xfer->usb2_mtx); + usb2_transfer_timeout_ms(xfer, + &usb2_dma_delay_done_cb, temp); + mtx_unlock(xfer->usb2_mtx); + return (1); /* wait for new callback */ + } } /* check actual number of frames */ if (xfer->aframes > xfer->nframes) { From owner-p4-projects@FreeBSD.ORG Mon Aug 25 20:58:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 456E61065677; Mon, 25 Aug 2008 20:58:45 +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 08AF91065675 for ; Mon, 25 Aug 2008 20:58:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC2B28FC12 for ; Mon, 25 Aug 2008 20:58:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PKwilJ003846 for ; Mon, 25 Aug 2008 20:58:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PKwiUn003844 for perforce@freebsd.org; Mon, 25 Aug 2008 20:58:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 20:58:44 GMT Message-Id: <200808252058.m7PKwiUn003844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148447 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, 25 Aug 2008 20:58:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=148447 Change 148447 by rwatson@rwatson_fledge on 2008/08/25 20:58:12 Updates to a number of component web pages to bring them more in sync with reality. Affected files ... .. //depot/projects/trustedbsd/www/geom.page#3 edit .. //depot/projects/trustedbsd/www/mac.page#5 edit .. //depot/projects/trustedbsd/www/privileges.page#5 edit .. //depot/projects/trustedbsd/www/sebsd.page#9 edit .. //depot/projects/trustedbsd/www/sedarwin.page#7 edit Differences ... ==== //depot/projects/trustedbsd/www/geom.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/geom.page#2 $ + $P4: //depot/projects/trustedbsd/www/geom.page#3 $ @@ -47,7 +47,7 @@

      GEOM has been present in FreeBSD since FreeBSD 5.0-RELEASE, with increasing numbers of transform modules over time, including the - GELI encryption and integrity protection module..

      + GELI encryption and integrity protection module.

      GEOM and GBDE were implemented by Poul-Henning Kamp.

      ==== //depot/projects/trustedbsd/www/mac.page#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/mac.page#4 $ + $P4: //depot/projects/trustedbsd/www/mac.page#5 $ @@ -45,54 +45,32 @@ TrustedBSD Mandatory Access Control (MAC) Framework -

      - Perforce: - //depot/projects/trustedbsd/mac/... -

      -

      - Collection: - p4-cvs-trustedbsd-mac -

      -

      Mandatory access controls extend discretionary access - controls by allowing administrators to enforce additional - security for all subjects (e.g. processes or sockets) and - objects (e.g. sockets, file system objects, sysctl nodes) in - the system. Development of those new access control models - is facilitated by the development of a flexible kernel - access control extension framework, the TrustedBSD MAC - Framework. This permits new access control models to be - introduced as kernel modules.

      +

      Mandatory access controls extend operating system access control + policy by allowing administrators to enforce additional constraints + on user and application behavior. + The TrustedBSD MAC Framework is a kernel programming interface + allowing loadable modules to augment the system security policy in + order to implement mandatory access control in a flexible manner.

      -

      Currently, modules exist that implement MLS (Multi-Level - Security), a fixed-label Biba integrity policy, Type - Enforcement, and several other security policies that - reflect common requirements of typical FreeBSD deployment - environments, such as mandatory limits on inter-user - visibility in multi-user environments. The current - implementation of Low-Watermark MAC (LOMAC) will also be - ported to use the module framework. In addition, the - DARPA-funded Network Associates Laboratories' CBOSS Project - is porting the NSA FLASK/SELinux implementation (SEBSD) to - run as an extension model over the TrustedBSD MAC Framework. - More information on the SEBSD module may be found on the - SEBSD page.

      +

      The TrustedBSD MAC Framework first shipped in FreeBSD 5.0, with + significant functionality, quality, and performance enhancements in + later releases. Supported policy modules include rule-based file + system firewall support, TCP/UDP port access control lists, + inter-user process visibility controls, as well as classic mandatory + access control policies such as Multi-Level Security (MLS) with + compartments, and fixed- and floating-label Biba integrity policies. + Third party policy modules include cryptographic checksums on system + binaries, and SEBSD, a port of the NSA + FLASK/SELinux policy to FreeBSD. A number of commercial + FreeBSD-based products make use of the TrustedBSD MAC Framework to + locally modify the operating system security policy.

      -

      This work is primarily occuring in a TrustedBSD Perforce - branch, but much of the framework has been merged to the - main FreeBSD development tree and was included in FreeBSD - 5.0 and forwards. The current implementation is appropriate - for experimental or limited production use; both internal - and exposed MAC APIs will not be frozen until 5.2-RELEASE. - All policy modules with the exception of the SEBSD - implementation have been merged into the FreeBSD tree at - this point.

      - -

      Work has also recently begun on an experimental port of - the TrustedBSD MAC Framework from FreeBSD to Apple's - Darwin operating system. - Information on this port may be found on the SEDarwin page.

      +

      The TrustedBSD MAC Framework is also present in Mac + OS X as of the Leopard release, where it is used to implement + Seatbelt and other system security services. A port of FLASK and + SELinux is also available via SEDarwin.

      ==== //depot/projects/trustedbsd/www/privileges.page#5 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/privileges.page#4 $ + $P4: //depot/projects/trustedbsd/www/privileges.page#5 $ @@ -46,11 +46,12 @@ p4-cvs-trustedbsd-cap

      -

      NB: Historically this project was referred to as fine-grained +

      Historically this project was referred to as fine-grained capabilities, but due to a vocabulary conflict, it has been renamed to fine-grained privileges. Information in this page currently refers to a FreeBSD 5.x-era project to support fine-grained privileges, and - will shortly be superseded by a similar project for FreeBSD 8.x.

      + will shortly be superseded by a similar project for FreeBSD + 8.x.

      POSIX.1e breaks root privilege into a set of privileges (historically referred to as "Capabilities"), which allow the ==== //depot/projects/trustedbsd/www/sebsd.page#9 (text+ko) ==== @@ -32,12 +32,12 @@ SUCH DAMAGE. --> - + SEBSD - $P4: //depot/projects/trustedbsd/www/sebsd.page#8 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#9 $ ==== //depot/projects/trustedbsd/www/sedarwin.page#7 (text+ko) ==== @@ -31,12 +31,12 @@ SUCH DAMAGE. --> - + SEDarwin - $P4: //depot/projects/trustedbsd/www/sedarwin.page#6 $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#7 $ @@ -45,40 +45,18 @@ policy module to Apple's Darwin operating system -

      - Perforce: - //depot/projects/trustedbsd/sedarwin7/... -

      -

      - Collection: - p4-cvs-trustedbsd-sedarwin -

      -

      SEDarwin is a port of the TrustedBSD MAC - Framework access control extension framework to Apple's - Darwin operating system platform, along with a port of the - SEBSD policy module. - SEDarwin is highly experimental, but is currently sufficiently - functional to allow the enforcement of mandatory process - and file protections under Mac OS 10.3.8 and Darwin 7.3 on - a variety of Apple PowerPC hardware. +

      The SEDarwin Project consisted of two parts: a port of the + TrustedBSD MAC Framework to the Mac OS X + operating system, and a similar adaptation of SEBSD to MAC OS X based on that port. This + port was made available against Mac OS X Panther and Mac OS X Tiger; + as of Mac OS X Leopard, the TrustedBSD MAC Framework is now + available as part of the shipping Mac OS X product.

      - The SEDarwin project has recently moved to it's own website at +

      The SEDarwin project has recently moved to it's own website at www.sedarwin.org. More - information and current versions of SEDarwin can be found there. -

      - -

      The Darwin Security Extension Project (DSEP) complements the - SEDarwin work, but has a different goal. DSEP is primarily concerned - with updating and maintaining the TrustedBSD MAC Framework on - Darwin. While still experimental, the MAC Framework has been - updated to support Mac OS X "Tiger", currently supporting Mac OS X - 10.4.3 (Darwin 8.4). Note that the DSEP releases typically won't - have the newest FLASK and SELinux components; they will be migrated - to the Tiger platform soon.

      - -

      The DSEP sources have also recently moved to - sedarwin.org

      + information and current versions of SEDarwin can be found there.

      From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:00:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A6AF106567D; Mon, 25 Aug 2008 21:00: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 358BC1065672 for ; Mon, 25 Aug 2008 21:00:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1610D8FC20 for ; Mon, 25 Aug 2008 21:00:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PL0ljZ004046 for ; Mon, 25 Aug 2008 21:00:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PL0kOC004044 for perforce@freebsd.org; Mon, 25 Aug 2008 21:00:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:00:47 GMT Message-Id: <200808252100.m7PL0kOC004044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148448 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, 25 Aug 2008 21:00:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=148448 Change 148448 by rwatson@rwatson_fledge on 2008/08/25 21:00:33 Remove the now-unnecessary components page. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#15 edit .. //depot/projects/trustedbsd/www/components-selected.png#3 delete .. //depot/projects/trustedbsd/www/components.page#11 delete .. //depot/projects/trustedbsd/www/components.png#3 delete .. //depot/projects/trustedbsd/www/sidebar.xml#13 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#15 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#14 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#15 $ STYLESHEET= page.xsl @@ -40,7 +40,6 @@ SRCS+= extattr.page SRCS+= geom.page SRCS+= mailinglists.page -SRCS+= components.page SRCS+= docs.page SRCS+= mac.page SRCS+= openbsm.page @@ -56,7 +55,6 @@ IMGS= acls.png acls-selected.png IMGS+= audit.png audit-selected.png IMGS+= bsmtrace.png bsmtrace-selected.png -IMGS+= components.png components-selected.png IMGS+= developers.png developers-selected.png IMGS+= docs.png docs-selected.png IMGS+= extattr.png extattr-selected.png ==== //depot/projects/trustedbsd/www/sidebar.xml#13 (text+ko) ==== @@ -1,42 +1,4 @@ -
        From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:15:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D3F41065673; Mon, 25 Aug 2008 21:15: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 50CED1065683 for ; Mon, 25 Aug 2008 21:15:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 313B68FC17 for ; Mon, 25 Aug 2008 21:15:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PLF3xu006745 for ; Mon, 25 Aug 2008 21:15:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PLF3FR006743 for perforce@freebsd.org; Mon, 25 Aug 2008 21:15:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:15:03 GMT Message-Id: <200808252115.m7PLF3FR006743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148451 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, 25 Aug 2008 21:15:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=148451 Change 148451 by rwatson@rwatson_fledge on 2008/08/25 21:14:31 Announce doctype. Submitted by: bz, trasz Affected files ... .. //depot/projects/trustedbsd/www/page.xsl#11 edit Differences ... ==== //depot/projects/trustedbsd/www/page.xsl#11 (text+ko) ==== @@ -2,7 +2,9 @@ xmlns:cvs="http://www.FreeBSD.org/XML/CVS"> - + From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:16:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA1A2106568A; Mon, 25 Aug 2008 21:16: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 7C64C1065671 for ; Mon, 25 Aug 2008 21:16:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59FD98FC1E for ; Mon, 25 Aug 2008 21:16:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PLG4Ic006838 for ; Mon, 25 Aug 2008 21:16:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PLG4iU006836 for perforce@freebsd.org; Mon, 25 Aug 2008 21:16:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:16:04 GMT Message-Id: <200808252116.m7PLG4iU006836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148452 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, 25 Aug 2008 21:16:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=148452 Change 148452 by rwatson@rwatson_fledge on 2008/08/25 21:15:55 Use a less miniscule font. Affected files ... .. //depot/projects/trustedbsd/www/page.css#4 edit Differences ... ==== //depot/projects/trustedbsd/www/page.css#4 (text+ko) ==== @@ -29,13 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/www/page.css#3 $ + * $P4: //depot/projects/trustedbsd/www/page.css#4 $ */ BODY { margin: 0; font-family: Arial, Helvetica, sans-serif, Geneva; - font-size: 8pt; + font-size: 10pt; } #collection-label { From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:24:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39FB61065670; Mon, 25 Aug 2008 21:24:18 +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 F16EA106566B for ; Mon, 25 Aug 2008 21:24:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D1AAE8FC13 for ; Mon, 25 Aug 2008 21:24:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PLOHrk007832 for ; Mon, 25 Aug 2008 21:24:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PLOC3v007828 for perforce@freebsd.org; Mon, 25 Aug 2008 21:24:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:24:12 GMT Message-Id: <200808252124.m7PLOC3v007828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148454 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, 25 Aug 2008 21:24:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=148454 Change 148454 by rwatson@rwatson_fledge on 2008/08/25 21:23:33 More sponsors. Affected files ... .. //depot/projects/trustedbsd/www/home.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/home.page#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/home.page#4 $ + $P4: //depot/projects/trustedbsd/www/home.page#5 $ @@ -93,7 +93,9 @@ the Defence Advanced Research Projects Agency (DARPA), the National Security Agency (NSA), Network Associates Laboratories, Safeport Network Services, the University of Pennsylvania, Yahoo!, McAfee - Research, SPARTA, Inc., Apple Computer, Inc., and others. + Research, SPARTA, Inc., Apple Computer, Inc., nCirce Network + Security, Inc., Google, Inc., the University of Cambridge Computer + Laboratory, and others. Contributions to support the TrustedBSD Project are welcome; please consider making donations through the FreeBSD Foundation.

        From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:35:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9AD51065692; Mon, 25 Aug 2008 21:35: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 83E6E1065744 for ; Mon, 25 Aug 2008 21:35:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 635918FC1E for ; Mon, 25 Aug 2008 21:35:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PLZU2X011956 for ; Mon, 25 Aug 2008 21:35:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PLZTxw011948 for perforce@freebsd.org; Mon, 25 Aug 2008 21:35:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:35:29 GMT Message-Id: <200808252135.m7PLZTxw011948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148457 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, 25 Aug 2008 21:35:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=148457 Change 148457 by rwatson@rwatson_fledge on 2008/08/25 21:34:53 Update legal page to make it a bit more clear, and include the BSD license inline. Affected files ... .. //depot/projects/trustedbsd/www/legal.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/legal.page#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/legal.page#4 $ + $P4: //depot/projects/trustedbsd/www/legal.page#5 $ @@ -45,23 +45,56 @@ Legal Information -

        TrustedBSD extensions are intended for use with the FreeBSD - operating system, a liberally licensed free operating system based - on the Berkeley UNIX variant, BSD. The extensions are released under - a two-clause BSD license, copyright held - by the authors of the component in question. This license permits - both commercial and non-commercial use of the code, providing that - the copyright is observed and documented, and that the authors may - not be held liable for damages associated with use of the code.

        +

        The TrustedBSD extensions are intended for use with the open source + FreeBSD operating systems, as well as related open and closed source + operating systems such as Mac OS X, NetBSD, OpenBSD, and Linux. + Almost all TrustedBSD code is under a two-clause Berkeley or + substantially similar open source license:

        + + 
          +Copyright (c) [year] [name]
+All rights reserved.
+
+This software was developed by the TrustedBSD Project.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
        + +

        This license is intended to encourage commercial, research, and + personal use of this software without limitation, providing that + the copyright notice is observed and documented, and that authors + and contributors are not held liable for any damages that may result + from use of the code. With the exception of a small amount of GPL + code associated with SEBSD, all TrustedBSD + code may be incorporated into close source products without fee. + Please make sure to observe all licenses included with distributed + source code.

        -

        Generally speaking, this places few (if any) restrictions on any - real-world use, and legally consumers of the code are under no - obligation to provide compensation to the authors. However, machinery - is in place to accept donations to the TrustedBSD project to allow - further development, if anyone is interested. If you are interested - in this opportunity, please email trustedbsd-finances@TrustedBSD.org - for more information.

        +

        Organizations and individuals who extend TrustedBSD are encouraged + to contribute bug reports, bug fixes, functional enhancements, and + documentation to the project under similar licenses. While not + obligatory, financial contributions via the FreeBSD Foundation are + most welcome, and support developer travel, test hardware, etc.

        The copyright on the BSD Daemon is held by Kirk McKusick; the copyright for the TrustedBSD Daemon, Trusty, is held by Leigh From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:45:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 918EA1065671; Mon, 25 Aug 2008 21:45: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 55E09106564A for ; Mon, 25 Aug 2008 21:45:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3605F8FC0C for ; Mon, 25 Aug 2008 21:45:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PLjgIj012820 for ; Mon, 25 Aug 2008 21:45:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PLjg4D012818 for perforce@freebsd.org; Mon, 25 Aug 2008 21:45:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:45:42 GMT Message-Id: <200808252145.m7PLjg4D012818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148461 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, 25 Aug 2008 21:45:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=148461 Change 148461 by rwatson@rwatson_fledge on 2008/08/25 21:44:48 Retroactively announce Apple's inclusion of the MAC Framework in Mac OS X Leopard. Affected files ... .. //depot/projects/trustedbsd/www/news.page#14 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#14 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#13 $ + $P4: //depot/projects/trustedbsd/www/news.page#14 $ @@ -65,6 +65,18 @@ href="openbsm.html">OpenBSM web page for more information.

        +
        October 26, 2007 Mac OS X Leopard ships with TrustedBSD MAC + Framework
        + +

        Apple has now shipped Mac OS X Leopard, the first version of + Mac OS X to incorporate the TrustedBSD MAC Framework as an + extension mechanism for advanced access control, continuing a long + history of code exchange between the TrustedBSD Project and Apple. + Apple had previously incorporated portions of the TrustedBSD ACL + implementation in Mac OS X Tiger, and the TrustedBSD Audit and + OpenBSM implementations are derived from audit functionality + shipped by Apple in Mac OS X Panther.

        +
        July 16, 2007 OpenBSM 1.0 alpha 15 released

        OpenBSM 1.0 alpha 15 has been released. See the From owner-p4-projects@FreeBSD.ORG Mon Aug 25 22:07:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F0C71065690; Mon, 25 Aug 2008 22:07: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 613B81065680 for ; Mon, 25 Aug 2008 22:07:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4042D8FC13 for ; Mon, 25 Aug 2008 22:07:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PM74pJ016019 for ; Mon, 25 Aug 2008 22:07:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PM749n016017 for perforce@freebsd.org; Mon, 25 Aug 2008 22:07:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 22:07:04 GMT Message-Id: <200808252207.m7PM749n016017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148464 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, 25 Aug 2008 22:07:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=148464 Change 148464 by rwatson@rwatson_fledge on 2008/08/25 22:06:18 Update front page for events of the last few years. Affected files ... .. //depot/projects/trustedbsd/www/home.page#6 edit Differences ... ==== //depot/projects/trustedbsd/www/home.page#6 (text+ko) ==== @@ -1,5 +1,5 @@ Documentation -

        One feature of trusted operating systems is that their - security architecture must be well-documented so that it may - be analyzed for weaknesses. TrustedBSD fills this role by - having an open and freely available source base, as well as - extensive design documentation that will be coming online - as features mature.

        +

        This page contains both user documentation and implementation papers that may + be of use when using or working on TrustedBSD.

        From owner-p4-projects@FreeBSD.ORG Mon Aug 25 22:46:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 462121065671; Mon, 25 Aug 2008 22:46:45 +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 0A6E41065678 for ; Mon, 25 Aug 2008 22:46:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDEF98FC21 for ; Mon, 25 Aug 2008 22:46:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PMkiN3020174 for ; Mon, 25 Aug 2008 22:46:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PMkiTv020172 for perforce@freebsd.org; Mon, 25 Aug 2008 22:46:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 22:46:44 GMT Message-Id: <200808252246.m7PMkiTv020172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148468 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, 25 Aug 2008 22:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=148468 Change 148468 by rwatson@rwatson_fledge on 2008/08/25 22:46:29 Update. Affected files ... .. //depot/projects/trustedbsd/www/audit.page#8 edit Differences ... ==== //depot/projects/trustedbsd/www/audit.page#8 (text+ko) ==== @@ -1,5 +1,5 @@ - Security Event Audit + Security Event Auditing - $P4: //depot/projects/trustedbsd/www/audit.page#7 $ + $P4: //depot/projects/trustedbsd/www/audit.page#8 $
        - TrustedBSD Security Event Audit + TrustedBSD Security Event Auditing -

        - Perforce: - //depot/projects/trustedbsd/audit3/... -

        -

        - Collection: - p4-cvs-trustedbsd-audit3 -

        -

        Event auditing permits the selective and fine-grained logging of - security-relevant system events for the purposes of post-mortem - analysis, intrusion detection, and run-time monitoring. - analysis. This includes the logging of authentication events, user - management events, and detailed logging of access control events, - including the ability to log system calls based on user and event - class.

        +

        Security event auditing permits the selective and fine-grained + logging of security-relevant system events for the purposes of + post-mortem analysis, intrusion detection, and run-time monitoring. + This includes the logging of authentication events, user management + events, and detailed logging of access control events, including the + ability to log system calls based on user and event class.

        -

        The trustedbsd_audit3 implementation is the third generation - security audit implementation implemented by the TrustedBSD Project, - and is derived from work performed by members of the TrustedBSD team - working at McAfee Research under contract to Apple Computer, Inc., - in support of the Mac OS X CAPP evaluation. The audit3 code base - includes a kernel audit event engine, auditing of system calls - across all native and emulated ABIs, modifications to several user - space components, including login-related programs such as login and - sshd, audit print and reduction tools, audit management daemon, - "audit pipes" for live application monitoring of system events, and - an audit support library.

        +

        The TrustedBSD audit implementation is present in FreeBSD 6.2 and + later, and there is continuing development work to expand its + feature set. The current implementation is derived from the Mac OS + X audit implementation created by McAfee Research under contract to + Apple Computer, Inc. in support of the Mac OS X CAPP evaluation. + The TrustedBSD implementation has been substantially enhanced to add + new features, such as audit pipes allowing applications to attach + directly and selectively to the live event stream.

        -

        As of FreeBSD 6.2-RELEASE, audit support is included in the base - FreeBSD distribution, and further development of the kernel - implementation will take place in the FreeBSD CVS repository rather - than Perforce.

        +

        The audit implementation includes a kernel audit event engine, + auditing of system calls across all native and emulated ABIs, + modifications to several user space components, including + login-related programs such as login and sshd, audit print and + reduction tools, audit management daemon, "audit pipes" for live + application monitoring of system events, and an audit support + library.

        The file format and API are based on Sun's published Basic Security Module (BSM), the de facto industry standard, and are provided via a From owner-p4-projects@FreeBSD.ORG Mon Aug 25 22:51:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88779106567F; Mon, 25 Aug 2008 22:51: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 4B000106566B for ; Mon, 25 Aug 2008 22:51:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A2FB8FC15 for ; Mon, 25 Aug 2008 22:51:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PMpoDE020548 for ; Mon, 25 Aug 2008 22:51:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PMpokw020546 for perforce@freebsd.org; Mon, 25 Aug 2008 22:51:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 22:51:50 GMT Message-Id: <200808252251.m7PMpokw020546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148469 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, 25 Aug 2008 22:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=148469 Change 148469 by rwatson@rwatson_fledge on 2008/08/25 22:51:04 A few further updates to the Audit and MAC page, as well as explicit pointers to the documentation page. Affected files ... .. //depot/projects/trustedbsd/www/audit.page#9 edit .. //depot/projects/trustedbsd/www/mac.page#6 edit Differences ... ==== //depot/projects/trustedbsd/www/audit.page#9 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/audit.page#8 $ + $P4: //depot/projects/trustedbsd/www/audit.page#9 $ @@ -71,6 +71,10 @@ OpenBSM is maintained by the TrustedBSD Project, and new versions are imported into the FreeBSD CVS repository intermittently.

        +

        Security event auditing user documentation and an implementation + paper may be found on the documentation + page.

        +

        BSMtrace is an audit-based host intrusion detection system.

        ==== //depot/projects/trustedbsd/www/mac.page#6 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/mac.page#5 $ + $P4: //depot/projects/trustedbsd/www/mac.page#6 $ @@ -66,11 +66,16 @@ FreeBSD-based products make use of the TrustedBSD MAC Framework to locally modify the operating system security policy.

        +

        MAC Framework and general MAC user documentation and a number of + implementation papers may be found on the documentation page.

        +

        The TrustedBSD MAC Framework is also present in Mac OS X as of the Leopard release, where it is used to implement - Seatbelt and other system security services. A port of FLASK and - SELinux is also available via SEDarwin.

        + Seatbelt and other system security services. The port of the MAC + Framework was performed initially as part of SEDarwin, which also included a port of + FLASK and SELinux to the Mac OS X platform.

        From owner-p4-projects@FreeBSD.ORG Mon Aug 25 22:55:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1AAE1065674; Mon, 25 Aug 2008 22:55: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 85A64106566B for ; Mon, 25 Aug 2008 22:55:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64BD48FC18 for ; Mon, 25 Aug 2008 22:55:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PMts0L020873 for ; Mon, 25 Aug 2008 22:55:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PMtsbg020871 for perforce@freebsd.org; Mon, 25 Aug 2008 22:55:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 22:55:54 GMT Message-Id: <200808252255.m7PMtsbg020871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148470 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, 25 Aug 2008 22:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=148470 Change 148470 by rwatson@rwatson_fledge on 2008/08/25 22:55:27 Add a link to the mailing lists page from the developer page; fix wording on the front page. Affected files ... .. //depot/projects/trustedbsd/www/developers.page#2 edit .. //depot/projects/trustedbsd/www/home.page#7 edit Differences ... ==== //depot/projects/trustedbsd/www/developers.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/developers.page#1 $ + $P4: //depot/projects/trustedbsd/www/developers.page#2 $ @@ -84,7 +84,7 @@

        To reach the TrustedBSD developers, please send e-mail to the - trustedbsd-discuss mailing list.

        + trustedbsd-discuss mailing list.

      ==== //depot/projects/trustedbsd/www/home.page#7 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/home.page#6 $ + $P4: //depot/projects/trustedbsd/www/home.page#7 $ @@ -76,14 +76,14 @@ href="mailinglists.html">mailing lists for discussion of on-going work as well as user support.

      -

      The TrustedBSD Project is made possible through the generous - sponsorship and support from a variety of organizations, including - the Defence Advanced Research Projects Agency (DARPA), the National - Security Agency (NSA), Network Associates Laboratories, Safeport - Network Services, the University of Pennsylvania, Yahoo!, McAfee - Research, SPARTA, Inc., Apple Computer, Inc., nCirce Network - Security, Inc., Google, Inc., the University of Cambridge Computer - Laboratory, and others. +

      The TrustedBSD Project is made possible through generous sponsorship + and support from a variety of organizations, including the Defence + Advanced Research Projects Agency (DARPA), the National Security + Agency (NSA), Network Associates Laboratories, Safeport Network + Services, the University of Pennsylvania, Yahoo!, McAfee Research, + SPARTA, Inc., Apple Computer, Inc., nCirce Network Security, Inc., + Google, Inc., the University of Cambridge Computer Laboratory, and + others. Contributions to support the TrustedBSD Project are welcome; please consider making donations through the FreeBSD Foundation.

      From owner-p4-projects@FreeBSD.ORG Tue Aug 26 00:13:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3D31106567B; Tue, 26 Aug 2008 00:13: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 859581065672 for ; Tue, 26 Aug 2008 00:13: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 642408FC12 for ; Tue, 26 Aug 2008 00:13:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q0DS0h029975 for ; Tue, 26 Aug 2008 00:13:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q0DICf029967 for perforce@freebsd.org; Tue, 26 Aug 2008 00:13:18 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 00:13:18 GMT Message-Id: <200808260013.m7Q0DICf029967@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 148478 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, 26 Aug 2008 00:13:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=148478 Change 148478 by jb@freebsd3 on 2008/08/26 00:13:16 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/linux-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#6 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/translators.ent#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#87 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#54 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#29 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#27 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#82 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#44 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/Makefile#3 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/tools/checkupdate/notify#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/introduction/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mac/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/makc.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#41 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#15 integrate .. //depot/projects/dtrace/ports/CHANGES#15 integrate .. //depot/projects/dtrace/ports/MOVED#104 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#15 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#11 integrate .. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#13 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#14 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#22 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#36 integrate .. //depot/projects/dtrace/ports/UPDATING#87 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#51 integrate .. //depot/projects/dtrace/src/UPDATING#38 integrate .. //depot/projects/dtrace/src/bin/sh/miscbltin.c#4 integrate .. //depot/projects/dtrace/src/bin/stty/modes.c#4 integrate .. //depot/projects/dtrace/src/bin/stty/print.c#5 integrate .. //depot/projects/dtrace/src/bin/stty/stty.1#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/COPYRIGHT#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ChangeLog#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ChangeLog-4.1.0#4 delete .. //depot/projects/dtrace/src/contrib/ntp/CommitLog#1 branch .. //depot/projects/dtrace/src/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/dtrace/src/contrib/ntp/INSTALL#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/NEWS#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/README#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/README.bk#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/README.patches#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/README.refclocks#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/README.versions#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/TODO#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/WHERE-TO-START#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/acinclude.m4#4 delete .. //depot/projects/dtrace/src/contrib/ntp/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/adjtimed/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/adjtimed/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/configure#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/depcomp#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/install-sh#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/missing#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/arlib/mkinstalldirs#4 delete .. //depot/projects/dtrace/src/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/dtrace/src/contrib/ntp/bootstrap#1 branch .. //depot/projects/dtrace/src/contrib/ntp/build#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/clockstuff/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/clockstuff/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/clockstuff/clktest.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/clockstuff/propdelay.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/compile#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/config.guess#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/config.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/config.sub#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/configure#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/configure.ac#1 branch .. //depot/projects/dtrace/src/contrib/ntp/configure.in#4 delete .. //depot/projects/dtrace/src/contrib/ntp/depcomp#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/flock-build#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/accopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/assoc.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/audio.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/authopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/build.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/clockopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/config.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/confopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/copyright.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/debug.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver1.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver10.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver11.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver12.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver16.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver18.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver19.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver2.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver20.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver22.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver23.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver24.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver26.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver27.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver28.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver29.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver3.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver30.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver32.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver33.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver34.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver35.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver36.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver37.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver38.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver39.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver4.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver40.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver42.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver43.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver44.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver5.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver6.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver7.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver8.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/driver9.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/oncore-shmem.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/extern.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/groups.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/hints.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/a-ux#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/aix#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/bsdi#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/changes#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/decosf1#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/decosf2#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/freebsd#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/hpux#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/linux#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/mpeix#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/netbsd#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/notes-xntp-v3#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/parse#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/refclocks#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/rs6000#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/sco.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/sgi#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/solaris-dosynctodr.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/solaris.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/solaris.xtra.4023118#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/solaris.xtra.4095849#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/solaris.xtra.S99ntpd#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/solaris.xtra.patchfreq#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/sun4#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/svr4-dell#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/svr4_package#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/todo#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/vxworks.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/hints/winnt.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/howto.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/index.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/kern.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/keygen.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ldisc.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/manyopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/measure.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/miscopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/monopt.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/msyslog.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/mx4200data.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/notes.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/ntpd.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntpdate.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntpdc.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntpdsim.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/dtrace/src/contrib/ntp/html/ntpq.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntptime.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/ntptrace.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/parsedata.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/parsenew.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/patches.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/porting.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/pps.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/prefer.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/quick.html#4 delete .. //depot/projects/dtrace/src/contrib/ntp/html/rdebug.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/refclock.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/release.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/scripts/links11.txt#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/scripts/links7.txt#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/scripts/links8.txt#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/scripts/links9.txt#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/sntp.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/html/tickadj.html#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/adjtime.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ascii.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/binio.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/ieee754io.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/isc/interfaceiter.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/ipv6.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/msgs.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/net.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/netaddr.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/isc/result.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/isc/sockaddr.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/l_stdlib.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/mbg_gps166.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_config.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_control.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_crypto.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_filegen.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_fp.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_machine.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_refclock.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_request.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_rfc2553.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_stdlib.h#5 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_tty.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_types.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntpd.h#5 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/parse.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/parse_conf.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/recvbuff.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/include/trimble.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/version.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/install-sh#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/kernel/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/kernel/chuinit.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/kernel/clkinit.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/kernel/sys/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/kernel/sys/parsestreams.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libisc/ifiter_ioctl.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libisc/ifiter_sysctl.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libisc/interfaceiter.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libisc/net.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libntp/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/a_md5encrypt.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/adjtime.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/audio.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/binio.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/buftvtots.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/caljulian.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/calleapwhen.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/clocktypes.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/decodenetnum.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/dolfptoa.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/gpstolfp.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/humandate.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/icom.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/ieee754io.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/iosignal.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/lib_strbuf.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/log.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/log.h#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/machines.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/mfp_mul.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/mktime.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/msyslog.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libntp/ntp_rfc2553.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/numtohost.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/prettydate.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/random.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/ranny.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/libntp/recvbuff.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/socktoa.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/socktohost.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/statestr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libntp/systime.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/README#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libparse/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/README#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_computime.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_dcf7000.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_hopf6021.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_meinberg.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_rawdcf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_rcc8000.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_schmid.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_trimtaip.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_trimtsip.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_varitext.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_wharton.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/data_mbg.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libparse/info_trimble.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/libparse/parse.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/parse_conf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/parsesolaris.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/parsestreams.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/trim_info.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/dtrace/src/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/missing#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/mkinstalldirs#4 delete .. //depot/projects/dtrace/src/contrib/ntp/ntpd/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/cmd_args.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/map_vme.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_config.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_control.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_crypto.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_filegen.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_intres.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_io.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_loopfilter.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_monitor.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_peer.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_proto.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_refclock.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_request.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_restrict.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_timer.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntp_util.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpd.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ntpsim.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_acts.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_arbiter.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_arc.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_atom.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_bancomm.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_chu.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_conf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_datum.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_fg.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_gpsvme.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_heath.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_hopfpci.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_hopfser.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_hpgps.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_irig.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_jjy.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_jupiter.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_leitch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_local.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_msfees.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_mx4200.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_neoclock4x.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_nmea.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_oncore.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_palisade.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_palisade.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_parse.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_pst.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_ptbacts.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_ripencc.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_shm.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_ulink.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_usno.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_wwv.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpd/refclock_wwvb.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdate/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdate/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdate/ntpdate.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdate/ntptimeset.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/layout.std#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/nl.pl#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/nl.pl.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpdc/ntpdc_ops.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpq/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpq/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/ntpq/ntpq_ops.c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/dtrace/src/contrib/ntp/parseutil/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/parseutil/dcfd.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/parseutil/testdcf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/dtrace/src/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/dtrace/src/contrib/ntp/scripts/genver#1 branch .. //depot/projects/dtrace/src/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/dtrace/src/contrib/ntp/scripts/mkver.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/monitoring/lr.pl#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/monitoring/ntploopwatch#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/ntpsweep.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/ntptrace.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/README#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/bin/monl#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/bin/mvstats#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/hp300.hp300#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/hp700.hp700#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/hp800.hp800#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/ntp.conf#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun3.sun3#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4c#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4m#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/conf/tickconf#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/etc/cron#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/etc/crontab#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/etc/install#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/etc/rc#4 delete .. //depot/projects/dtrace/src/contrib/ntp/scripts/support/etc/setup#4 delete .. //depot/projects/dtrace/src/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/README#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/compile#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/config.guess#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/config.sub#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/configure#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/configure.ac#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/depcomp#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/header.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/install-sh#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/internet.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/internet.h#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/main.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/missing#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/mkinstalldirs#4 delete .. //depot/projects/dtrace/src/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/sntp/socket.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/timing.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/Makefile.am#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/ansi2knr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/hist.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/jitter.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/dtrace/src/contrib/ntp/util/ntp-keygen.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/ntptime.c#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/util/tg.c#1 branch .. //depot/projects/dtrace/src/contrib/ntp/version#4 integrate .. //depot/projects/dtrace/src/contrib/ntp/version.m4#1 branch .. //depot/projects/dtrace/src/crypto/openssh/readconf.c#6 integrate .. //depot/projects/dtrace/src/etc/defaults/devfs.rules#6 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#40 integrate .. //depot/projects/dtrace/src/etc/etc.amd64/ttys#8 integrate .. //depot/projects/dtrace/src/etc/etc.arm/ttys#7 integrate .. //depot/projects/dtrace/src/etc/etc.i386/ttys#8 integrate .. //depot/projects/dtrace/src/etc/etc.ia64/ttys#7 integrate .. //depot/projects/dtrace/src/etc/etc.mips/ttys#2 integrate .. //depot/projects/dtrace/src/etc/etc.powerpc/ttys#7 integrate .. //depot/projects/dtrace/src/etc/etc.sparc64/ttys#8 integrate .. //depot/projects/dtrace/src/etc/login.conf#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#20 integrate .. //depot/projects/dtrace/src/etc/rc.d/kernel_symlink#2 delete .. //depot/projects/dtrace/src/lib/csu/amd64/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/Makefile#16 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#10 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/Symbol.map#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.3#4 delete .. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#8 delete .. //depot/projects/dtrace/src/lib/libc/stdlib/ptsname.3#1 branch .. //depot/projects/dtrace/src/lib/libc/stdlib/ptsname.c#1 branch .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#12 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#14 integrate .. //depot/projects/dtrace/src/lib/libc/sys/getrlimit.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/posix_openpt.2#1 branch .. //depot/projects/dtrace/src/lib/libkvm/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm.h#6 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_cptime.c#1 branch .. //depot/projects/dtrace/src/lib/libkvm/kvm_getcptime.3#1 branch .. //depot/projects/dtrace/src/lib/libkvm/kvm_getpcpu.3#2 integrate .. //depot/projects/dtrace/src/lib/libutil/login.conf.5#8 integrate .. //depot/projects/dtrace/src/lib/libutil/login_class.c#6 integrate .. //depot/projects/dtrace/src/libexec/Makefile#6 integrate .. //depot/projects/dtrace/src/libexec/pt_chown/Makefile#4 delete .. //depot/projects/dtrace/src/libexec/pt_chown/pt_chown.c#4 delete .. //depot/projects/dtrace/src/release/amd64/boot_crunch.conf#6 integrate .. //depot/projects/dtrace/src/release/i386/boot_crunch.conf#6 integrate .. //depot/projects/dtrace/src/release/ia64/boot_crunch.conf#7 integrate .. //depot/projects/dtrace/src/release/pc98/boot_crunch.conf#6 integrate .. //depot/projects/dtrace/src/release/powerpc/boot_crunch.conf#6 integrate .. //depot/projects/dtrace/src/release/sparc64/boot_crunch.conf#6 integrate .. //depot/projects/dtrace/src/release/sun4v/boot_crunch.conf#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/main.c#10 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#41 integrate .. //depot/projects/dtrace/src/share/man/man4/acpi_aiboost.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/acpi_asus.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/acpi_fujitsu.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/acpi_ibm.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/acpi_panasonic.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/acpi_sony.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/acpi_toshiba.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/ddb.4#21 integrate .. //depot/projects/dtrace/src/share/man/man4/ichwd.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/io.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/linux.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/man4.i386/Makefile#8 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_aiboost.4#2 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_asus.4#6 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_fujitsu.4#4 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_ibm.4#5 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_panasonic.4#4 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_sony.4#6 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_toshiba.4#4 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/dpms.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/man4.i386/ichwd.4#4 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/io.4#4 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/linux.4#6 delete .. //depot/projects/dtrace/src/share/man/man4/man4.i386/ndis.4#7 delete .. //depot/projects/dtrace/src/share/man/man4/ndis.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/pts.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/pty.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/rum.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/termios.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/uipaq.4#1 branch .. //depot/projects/dtrace/src/share/man/man9/device_get_children.9#4 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#15 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/bpf_jit_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/bpf_jit_machdep.h#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/local_apic.c#16 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#46 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pci_cfgreg.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91.c#13 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_pio.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_piovar.h#4 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_pmc.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/include/endian.h#5 integrate .. //depot/projects/dtrace/src/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/dtrace/src/sys/bsm/audit_kevents.h#10 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#26 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#26 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#26 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#14 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#66 integrate .. //depot/projects/dtrace/src/sys/conf/files#105 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#40 integrate .. //depot/projects/dtrace/src/sys/conf/files.sparc64#11 integrate .. //depot/projects/dtrace/src/sys/conf/options#57 integrate .. //depot/projects/dtrace/src/sys/conf/options.sparc64#5 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/dcons/dcons.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm-subprocess.pl#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drmP.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_internal.h#1 branch .. //depot/projects/dtrace/src/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_dma.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_drm.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_mem.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_suspend.c#1 branch .. //depot/projects/dtrace/src/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mach64_drm.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mach64_drv.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mach64_irq.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mach64_state.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_dma.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_drm.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_drv.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_state.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_warp.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r128_cce.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r128_drm.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r128_drv.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r128_irq.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r128_state.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r300_cmdbuf.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r300_reg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_drm.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_mem.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_microcode.h#1 branch .. //depot/projects/dtrace/src/sys/dev/drm/radeon_state.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_bci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_drm.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_drv.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_state.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/sis_drv.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/drm/sis_mm.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_ex_isa.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_exvar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/iiconf.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/mii/mii.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mii/mlphy.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mii/tlphy.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/dtrace/src/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccard_cis_quirks.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#23 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/csa.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/schistory.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scmouse.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scterm-sc.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scvesactl.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scvidctl.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_bus_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_core.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_cpu_pc98.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uvisor.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/vx/if_vx_eisa.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#25 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#46 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#26 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XBOX#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/i386/bpf_jit_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/bpf_jit_machdep.h#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#18 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#30 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_ioctl.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/dtrace/src/sys/i386/include/pci_cfgreg.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/isa/dpms.c#1 branch .. //depot/projects/dtrace/src/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/SKI#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/ssc.c#6 integrate .. //depot/projects/dtrace/src/sys/isa/isa_common.c#6 integrate .. //depot/projects/dtrace/src/sys/isa/isavar.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#28 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#34 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acct.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#33 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#32 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#29 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#25 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/subr_prf.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rman.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#33 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#25 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#30 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/tty_compat.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/tty_conf.c#4 delete .. //depot/projects/dtrace/src/sys/kern/tty_cons.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/tty_inq.c#1 branch .. //depot/projects/dtrace/src/sys/kern/tty_outq.c#1 branch .. //depot/projects/dtrace/src/sys/kern/tty_pts.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pty.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/tty_ttydisc.c#1 branch .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#38 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#44 integrate .. //depot/projects/dtrace/src/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#54 integrate .. //depot/projects/dtrace/src/sys/modules/dpms/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/drm/i915/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/nmdm/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/rc/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/net/bpf_jitter.c#5 integrate .. //depot/projects/dtrace/src/sys/net/bpf_jitter.h#5 integrate .. //depot/projects/dtrace/src/sys/net/if.c#20 integrate .. //depot/projects/dtrace/src/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/dtrace/src/sys/net/if_var.h#11 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_var.h#9 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#22 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_hostcache.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#25 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#25 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#23 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#12 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_server.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC.hints#7 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#15 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 00:29:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C1241065681; Tue, 26 Aug 2008 00:29:45 +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 56C171065672 for ; Tue, 26 Aug 2008 00:29: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 34E2E8FC0C for ; Tue, 26 Aug 2008 00:29:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q0TjVQ031266 for ; Tue, 26 Aug 2008 00:29:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q0TjcG031264 for perforce@freebsd.org; Tue, 26 Aug 2008 00:29:45 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 00:29:45 GMT Message-Id: <200808260029.m7Q0TjcG031264@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 148480 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, 26 Aug 2008 00:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=148480 Change 148480 by jb@freebsd3 on 2008/08/26 00:29:39 Drop doc, ports and www from this project. Affected files ... .. //depot/projects/dtrace/doc/Makefile#4 delete .. //depot/projects/dtrace/doc/README#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/Makefile#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/Makefile#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#3 delete .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/Makefile#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/Makefile#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/Makefile#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/post#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/pre#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/license.sgml#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/Makefile#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing-ports/Makefile#2 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/new-users/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/Makefile#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#14 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#9 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#9 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#9 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#9 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#13 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#11 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#11 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#8 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#13 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/Makefile#2 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/Makefile#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/flyer.tex#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/articles.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/books.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#7 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/teams.ent#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#4 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#3 delete .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#9 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile.inc#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/compiz-fusion/Makefile#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/Makefile#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#6 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/linux-users/Makefile#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#6 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/article.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/extra.css#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/faq/Makefile#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/faq/book.sgml#8 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/Makefile#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/book.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/flyer/Makefile#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/flyer/flyer.tex#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/articles.ent#6 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/books.ent#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#6 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#7 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#6 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#7 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/teams.ent#7 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#6 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#5 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/translators.ent#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/urls.ent#3 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/Makefile#2 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#4 delete .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#11 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#24 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/Makefile#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#88 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#55 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#22 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cups/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cups/article.sgml#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fonts/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fonts/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/gjournal-desktop/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/article.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ldap-auth/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ldap-auth/article.sgml#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-emulation/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-emulation/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mh/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mh/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/multi-os/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/converse.c#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/su.c#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#15 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#9 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#9 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/install.cfg#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/loader.rc#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/post#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/pre#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/extra.css#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/solid-state/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/bibliography/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/bibliography/book.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#12 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#30 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#9 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#19 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#12 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#9 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapters.ent#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#14 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#12 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#19 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#20 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#13 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#19 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#15 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#9 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#13 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#19 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#19 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#17 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#11 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#8 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#19 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#28 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#13 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/virtualization/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#11 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/book.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/chapters.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#83 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/Makefile#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#7 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/mk/doc.local.mk#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#45 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#8 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#11 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/teams.ent#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/README#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#6 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-more-information.xml#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/admin.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/applications.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/includes.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/install.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/misc.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/network.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/preface.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/serial.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/x.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#9 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fdp-es/Makefile#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-comparison/Makefile#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-comparison/article.sgml#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/extra.css#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/version-guide/Makefile#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/version-guide/article.sgml#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/book.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/Makefile#6 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/authors.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/book.sgml#5 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/flyer/Makefile#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/flyer/flyer.tex#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/articles.ent#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/books.ent#2 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/catalog#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/teams.ent#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#4 delete .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/translators.ent#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/euro/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/converse.c#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/su.c#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/post#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/pre#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/extra.css#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/faq/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/faq/book.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#7 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/audit/Makefile#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#8 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#10 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#6 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#9 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile#2 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#7 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/builtin.1#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/cat.1#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/chkey.1#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/echo.1#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/head.1#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/intro.1#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/agp.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/amd.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/ncr.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/sd.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/sn.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/spic.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/st.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man5/intro.5#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man5/publickey.5#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man6/intro.6#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man7/ascii.7#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man7/intro.7#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/books.ent#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/catalog#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#4 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#5 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#3 delete .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/Makefile#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/Makefile#5 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/laptop/Makefile#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/laptop/article.sgml#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#5 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/linux-users/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/multi-os/Makefile#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/multi-os/article.sgml#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/version-guide/Makefile#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#6 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/Makefile#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/Makefile.inc#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/faq/Makefile#2 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/faq/book.sgml#2 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#5 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/isdn-bus.eps#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/isdn-twisted-pair.eps#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/natd.eps#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/net-routing.pic#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/static-routes.pic#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/appendix.decl#2 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/audit/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/basics/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#4 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/boot/Makefile#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/chapter.decl#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 00:34:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10E381065681; Tue, 26 Aug 2008 00:34:51 +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 C557A1065672 for ; Tue, 26 Aug 2008 00:34:50 +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 8C0398FC12 for ; Tue, 26 Aug 2008 00:34:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q0YoB9031689 for ; Tue, 26 Aug 2008 00:34:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q0Yo5o031687 for perforce@freebsd.org; Tue, 26 Aug 2008 00:34:50 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 00:34:50 GMT Message-Id: <200808260034.m7Q0Yo5o031687@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 148481 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, 26 Aug 2008 00:34:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=148481 Change 148481 by jb@freebsd3 on 2008/08/26 00:34:41 IF7 Affected files ... .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/dtrace7/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/dtrace7/src/etc/rc.d/kernel#2 delete .. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_tar_hardlink.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_ustar_filenames.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/dtrace7/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/dtrace7/src/sys/conf/newvers.sh#7 integrate .. //depot/projects/dtrace7/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/dtrace7/src/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/dtrace7/src/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/dtrace7/src/tools/tools/crypto/cryptotest.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/Makefile#4 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/matching.c#4 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/test/Makefile#2 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_copy.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_option_T.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_option_q.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_patterns.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_patterns.tgz.err.uu#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_patterns.tgz.out.uu#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_patterns.tgz.uu#1 branch .. //depot/projects/dtrace7/src/usr.sbin/mountd/mountd.c#3 integrate Differences ... ==== //depot/projects/dtrace7/src/etc/defaults/rc.conf#8 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.9 2008/05/06 10:50:51 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.10 2008/08/25 16:37:58 des Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -544,7 +544,6 @@ sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). - clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks ==== //depot/projects/dtrace7/src/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.84.2.4 2008/04/15 20:23:59 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.84.2.5 2008/08/25 16:37:58 des Exp $ .include @@ -18,7 +18,7 @@ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ jail \ - kadmind kerberos kernel keyserv kldxref kpasswdd \ + kadmind kerberos keyserv kldxref kpasswdd \ ldconfig local localpkg lockd lpd \ mixer motd mountcritlocal mountcritremote mountlate \ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ ==== //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_tar_hardlink.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.1.2.2 2008/05/21 04:14:39 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.1.2.3 2008/08/25 01:55:40 kientzle Exp $"); /* * Background: There are two written standards for the tar file format. @@ -93,7 +93,11 @@ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); +#endif } DEFINE_TEST(test_compat_tar_hardlink) ==== //depot/projects/dtrace7/src/lib/libarchive/test/test_pax_filename_encoding.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.1.2.2 2008/08/10 04:32:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.1.2.3 2008/08/25 01:55:40 kientzle Exp $"); #include @@ -149,7 +149,11 @@ archive_entry_free(entry); assertEqualInt(0, archive_write_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now read the entries back. @@ -175,7 +179,11 @@ assertEqualString(longname, archive_entry_pathname(entry)); assertEqualInt(0, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(0, archive_read_finish(a)); +#endif } /* @@ -249,7 +257,11 @@ archive_entry_free(entry); assertEqualInt(0, archive_write_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now read the entries back. @@ -293,5 +305,9 @@ assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry)); assertEqualInt(0, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(0, archive_read_finish(a)); +#endif } ==== //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_large.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.1.2.2 2008/08/10 04:32:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.1.2.3 2008/08/25 01:55:40 kientzle Exp $"); #include #include @@ -179,7 +179,6 @@ #else static off_t memory_read_skip(struct archive *a, void *_private, off_t skip) -#endif { struct memdata *private = _private; @@ -198,6 +197,7 @@ } return (skip); } +#endif DEFINE_TEST(test_tar_large) { ==== //depot/projects/dtrace7/src/lib/libarchive/test/test_ustar_filenames.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.1.2.1 2008/08/10 04:32:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.1.2.2 2008/08/25 01:55:40 kientzle Exp $"); /* * Exercise various lengths of filenames in ustar archives. @@ -111,7 +111,11 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); - assertA(0 == archive_write_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else + assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now, read the data back. @@ -153,7 +157,11 @@ failure("This fails if entries were written that should not have been written. dlen=%d, flen=%d", dlen, flen); assertEqualInt(1, archive_read_next_header(a, &ae)); assert(0 == archive_read_close(a)); - assert(0 == archive_read_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else + assertEqualInt(0, archive_read_finish(a)); +#endif } DEFINE_TEST(test_ustar_filenames) ==== //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_hardlink.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.1.2.2 2008/08/10 04:32:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.1.2.3 2008/08/25 01:55:40 kientzle Exp $"); #define UMASK 022 @@ -131,7 +131,11 @@ assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else assertEqualInt(0, archive_write_finish(ad)); +#endif /* Test the entries on disk. */ assert(0 == stat("link1a", &st)); ==== //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_tar_ustar.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.1.2.1 2008/08/10 04:32:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.1.2.2 2008/08/25 01:55:40 kientzle Exp $"); static int is_null(const char *p, size_t l) @@ -188,7 +188,11 @@ assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assert(0 == archive_write_finish(a)); +#endif /* * Verify the archive format. ==== //depot/projects/dtrace7/src/sys/amd64/amd64/bpf_jit_machdep.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,18 +30,22 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4.2.1 2008/08/25 19:06:02 jkim Exp $"); +#ifdef _KERNEL #include "opt_bpf.h" - #include #include #include -#include #include #include +#include +#else +#include +#endif + +#include -#include #include #include @@ -53,7 +57,7 @@ * emit routine to update the jump table */ static void -emit_length(bpf_bin_stream *stream, u_int value, u_int len) +emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len) { (stream->refs)[stream->bpf_pc] += len; @@ -105,13 +109,17 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ +#ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); +#else + stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int)); +#endif if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,145 +139,167 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RBP, RSP); - MOVoqd(RBP, -8, ESI); - MOVoqd(RBP, -12, EDX); - PUSH(RBX); - MOVrq(RBX, RDI); + MOVrq2(RBX, R8); + MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; +#ifdef _KERNEL + return (NULL); +#else + abort(); +#endif case BPF_RET|BPF_K: - MOVid(EAX, ins->k); - POP(RBX); - LEAVE_RET(); + MOVid(ins->k, EAX); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: - MOVid(ECX, ins->k); - MOVrd(ESI, ECX); - ADDib(ECX, sizeof(int)); - CMPodd(ECX, RBP, -12); - JLEb(5); - ZERO_EAX(); - POP(RBX); - LEAVE_RET(); - MOVobd(EAX, RBX, RSI); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); + ZEROrd(EAX); + MOVrq3(R8, RBX); + RET(); + MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; case BPF_LD|BPF_H|BPF_ABS: - ZERO_EAX(); - MOVid(ECX, ins->k); - MOVrd(ESI, ECX); - ADDib(ECX, sizeof(short)); - CMPodd(ECX, RBP, -12); - JLEb(3); - POP(RBX); - LEAVE_RET(); - MOVobw(AX, RBX, RSI); + ZEROrd(EAX); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); + MOVrq3(R8, RBX); + RET(); + MOVobw(RBX, RSI, AX); SWAP_AX(); break; case BPF_LD|BPF_B|BPF_ABS: - ZERO_EAX(); - MOVid(ECX, ins->k); - CMPodd(ECX, RBP, -12); - JLEb(3); - POP(RBX); - LEAVE_RET(); - MOVobb(AL, RBX, RCX); + ZEROrd(EAX); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(4); + MOVrq3(R8, RBX); + RET(); + MOVobb(RBX, RSI, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVodd(EAX, RBP, -8); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVodd(EDX, RBP, -8); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: - MOVid(ECX, ins->k); - ADDrd(ECX, EDX); - MOVrd(ESI, ECX); - ADDib(ECX, sizeof(int)); - CMPodd(ECX, RBP, -12); - JLEb(5); - ZERO_EAX(); - POP(RBX); - LEAVE_RET(); - MOVobd(EAX, RBX, RSI); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); + ZEROrd(EAX); + MOVrq3(R8, RBX); + RET(); + MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; case BPF_LD|BPF_H|BPF_IND: - ZERO_EAX(); - MOVid(ECX, ins->k); - ADDrd(ECX, EDX); - MOVrd(ESI, ECX); - ADDib(ECX, sizeof(short)); - CMPodd(ECX, RBP, -12); - JLEb(3); - POP(RBX); - LEAVE_RET(); - MOVobw(AX, RBX, RSI); + ZEROrd(EAX); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); + MOVrq3(R8, RBX); + RET(); + MOVobw(RBX, RSI, AX); SWAP_AX(); break; case BPF_LD|BPF_B|BPF_IND: - ZERO_EAX(); - MOVid(ECX, ins->k); - ADDrd(ECX, EDX); - CMPodd(ECX, RBP, -12); - JLEb(3); - POP(RBX); - LEAVE_RET(); - MOVobb(AL, RBX, RCX); + ZEROrd(EAX); + CMPrd(EDI, EDX); + JAEb(13); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JAb(4); + MOVrq3(R8, RBX); + RET(); + ADDrd(EDX, ESI); + MOVobb(RBX, RSI, AL); break; case BPF_LDX|BPF_MSH|BPF_B: - MOVid(ECX, ins->k); - CMPodd(ECX, RBP, -12); - JLEb(5); - ZERO_EAX(); - POP(RBX); - LEAVE_RET(); - ZERO_EDX(); - MOVobb(DL, RBX, RCX); - ANDib(DL, 0xf); - SHLib(EDX, 2); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(6); + ZEROrd(EAX); + MOVrq3(R8, RBX); + RET(); + ZEROrd(EDX); + MOVobb(RBX, RSI, DL); + ANDib(0x0f, DL); + SHLib(2, EDX); break; case BPF_LD|BPF_IMM: - MOVid(EAX, ins->k); + MOVid(ins->k, EAX); break; case BPF_LDX|BPF_IMM: - MOVid(EDX, ins->k); + MOVid(ins->k, EDX); break; case BPF_LD|BPF_MEM: - MOViq(RCX, (uintptr_t)mem); - MOVid(ESI, ins->k * 4); - MOVobd(EAX, RCX, RSI); + MOViq((uintptr_t)mem, RCX); + MOVid(ins->k * 4, ESI); + MOVobd(RCX, RSI, EAX); break; case BPF_LDX|BPF_MEM: - MOViq(RCX, (uintptr_t)mem); - MOVid(ESI, ins->k * 4); - MOVobd(EDX, RCX, RSI); + MOViq((uintptr_t)mem, RCX); + MOVid(ins->k * 4, ESI); + MOVobd(RCX, RSI, EDX); break; case BPF_ST: @@ -278,15 +308,15 @@ * be optimized if the previous instruction * was already of this type */ - MOViq(RCX, (uintptr_t)mem); - MOVid(ESI, ins->k * 4); - MOVomd(RCX, RSI, EAX); + MOViq((uintptr_t)mem, RCX); + MOVid(ins->k * 4, ESI); + MOVomd(EAX, RCX, RSI); break; case BPF_STX: - MOViq(RCX, (uintptr_t)mem); - MOVid(ESI, ins->k * 4); - MOVomd(RCX, RSI, EDX); + MOViq((uintptr_t)mem, RCX); + MOVid(ins->k * 4, ESI); + MOVomd(EDX, RCX, RSI); break; case BPF_JMP|BPF_JA: @@ -295,113 +325,102 @@ break; case BPF_JMP|BPF_JGT|BPF_K: - CMPid(EAX, ins->k); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + CMPid(ins->k, EAX); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: - CMPid(EAX, ins->k); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + CMPid(ins->k, EAX); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: - CMPid(EAX, ins->k); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + CMPid(ins->k, EAX); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(ECX, EAX); - ANDid(ECX, ins->k); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: - CMPrd(EAX, EDX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + CMPrd(EDX, EAX); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: - CMPrd(EAX, EDX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + CMPrd(EDX, EAX); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: - CMPrd(EAX, EDX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + CMPrd(EDX, EAX); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(ECX, EAX); - ANDrd(ECX, EDX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: - ADDrd(EAX, EDX); + ADDrd(EDX, EAX); break; case BPF_ALU|BPF_SUB|BPF_X: - SUBrd(EAX, EDX); + SUBrd(EDX, EAX); break; case BPF_ALU|BPF_MUL|BPF_X: + MOVrd(EDX, ECX); + MULrd(EDX); MOVrd(ECX, EDX); - MULrd(EDX); - MOVrd(EDX, ECX); break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(EDX, 0); - JNEb(5); - ZERO_EAX(); - POP(RBX); - LEAVE_RET(); + TESTrd(EDX, EDX); + JNEb(6); + ZEROrd(EAX); + MOVrq3(R8, RBX); + RET(); + MOVrd(EDX, ECX); + ZEROrd(EDX); + DIVrd(ECX); MOVrd(ECX, EDX); - ZERO_EDX(); - DIVrd(ECX); - MOVrd(EDX, ECX); break; case BPF_ALU|BPF_AND|BPF_X: - ANDrd(EAX, EDX); + ANDrd(EDX, EAX); break; case BPF_ALU|BPF_OR|BPF_X: - ORrd(EAX, EDX); + ORrd(EDX, EAX); break; case BPF_ALU|BPF_LSH|BPF_X: - MOVrd(ECX, EDX); + MOVrd(EDX, ECX); SHL_CLrb(EAX); break; case BPF_ALU|BPF_RSH|BPF_X: - MOVrd(ECX, EDX); + MOVrd(EDX, ECX); SHR_CLrb(EAX); break; @@ -414,34 +433,34 @@ break; case BPF_ALU|BPF_MUL|BPF_K: + MOVrd(EDX, ECX); + MOVid(ins->k, EDX); + MULrd(EDX); MOVrd(ECX, EDX); - MOVid(EDX, ins->k); - MULrd(EDX); - MOVrd(EDX, ECX); break; case BPF_ALU|BPF_DIV|BPF_K: + MOVrd(EDX, ECX); + ZEROrd(EDX); + MOVid(ins->k, ESI); + DIVrd(ESI); MOVrd(ECX, EDX); - ZERO_EDX(); - MOVid(ESI, ins->k); - DIVrd(ESI); - MOVrd(EDX, ECX); break; case BPF_ALU|BPF_AND|BPF_K: - ANDid(EAX, ins->k); + ANDid(ins->k, EAX); break; case BPF_ALU|BPF_OR|BPF_K: - ORid(EAX, ins->k); + ORid(ins->k, EAX); break; case BPF_ALU|BPF_LSH|BPF_K: - SHLib(EAX, (ins->k) & 255); + SHLib((ins->k) & 0xff, EAX); break; case BPF_ALU|BPF_RSH|BPF_K: - SHRib(EAX, (ins->k) & 255); + SHRib((ins->k) & 0xff, EAX); break; case BPF_ALU|BPF_NEG: @@ -449,11 +468,11 @@ break; case BPF_MISC|BPF_TAX: - MOVrd(EDX, EAX); + MOVrd(EAX, EDX); break; case BPF_MISC|BPF_TXA: - MOVrd(EAX, EDX); + MOVrd(EDX, EAX); break; } ins++; @@ -463,11 +482,19 @@ if (pass == 2) break; +#ifdef _KERNEL stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); - return NULL; + return (NULL); + } +#else + stream.ibuf = (char *)malloc(stream.cur_ip); + if (stream.ibuf == NULL) { + free(stream.refs); + return (NULL); } +#endif /* * modify the reference table to contain the offsets and @@ -488,7 +515,11 @@ * the reference table is needed only during compilation, * now we can free it */ +#ifdef _KERNEL free(stream.refs, M_BPFJIT); +#else + free(stream.refs); +#endif - return (bpf_filter_func)stream.ibuf; + return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/dtrace7/src/sys/amd64/amd64/bpf_jit_machdep.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.3 2005/12/06 20:11:07 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.3.2.1 2008/08/25 19:06:02 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -45,6 +45,14 @@ #define RBP 5 #define RSI 6 #define RDI 7 +#define R8 0 +#define R9 1 +#define R10 2 +#define R11 3 +#define R12 4 +#define R13 5 +#define R14 6 +#define R15 7 #define EAX 0 #define ECX 1 @@ -54,6 +62,14 @@ #define EBP 5 #define ESI 6 #define EDI 7 +#define R8D 0 +#define R9D 1 +#define R10D 2 +#define R11D 3 +#define R12D 4 +#define R13D 5 +#define R14D 6 +#define R15D 7 #define AX 0 #define CX 1 @@ -104,254 +120,257 @@ * native Instruction Macros */ -/* mov r32,i32 */ -#define MOVid(r32, i32) do { \ +/* movl i32,r32 */ +#define MOVid(i32, r32) do { \ emitm(&stream, (11 << 4) | (1 << 3) | (r32 & 0x7), 1); \ emitm(&stream, i32, 4); \ } while (0) -/* mov r64,i64 */ -#define MOViq(r64, i64) do { \ +/* movq i64,r64 */ +#define MOViq(i64, r64) do { \ emitm(&stream, 0x48, 1); \ emitm(&stream, (11 << 4) | (1 << 3) | (r64 & 0x7), 1); \ emitm(&stream, i64, 4); \ emitm(&stream, (i64 >> 32), 4); \ } while (0) -/* mov dr32,sr32 */ -#define MOVrd(dr32, sr32) do { \ - emitm(&stream, (8 << 4) | 3 | (1 << 3), 1); \ +/* movl sr32,dr32 */ +#define MOVrd(sr32, dr32) do { \ + emitm(&stream, 0x89, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (dr32 = %r8-15d) */ +#define MOVrd2(sr32, dr32) do { \ + emitm(&stream, 0x8941, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (sr32 = %r8-15d) */ +#define MOVrd3(sr32, dr32) do { \ + emitm(&stream, 0x8944, 2); \ emitm(&stream, \ - (3 << 6) | ((dr32 & 0x7) << 3) | (sr32 & 0x7), 1); \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 00:35:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C32D1065678; Tue, 26 Aug 2008 00:35:52 +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 D47D9106566C for ; Tue, 26 Aug 2008 00:35:51 +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 B56F68FC13 for ; Tue, 26 Aug 2008 00:35:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q0ZpDL031858 for ; Tue, 26 Aug 2008 00:35:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q0ZpxZ031856 for perforce@freebsd.org; Tue, 26 Aug 2008 00:35:51 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 00:35:51 GMT Message-Id: <200808260035.m7Q0ZpxZ031856@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 148482 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, 26 Aug 2008 00:35:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=148482 Change 148482 by jb@freebsd3 on 2008/08/26 00:35:29 IF6 Affected files ... .. //depot/projects/dtrace6/src/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/dtrace6/src/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/dtrace6/src/sys/conf/newvers.sh#5 integrate Differences ... ==== //depot/projects/dtrace6/src/etc/mtree/BSD.local.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.117.2.1 2006/01/17 06:53:17 dougb Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.117.2.3 2008/08/25 13:33:45 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # ==== //depot/projects/dtrace6/src/etc/mtree/BSD.usr.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312.2.1 2005/11/16 07:47:43 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312.2.2 2008/08/25 13:25:56 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -545,6 +545,12 @@ .. lt_LT.UTF-8 .. + nb_NO.ISO8859-1 + .. + nb_NO.ISO8859-15 + .. + nb_NO.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 @@ -557,6 +563,12 @@ .. nl_NL.UTF-8 .. + nn_NO.ISO8859-1 + .. + nn_NO.ISO8859-15 + .. + nn_NO.UTF-8 + .. no_NO.ISO8859-1 .. no_NO.ISO8859-15 ==== //depot/projects/dtrace6/src/sys/conf/newvers.sh#5 (text+ko) ==== @@ -28,11 +28,11 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.17 2008/07/16 10:29:42 dougb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.18 2008/08/25 18:47:28 kensmith Exp $ TYPE="FreeBSD" -REVISION="6.3" -BRANCH="STABLE" +REVISION="6.4" +BRANCH="PRERELEASE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-p4-projects@FreeBSD.ORG Tue Aug 26 01:18:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C8B6106567C; Tue, 26 Aug 2008 01:18: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 CFDC31065673 for ; Tue, 26 Aug 2008 01:18: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 8C89E8FC17 for ; Tue, 26 Aug 2008 01:18:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q1IZSD045850 for ; Tue, 26 Aug 2008 01:18:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q1IZ6H045848 for perforce@freebsd.org; Tue, 26 Aug 2008 01:18:35 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 01:18:35 GMT Message-Id: <200808260118.m7Q1IZ6H045848@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 148484 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, 26 Aug 2008 01:18:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=148484 Change 148484 by jb@freebsd3 on 2008/08/26 01:18:09 Leave out tracing Linux syscalls on this old version. Affected files ... .. //depot/projects/dtrace6/src/sys/modules/dtrace/Makefile#3 edit Differences ... ==== //depot/projects/dtrace6/src/sys/modules/dtrace/Makefile#3 (text+ko) ==== @@ -16,7 +16,6 @@ SUBDIR+= fbt .elif ${MACHINE_ARCH} == "i386" SUBDIR+= fbt -SUBDIR+= linsystrace .endif .include From owner-p4-projects@FreeBSD.ORG Tue Aug 26 01:19:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39EF81065675; Tue, 26 Aug 2008 01:19: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 F1E161065670 for ; Tue, 26 Aug 2008 01:19: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 B87E08FC0A for ; Tue, 26 Aug 2008 01:19:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q1JaYs045986 for ; Tue, 26 Aug 2008 01:19:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q1Jato045984 for perforce@freebsd.org; Tue, 26 Aug 2008 01:19:36 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 01:19:36 GMT Message-Id: <200808260119.m7Q1Jato045984@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 148485 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, 26 Aug 2008 01:19:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=148485 Change 148485 by jb@freebsd3 on 2008/08/26 01:19:02 Remove references to minor devices. Affected files ... .. //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 edit Differences ... ==== //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 (text) ==== @@ -16450,7 +16450,6 @@ static struct cdevsw dtrace_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDMINOR, .d_close = dtrace_close, .d_ioctl = dtrace_ioctl, .d_open = dtrace_open, From owner-p4-projects@FreeBSD.ORG Tue Aug 26 01:20:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 621251065674; Tue, 26 Aug 2008 01:20: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 26066106566C for ; Tue, 26 Aug 2008 01:20:38 +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 E10D98FC21 for ; Tue, 26 Aug 2008 01:20:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q1Kb7X046139 for ; Tue, 26 Aug 2008 01:20:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q1Kbxm046137 for perforce@freebsd.org; Tue, 26 Aug 2008 01:20:37 GMT (envelope-from jb@freebsd.org) Date: Tue, 26 Aug 2008 01:20:37 GMT Message-Id: <200808260120.m7Q1Kbxm046137@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 148486 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, 26 Aug 2008 01:20:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=148486 Change 148486 by jb@freebsd3 on 2008/08/26 01:20:12 Drop the WARNS level to avoid compiler barfs. The code works fine with a more modern compiler and this branch is to old to do much with. Affected files ... .. //depot/projects/dtrace6/src/lib/libproc/Makefile#2 edit Differences ... ==== //depot/projects/dtrace6/src/lib/libproc/Makefile#2 (text+ko) ==== @@ -13,7 +13,7 @@ SHLIB_MAJOR= 1 -WARNS?= 6 +WARNS?= 1 WITHOUT_MAN= yes From owner-p4-projects@FreeBSD.ORG Tue Aug 26 06:15:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2931106568C; Tue, 26 Aug 2008 06:15: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 A35E4106567F for ; Tue, 26 Aug 2008 06:15:37 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 899668FC1A for ; Tue, 26 Aug 2008 06:15:37 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q6Fbst084434 for ; Tue, 26 Aug 2008 06:15:37 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q6FbYH084432 for perforce@freebsd.org; Tue, 26 Aug 2008 06:15:37 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 26 Aug 2008 06:15:37 GMT Message-Id: <200808260615.m7Q6FbYH084432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148493 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, 26 Aug 2008 06:15:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=148493 Change 148493 by ed@ed_dull on 2008/08/26 06:15:05 IFC. Affected files ... .. //depot/projects/mpsafetty/etc/defaults/rc.conf#6 integrate .. //depot/projects/mpsafetty/etc/rc.d/Makefile#3 integrate .. //depot/projects/mpsafetty/etc/rc.d/kernel_symlink#3 delete .. //depot/projects/mpsafetty/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#10 integrate .. //depot/projects/mpsafetty/share/man/man4/rum.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/uipaq.4#1 branch .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/mpsafetty/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/options#9 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.h#5 integrate .. //depot/projects/mpsafetty/sys/kern/init_sysent.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exec.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/subr_rman.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.master#5 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#11 integrate .. //depot/projects/mpsafetty/sys/net/bpf.h#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf_filter.c#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/mpsafetty/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_var.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/mpsafetty/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/mpsafetty/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/mpsafetty/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/mpsafetty/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.mk#3 integrate .. //depot/projects/mpsafetty/sys/sys/sysproto.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#3 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/test/test_basic.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/ntp/libntp/Makefile#3 integrate Differences ... ==== //depot/projects/mpsafetty/etc/defaults/rc.conf#6 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.342 2008/08/19 14:23:31 obrien Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.343 2008/08/25 16:31:53 des Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -552,7 +552,6 @@ sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). -kernel_symlink_enable="NO" # Symlink booted kernel to /boot/kernel if missing. clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks ==== //depot/projects/mpsafetty/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.93 2008/08/20 03:02:06 obrien Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.94 2008/08/25 16:28:54 des Exp $ .include @@ -18,7 +18,7 @@ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted \ jail \ - kadmind kerberos kernel_symlink keyserv kldxref kpasswdd \ + kadmind kerberos keyserv kldxref kpasswdd \ ldconfig local localpkg lockd lpd \ mixer motd mountcritlocal mountcritremote mountlate \ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ ==== //depot/projects/mpsafetty/lib/libarchive/test/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.23 2008/06/26 11:58:26 des Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -51,21 +51,21 @@ test_tar_filenames.c \ test_tar_large.c \ test_ustar_filenames.c \ + test_write_compress.c \ test_write_compress_program.c \ - test_write_compress.c \ test_write_disk.c \ test_write_disk_hardlink.c \ test_write_disk_perms.c \ test_write_disk_secure.c \ test_write_format_ar.c \ test_write_format_cpio.c \ + test_write_format_cpio_empty.c \ + test_write_format_cpio_newc.c \ test_write_format_cpio_odc.c \ - test_write_format_cpio_newc.c \ - test_write_format_cpio_empty.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ + test_write_format_tar_empty.c \ test_write_format_tar_ustar.c \ - test_write_format_tar_empty.c \ test_write_open_memory.c ==== //depot/projects/mpsafetty/share/man/man4/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.429 2008/08/21 00:40:55 rpaulo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.430 2008/08/25 02:05:04 imp Exp $ MAN= aac.4 \ acpi.4 \ @@ -399,6 +399,7 @@ ugen.4 \ uhci.4 \ uhid.4 \ + uipaq.4 \ ukbd.4 \ ulpt.4 \ umass.4 \ ==== //depot/projects/mpsafetty/share/man/man4/rum.4#2 (text+ko) ==== @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/rum.4,v 1.4 2008/04/20 20:35:45 sam Exp $ +.\" $FreeBSD: src/share/man/man4/rum.4,v 1.5 2008/08/25 05:51:58 kevlo Exp $ .\" .Dd April 13, 2008 .Os @@ -95,6 +95,8 @@ .It "CNet CWD-854 ver F" Ta USB .It "Conceptronic C54RU ver 2" Ta USB .It "Corega CG-WLUSB2GO" Ta USB +.It "D-Link DWA-110" Ta USB +.It "D-Link DWA-111" Ta USB .It "D-Link DWL-G122 rev C1" Ta USB .It "D-Link WUA-1340" Ta USB .It "Digitus DN-7003GR" Ta USB ==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#5 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.13 2008/08/25 20:43:13 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" ==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#5 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/mpsafetty/sys/bsm/audit_kevents.h#4 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.14 2008/08/20 08:31:58 ed Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -548,7 +548,7 @@ #define AUE_MKNODAT 43150 /* FreeBSD. */ #define AUE_READLINKAT 43151 /* FreeBSD. */ #define AUE_SYMLINKAT 43152 /* FreeBSD. */ -#define AUE_POSIXOPENPT 43153 /* FreeBSD. */ +#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.88 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.87 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.78 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.88 2008/08/20 08:39:10 ed Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson */ #include "opt_compat.h" @@ -542,5 +542,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ - { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -853,4 +853,4 @@ char *path2); } 503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \ int flag); } -504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); } +504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); } ==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -39,8 +39,10 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.121 2008/08/25 04:55:29 julian Exp $"); #include #include @@ -89,7 +91,6 @@ #include #endif /* __i386__ || __amd64__ */ -#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#7 (text+ko) ==== @@ -26,8 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); #include #include @@ -62,8 +64,6 @@ #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); #include #include @@ -37,9 +37,9 @@ #include #include #include + #include - #include #include #include ==== //depot/projects/mpsafetty/sys/conf/options#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.637 2008/08/23 15:26:36 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.638 2008/08/24 21:33:10 julian Exp $ # # On the handling of kernel options # @@ -768,4 +768,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE +VIMAGE opt_global.h ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.12 2008/08/25 07:33:17 julian Exp $ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ /* @@ -29,12 +29,10 @@ #if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" -#if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ #include "opt_inet6.h" #endif -#endif #endif /* __FreeBSD__ || __NetBSD__ */ #include ==== //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.14 2008/01/07 09:46:39 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.15 2008/08/25 15:23:54 jhb Exp $"); #include #include @@ -82,23 +82,32 @@ { DEVICEID_82801DB, "Intel 82801DB watchdog timer", 4 }, { DEVICEID_82801DBM, "Intel 82801DBM watchdog timer", 4 }, { DEVICEID_82801E, "Intel 82801E watchdog timer", 5 }, - { DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer", 5 }, + { DEVICEID_82801EB, "Intel 82801EB watchdog timer", 5 }, + { DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer", 5 }, { DEVICEID_6300ESB, "Intel 6300ESB watchdog timer", 5 }, - { DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer", 6 }, + { DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer", 6 }, { DEVICEID_ICH6M, "Intel ICH6M watchdog timer", 6 }, { DEVICEID_ICH6W, "Intel ICH6W watchdog timer", 6 }, { DEVICEID_ICH7, "Intel ICH7 watchdog timer", 7 }, + { DEVICEID_ICH7DH, "Intel ICH7DH watchdog timer", 7 }, { DEVICEID_ICH7M, "Intel ICH7M watchdog timer", 7 }, { DEVICEID_ICH7MDH, "Intel ICH7MDH watchdog timer", 7 }, { DEVICEID_ICH8, "Intel ICH8 watchdog timer", 8 }, { DEVICEID_ICH8DH, "Intel ICH8DH watchdog timer", 8 }, { DEVICEID_ICH8DO, "Intel ICH8DO watchdog timer", 8 }, - { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 }, + { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 }, + { DEVICEID_ICH8ME, "Intel ICH8M-E watchdog timer", 8 }, { DEVICEID_63XXESB, "Intel 63XXESB watchdog timer", 8 }, { DEVICEID_ICH9, "Intel ICH9 watchdog timer", 9 }, - { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 }, { DEVICEID_ICH9DH, "Intel ICH9DH watchdog timer", 9 }, { DEVICEID_ICH9DO, "Intel ICH9DO watchdog timer", 9 }, + { DEVICEID_ICH9M, "Intel ICH9M watchdog timer", 9 }, + { DEVICEID_ICH9ME, "Intel ICH9M-E watchdog timer", 9 }, + { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 }, + { DEVICEID_ICH10, "Intel ICH10 watchdog timer", 10 }, + { DEVICEID_ICH10D, "Intel ICH10D watchdog timer", 10 }, + { DEVICEID_ICH10DO, "Intel ICH10DO watchdog timer", 10 }, + { DEVICEID_ICH10R, "Intel ICH10R watchdog timer", 10 }, { 0, NULL, 0 }, }; ==== //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.h#2 (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/dev/ichwd/ichwd.h,v 1.8 2008/01/07 09:46:39 des Exp $ + * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.9 2008/08/25 15:23:54 jhb Exp $ */ #ifndef _ICHWD_H_ @@ -73,6 +73,7 @@ #define DEVICEID_82801DB 0x24c0 #define DEVICEID_82801DBM 0x24cc #define DEVICEID_82801E 0x2450 +#define DEVICEID_82801EB 0x24dc #define DEVICEID_82801EBR 0x24d0 #define DEVICEID_6300ESB 0x25a1 #define DEVICEID_82801FBR 0x2640 @@ -80,16 +81,24 @@ #define DEVICEID_ICH6W 0x2642 #define DEVICEID_63XXESB 0x2670 #define DEVICEID_ICH7 0x27b8 +#define DEVICEID_ICH7DH 0x27b0 #define DEVICEID_ICH7M 0x27b9 #define DEVICEID_ICH7MDH 0x27bd #define DEVICEID_ICH8 0x2810 #define DEVICEID_ICH8DH 0x2812 #define DEVICEID_ICH8DO 0x2814 #define DEVICEID_ICH8M 0x2815 +#define DEVICEID_ICH8ME 0x2811 #define DEVICEID_ICH9 0x2918 -#define DEVICEID_ICH9R 0x2916 #define DEVICEID_ICH9DH 0x2912 #define DEVICEID_ICH9DO 0x2914 +#define DEVICEID_ICH9M 0x2919 +#define DEVICEID_ICH9ME 0x2917 +#define DEVICEID_ICH9R 0x2916 +#define DEVICEID_ICH10 0x3a18 +#define DEVICEID_ICH10D 0x3a1a +#define DEVICEID_ICH10DO 0x3a14 +#define DEVICEID_ICH10R 0x3a16 /* ICH LPC Interface Bridge Registers (ICH5 and older) */ #define ICH_GEN_STA 0xd4 ==== //depot/projects/mpsafetty/sys/dev/lmc/if_lmc.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.33 2008/07/05 16:39:24 rwatson Exp $ + * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.34 2008/08/24 18:27:19 bz Exp $ * * Copyright (c) 2002-2004 David Boggs. * All rights reserved. @@ -80,6 +80,12 @@ # ifdef HAVE_KERNEL_OPTION_HEADERS # include "opt_device_polling.h" /* DEVICE_POLLING */ # endif +# ifndef INET +# define INET 0 +# endif +# ifndef INET6 +# define INET6 0 +# endif # ifndef NETGRAPH # define NETGRAPH 0 # endif ==== //depot/projects/mpsafetty/sys/dev/pccard/pccard_cis_quirks.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.17 2007/10/12 08:26:15 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.18 2008/08/25 04:59:43 imp Exp $"); #define PCCARDDEBUG @@ -137,6 +137,27 @@ 0, /* maxtwins */ }; +static struct pccard_function pccard_3c1_func0 = { + 0, /* function number */ + PCCARD_FUNCTION_NETWORK, + 0x05, /* last cfe number */ + 0x400, /* ccr_base */ + 0x267, /* ccr_mask */ +}; + +static struct pccard_config_entry pccard_3c1_func0_cfe0 = { + 0x05, /* cfe number */ + PCCARD_CFE_IO8 | PCCARD_CFE_IO16 | PCCARD_CFE_IRQLEVEL, + PCCARD_IFTYPE_IO, + 1, /* num_iospace */ + 5, /* iomask */ + { { 0x0010, 0 } }, /* iospace */ + 0xffff, /* irqmask */ + 0, /* num_memspace */ + { }, /* memspace */ + 0, /* maxtwins */ +}; + static struct pccard_function pccard_sveclancard_func0 = { 0, /* function number */ PCCARD_FUNCTION_NETWORK, @@ -228,6 +249,8 @@ { PCMCIA_VENDOR_SIERRA, PCMCIA_PRODUCT_SIERRA_AC710, PCMCIA_CIS_INVALID, &pccard_sierra_a555_func1, &pccard_sierra_a555_func1_cfe0 }, + { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C1, PCMCIA_CIS_INVALID, + &pccard_3c1_func0, &pccard_3c1_func0_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD, &pccard_sveclancard_func0, &pccard_sveclancard_func0_cfe0 }, { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E, ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.461 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.462 2008/08/24 19:50:57 ed Exp $"); #include "opt_compat.h" #include "opt_syscons.h" @@ -103,7 +103,6 @@ static int sc_console_unit = -1; static int sc_saver_keyb_only = 1; static scr_stat *sc_console; -static struct tty *sc_console_tty; static struct consdev *sc_consptr; static void *kernel_console_ts; static scr_stat main_console; @@ -362,6 +361,7 @@ video_info_t info; #endif int vc; + struct tty *tp; flags &= ~SC_KERNEL_CONSOLE; @@ -457,8 +457,8 @@ */ } - sc_console_tty = sc_alloc_tty(0, "consolectl"); - SC_STAT(sc_console_tty) = sc_console; + tp = sc_alloc_tty(0, "consolectl"); + SC_STAT(tp) = sc_console; return 0; } @@ -639,13 +639,8 @@ while ((c = scgetc(sc, SCGETC_NONBLOCK)) != NOKEY) { cur_tty = SC_DEV(sc, sc->cur_scp->index); - if (!tty_opened(cur_tty)) { - cur_tty = sc_console_tty; - if (cur_tty == NULL) - continue; - if (!tty_opened(cur_tty)) - continue; - } + if (!tty_opened(cur_tty)) + continue; if ((*sc->cur_scp->tsw->te_input)(sc->cur_scp, c, cur_tty)) continue; @@ -1473,7 +1468,7 @@ return; /* initialize required fields */ - sprintf(cp->cn_name, "consolectl"); + strcpy(cp->cn_name, "ttyv0"); } static void ==== //depot/projects/mpsafetty/sys/dev/uart/uart.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/dev/uart/uart.h,v 1.8 2008/03/12 19:09:20 sam Exp $ + * $FreeBSD: src/sys/dev/uart/uart.h,v 1.9 2008/08/25 14:45:24 nyan Exp $ */ #ifndef _DEV_UART_H_ @@ -69,6 +69,10 @@ extern struct uart_class uart_sab82532_class __attribute__((weak)); extern struct uart_class uart_z8530_class __attribute__((weak)); +#ifdef PC98 +struct uart_class *uart_pc98_getdev(u_long port); +#endif + /* * Device flags. */ ==== //depot/projects/mpsafetty/sys/dev/uart/uart_bus_isa.c#2 (text+ko) ==== @@ -1,5 +1,8 @@ /*- - * Copyright (c) 2001 M. Warner Losh. All rights reserved. + * Copyright (c) 2008 TAKAHASHI Yoshihiro + * Copyright (c) 2008 Marcel Moolenaar + * Copyright (c) 2001 M. Warner Losh + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.6 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.7 2008/08/25 14:45:24 nyan Exp $"); #include #include @@ -141,6 +144,18 @@ {0x0300695c, NULL}, /* WCI0003 - Fax/Voice/Modem/Speakphone/Asvd */ {0x01a0896a, NULL}, /* ZTIA001 - Zoom Internal V90 Faxmodem */ {0x61f7896a, NULL}, /* ZTIF761 - Zoom ComStar 33.6 */ + /* The following are found in PC98 hardware. */ + {0x4180a3b8, NULL}, /* NEC8041 - PC-9821CB-B04 */ + {0x0181a3b8, NULL}, /* NEC8101 - PC-9821CB2-B04 */ + {0x5181a3b8, NULL}, /* NEC8151 - Internal FAX/Modem for Cx3, Cb3 */ + {0x9181a3b8, NULL}, /* NEC8191 - PC-9801-120 */ + {0xe181a3b8, NULL}, /* NEC81E1 - Internal FAX/Modem */ + {0x1182a3b8, NULL}, /* NEC8211 - PC-9801-123 */ + {0x3182a3b8, NULL}, /* NEC8231 - Internal FAX/Modem (Voice) */ + {0x4182a3b8, NULL}, /* NEC8241 - PC-9821NR-B05 */ + {0x5182a3b8, NULL}, /* NEC8251 - Internel FAX/Modem */ + {0x7182a3b8, NULL}, /* NEC8271 - PC-9801-125 */ + {0x11802fbf, NULL}, /* OYO8011 - Internal FAX/Modem (Ring) */ {0} }; @@ -153,14 +168,21 @@ parent = device_get_parent(dev); sc = device_get_softc(dev); + /* Check PnP IDs */ + if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == ENXIO) + return (ENXIO); + /* Probe PnP _and_ non-PnP ns8250 here. */ - if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) != ENXIO) { +#ifdef PC98 + if (isa_get_logicalid(dev)) sc->sc_class = &uart_ns8250_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); - } - - /* Add checks for non-ns8250 IDs here. */ - return (ENXIO); + else + sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev, + SYS_RES_IOPORT, 0)); +#else + sc->sc_class = &uart_ns8250_class; +#endif + return (uart_bus_probe(dev, 0, 0, 0, 0)); } DRIVER_MODULE(uart, isa, uart_isa_driver, uart_devclass, 0, 0); ==== //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_pc98.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2008 TAKAHASHI Yoshihiro * Copyright (c) 2003 M. Warner Losh, Marcel Moolenaar * All rights reserved. * @@ -25,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.17 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.18 2008/08/25 14:45:24 nyan Exp $"); #include #include @@ -39,18 +40,41 @@ bus_space_tag_t uart_bus_space_io = I386_BUS_SPACE_IO; bus_space_tag_t uart_bus_space_mem = I386_BUS_SPACE_MEM; +static struct { + u_long iobase; + struct uart_class *class; +} uart_pc98_devs[] = { + { 0x238, &uart_ns8250_class }, + { 0, NULL } +}; + +struct uart_class * +uart_pc98_getdev(u_long port) +{ + int i; + + for (i = 0; uart_pc98_devs[i].iobase; i++) { + if (port == uart_pc98_devs[i].iobase) + return (uart_pc98_devs[i].class); + } + return (NULL); +} + int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { - return (0); /* XXX */ + if (i386_memio_compare(b1->bst, b1->bsh, b2->bst, b2->bsh) == 0) + return (1); + + return (0); } int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { struct uart_class *class; - unsigned int i, ivar, flags; + unsigned int i, ivar; class = &uart_ns8250_class; if (class == NULL) @@ -63,16 +87,14 @@ /* * There is a serial port on all pc98 hardware. It is 8251 or * an enhance version of that. Some pc98 have the second serial - * port which is 16550A compatible. However, for the sio driver, - * flags selected which type of uart was in the sytem. We use - * something similar to sort things out. + * port which is 16550A compatible. */ - for (i = 0; i < 1; i++) { - if (resource_int_value("uart", i, "flags", &flags)) + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) continue; - if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(flags)) + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) continue; - if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(flags)) + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) continue; /* * We have a possible device. Make sure it's enabled and @@ -85,6 +107,10 @@ ivar == 0) continue; + class = uart_pc98_getdev(ivar); + if (class == NULL) + continue; + di->ops = uart_getops(class); di->bas.chan = 0; di->bas.bst = uart_bus_space_io; ==== //depot/projects/mpsafetty/sys/dev/usb/uipaq.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.12 2008/08/02 12:15:18 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.15 2008/08/25 02:42:13 imp Exp $"); #include #include @@ -119,16 +119,465 @@ u_int16_t uv_flags; }; +/* + * Much of this list is generated from lists of other drivers that support + * the same hardware. Numeric values are used where no usbdevs entries + * exist. + */ static const struct uipaq_type uipaq_devs[] = { + {{ 0x0104, 0x00be }, 0}, /* Socket USB Sync */ + {{ 0x04ad, 0x0301 }, 0}, /* USB Sync 0301 */ + {{ 0x04ad, 0x0302 }, 0}, /* USB Sync 0302 */ + {{ 0x04ad, 0x0303 }, 0}, /* USB Sync 0303 */ + {{ 0x04ad, 0x0306 }, 0}, /* GPS Pocket PC USB Sync */ + {{ 0x0536, 0x01a0 }, 0}, /* HHP PDT */ + {{ 0x067e, 0x1001 }, 0}, /* Intermec Mobile Computer */ + {{ 0x094b, 0x0001 }, 0}, /* Linkup Systems USB Sync */ + {{ 0x0960, 0x0065 }, 0}, /* BCOM USB Sync 0065 */ + {{ 0x0960, 0x0066 }, 0}, /* BCOM USB Sync 0066 */ + {{ 0x0960, 0x0067 }, 0}, /* BCOM USB Sync 0067 */ + {{ 0x0961, 0x0010 }, 0}, /* Portatec USB Sync */ + {{ 0x099e, 0x0052 }, 0}, /* Trimble GeoExplorer */ + {{ 0x099e, 0x4000 }, 0}, /* TDS Data Collector */ + {{ 0x0c44, 0x03a2 }, 0}, /* Motorola iDEN Smartphone */ + {{ 0x0c8e, 0x6000 }, 0}, /* Cesscom Luxian Series */ + {{ 0x0cad, 0x9001 }, 0}, /* Motorola PowerPad Pocket PCDevice */ + {{ 0x0f4e, 0x0200 }, 0}, /* Freedom Scientific USB Sync */ + {{ 0x0f98, 0x0201 }, 0}, /* Cyberbank USB Sync */ + {{ 0x0fb8, 0x3001 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x3002 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x3003 }, 0}, /* Wistron USB Sync */ + {{ 0x0fb8, 0x4001 }, 0}, /* Wistron USB Sync */ + {{ 0x1066, 0x00ce }, 0}, /* E-TEN USB Sync */ + {{ 0x1066, 0x0300 }, 0}, /* E-TEN P3XX Pocket PC */ + {{ 0x1066, 0x0500 }, 0}, /* E-TEN P5XX Pocket PC */ + {{ 0x1066, 0x0600 }, 0}, /* E-TEN P6XX Pocket PC */ + {{ 0x1066, 0x0700 }, 0}, /* E-TEN P7XX Pocket PC */ + {{ 0x1114, 0x0001 }, 0}, /* Psion Teklogix Sync 753x */ + {{ 0x1114, 0x0004 }, 0}, /* Psion Teklogix Sync netBookPro */ + {{ 0x1114, 0x0006 }, 0}, /* Psion Teklogix Sync 7525 */ + {{ 0x1182, 0x1388 }, 0}, /* VES USB Sync */ + {{ 0x11d9, 0x1002 }, 0}, /* Rugged Pocket PC 2003 */ + {{ 0x11d9, 0x1003 }, 0}, /* Rugged Pocket PC 2003 */ + {{ 0x1231, 0xce01 }, 0}, /* USB Sync 03 */ + {{ 0x1231, 0xce02 }, 0}, /* USB Sync 03 */ + {{ 0x3340, 0x011c }, 0}, /* Mio DigiWalker PPC StrongARM */ + {{ 0x3340, 0x0326 }, 0}, /* Mio DigiWalker 338 */ + {{ 0x3340, 0x0426 }, 0}, /* Mio DigiWalker 338 */ + {{ 0x3340, 0x043a }, 0}, /* Mio DigiWalker USB Sync */ + {{ 0x3340, 0x051c }, 0}, /* MiTAC USB Sync 528 */ + {{ 0x3340, 0x053a }, 0}, /* Mio DigiWalker SmartPhone USB Sync */ + {{ 0x3340, 0x071c }, 0}, /* MiTAC USB Sync */ + {{ 0x3340, 0x0b1c }, 0}, /* Generic PPC StrongARM */ + {{ 0x3340, 0x0e3a }, 0}, /* Generic PPC USB Sync */ + {{ 0x3340, 0x0f1c }, 0}, /* Itautec USB Sync */ + {{ 0x3340, 0x0f3a }, 0}, /* Generic SmartPhone USB Sync */ + {{ 0x3340, 0x1326 }, 0}, /* Itautec USB Sync */ + {{ 0x3340, 0x191c }, 0}, /* YAKUMO USB Sync */ + {{ 0x3340, 0x2326 }, 0}, /* Vobis USB Sync */ + {{ 0x3340, 0x3326 }, 0}, /* MEDION Winodws Moble USB Sync */ + {{ 0x3708, 0x20ce }, 0}, /* Legend USB Sync */ + {{ 0x3708, 0x21ce }, 0}, /* Lenovo USB Sync */ + {{ 0x4113, 0x0210 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0211 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0400 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4113, 0x0410 }, 0}, /* Mobile Media Technology USB Sync */ + {{ 0x4505, 0x0010 }, 0}, /* Smartphone */ + {{ 0x5e04, 0xce00 }, 0}, /* SAGEM Wireless Assistant */ + {{ USB_VENDOR_ACER, 0x1631 }, 0}, /* c10 Series */ + {{ USB_VENDOR_ACER, 0x1632 }, 0}, /* c20 Series */ + {{ USB_VENDOR_ACER, 0x16e1 }, 0}, /* Acer n10 Handheld USB Sync */ + {{ USB_VENDOR_ACER, 0x16e2 }, 0}, /* Acer n20 Handheld USB Sync */ + {{ USB_VENDOR_ACER, 0x16e3 }, 0}, /* Acer n30 Handheld USB Sync */ + {{ USB_VENDOR_ASUS, 0x4200 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x4201 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x4202 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x9200 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, 0x9202 }, 0}, /* ASUS USB Sync */ + {{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_P535 }, 0}, + {{ USB_VENDOR_CASIO, 0x2001 }, 0}, /* CASIO USB Sync 2001 */ + {{ USB_VENDOR_CASIO, 0x2003 }, 0}, /* CASIO USB Sync 2003 */ + {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0}, + {{ USB_VENDOR_COMPAL, 0x0531 }, 0}, /* MyGuide 7000 XL USB Sync */ + {{ USB_VENDOR_COMPAQ, 0x0032 }, 0}, /* Compaq iPAQ USB Sync */ + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0}, + {{ USB_VENDOR_DELL, 0x4001 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4002 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4003 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4004 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4005 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4006 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4007 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4008 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_DELL, 0x4009 }, 0}, /* Dell Axim USB Sync */ + {{ USB_VENDOR_FSC, 0x1001 }, 0}, /* Fujitsu Siemens Computers USB Sync */ + {{ USB_VENDOR_FUJITSU, 0x1058 }, 0}, /* FUJITSU USB Sync */ + {{ USB_VENDOR_FUJITSU, 0x1079 }, 0}, /* FUJITSU USB Sync */ + {{ USB_VENDOR_GIGASET, 0x0601 }, 0}, /* Askey USB Sync */ + {{ USB_VENDOR_HITACHI, 0x0014 }, 0}, /* Hitachi USB Sync */ + {{ USB_VENDOR_HP, 0x1216 }, 0}, /* HP USB Sync 1612 */ + {{ USB_VENDOR_HP, 0x2016 }, 0}, /* HP USB Sync 1620 */ + {{ USB_VENDOR_HP, 0x2116 }, 0}, /* HP USB Sync 1621 */ + {{ USB_VENDOR_HP, 0x2216 }, 0}, /* HP USB Sync 1622 */ + {{ USB_VENDOR_HP, 0x3016 }, 0}, /* HP USB Sync 1630 */ + {{ USB_VENDOR_HP, 0x3116 }, 0}, /* HP USB Sync 1631 */ + {{ USB_VENDOR_HP, 0x3216 }, 0}, /* HP USB Sync 1632 */ + {{ USB_VENDOR_HP, 0x4016 }, 0}, /* HP USB Sync 1640 */ + {{ USB_VENDOR_HP, 0x4116 }, 0}, /* HP USB Sync 1641 */ + {{ USB_VENDOR_HP, 0x4216 }, 0}, /* HP USB Sync 1642 */ + {{ USB_VENDOR_HP, 0x5016 }, 0}, /* HP USB Sync 1650 */ + {{ USB_VENDOR_HP, 0x5116 }, 0}, /* HP USB Sync 1651 */ + {{ USB_VENDOR_HP, 0x5216 }, 0}, /* HP USB Sync 1652 */ {{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0}, - {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0}, + {{ USB_VENDOR_HTC, 0x00cf }, 0}, /* HTC USB Modem */ + {{ USB_VENDOR_HTC, 0x0a01 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a02 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a03 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a04 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a05 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a06 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a07 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a08 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a09 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0a }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0b }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0c }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0d }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0e }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a0f }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a10 }, 0}, /* PocketPC USB Sync */ + {{ USB_VENDOR_HTC, 0x0a11 }, 0}, /* PocketPC USB Sync */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 26 06:18:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51696106566C; Tue, 26 Aug 2008 06:18:41 +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 1679B106567A for ; Tue, 26 Aug 2008 06:18:41 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F39C28FC18 for ; Tue, 26 Aug 2008 06:18:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q6IeR5084617 for ; Tue, 26 Aug 2008 06:18:40 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q6IeaP084615 for perforce@freebsd.org; Tue, 26 Aug 2008 06:18:40 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 26 Aug 2008 06:18:40 GMT Message-Id: <200808260618.m7Q6IeaP084615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 148494 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, 26 Aug 2008 06:18:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=148494 Change 148494 by ed@ed_dull on 2008/08/26 06:18:38 We must check for zero-length queues when actually destroying the TTY, not when a close() is being processed. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#32 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#32 (text+ko) ==== @@ -895,6 +895,10 @@ tty_list_count--; sx_xunlock(&tty_list_sx); + /* Make sure we haven't leaked buffers. */ + MPASS(ttyinq_getsize(&tp->t_inq) == 0); + MPASS(ttyoutq_getsize(&tp->t_outq) == 0); + knlist_destroy(&tp->t_inpoll.si_note); knlist_destroy(&tp->t_outpoll.si_note); @@ -923,9 +927,6 @@ return; } - MPASS(ttyinq_getsize(&tp->t_inq) == 0); - MPASS(ttyoutq_getsize(&tp->t_outq) == 0); - /* TTY can be deallocated. */ dev = tp->t_dev; tp->t_dev = NULL; From owner-p4-projects@FreeBSD.ORG Tue Aug 26 07:22:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 557201065687; Tue, 26 Aug 2008 07:22: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 C52E61065694 for ; Tue, 26 Aug 2008 07:22:45 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B27EA8FC0C for ; Tue, 26 Aug 2008 07:22:45 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q7Mjng091760 for ; Tue, 26 Aug 2008 07:22:45 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q7Mjfr091758 for perforce@freebsd.org; Tue, 26 Aug 2008 07:22:45 GMT (envelope-from remko@freebsd.org) Date: Tue, 26 Aug 2008 07:22:45 GMT Message-Id: <200808260722.m7Q7Mjfr091758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 148495 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, 26 Aug 2008 07:22:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=148495 Change 148495 by remko@remko_nakur on 2008/08/26 07:22:38 import Rene's latest work in progress. Going well! Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.410 (in progress) + %SRCID% 1.412 (in progress) --> @@ -191,8 +191,8 @@ subnet - &os; zal ook subnetroutes voor het lokale subnet toevoegen ( - 10.20.30.255 is het + &os; zal ook subnetroutes voor het lokale subnet toevoegen + (10.20.30.255 is het broadcast-adres voor het subnet 10.20.30, en example.com is de @@ -209,8 +209,8 @@ De regel met host1 verwijst naar deze host, het kent deze door het Ethernetadres. Aangezien het de - zendende host is, weet &os; dat het de teruglus-interface ( - lo0) moet gebruiken, in plaats van het + zendende host is, weet &os; dat het de teruglus-interface + (lo0) moet gebruiken, in plaats van het over de Ethernet-interface te verzenden. De twee regels met host2 geven een @@ -879,8 +879,8 @@ if_ath_load="YES" Het stuurprogramma voor Atheros is opgedeeld in drie - verschillende delen: het eigenlijke stuurprogramma ( - &man.ath.4;), de ondersteuningslaag voor de hardware die + verschillende delen: het eigenlijke stuurprogramma + (&man.ath.4;), de ondersteuningslaag voor de hardware die chip-specifieke functies afhandelt (&man.ath.hal.4;), en een algoritme om de snelheid om frames te verzenden te kiezen uit een reeks mogelijke waarden (hier ath_rate_sample). Indien @@ -910,23 +910,32 @@ Nadat het apparaatstuurprogramma is ingesteld is het ook nodig om de ondersteuning voor 802.11-netwerken waarvan het stuurprogramma gebruik maakt in te stellen. Voor het - stuurprogramma &man.ath.4; is dit minimaal de module - &man.wlan.4;; deze module wordt automatisch geladen met het - stuurprogramma voor draadloze apparaten. Daarvoor zijn ook de - modules nodig die cryptografische ondersteuning implementeren - voor de te gebruiken veiligheidsprotocollen. Het is de - bedoeling dat ze dynamisch door de module &man.wlan.4; worden - geladen maar momenteel dienen ze handmatig ingesteld te - worden. De volgende modules zijn beschikbaar: - &man.wlan.wep.4;, &man.wlan.ccmp.4;, en &man.wlan.tkip.4;. - Zowel de stuurprogramma's &man.wlan.ccmp.4; en - &man.wlan.tkip.4; zijn alleen nodig indien het - veiligheidsprotocol WPA en/of 802.11i gebruikt wordt. Indien - het netwerk geheel open dient te zijn (i.e. geen versleuteling - ) is zelfs de ondersteuning van &man.wlan.wep.4; niet nodig. - Om deze modules tijdens het opstarten te laden, dienen de - volgende regels aan /boot/loader.conf - toegevoegd te worden: + stuurprogramma &man.ath.4; zijn dit minimaal de modules + &man.wlan.4;, wlan_scan_ap en + wlan_scan_sta; de module &man.wlan.4; wordt + automatisch geladen met het stuurprogramma voor draadloze + apparaten, de overige modeules dienen tijdens het opstarten + geladen te worden via het bestand + /boot/loader.conf: + + wlan_scan_ap_load="YES" +wlan_scan_sta_load="YES" + + Daarvoor zijn ook de modules nodig die cryptografische + ondersteuning implementeren voor de te gebruiken + veiligheidsprotocollen. Het is de bedoeling dat ze dynamisch + door de module &man.wlan.4; worden geladen maar momenteel + dienen ze handmatig ingesteld te worden. De volgende modules + zijn beschikbaar: &man.wlan.wep.4;, &man.wlan.ccmp.4;, en + &man.wlan.tkip.4;. Zowel de stuurprogramma's + &man.wlan.ccmp.4; en &man.wlan.tkip.4; zijn alleen nodig + indien het veiligheidsprotocol WPA en/of 802.11i gebruikt + wordt. Indien het netwerk geheel open dient te zijn (i.e. + geen versleuteling) is zelfs de ondersteuning van + &man.wlan.wep.4; niet nodig. Om deze modules tijdens het + opstarten te laden, dienen de volgende regels aan + /boot/loader.conf toegevoegd te worden: + wlan_wep_load="YES" wlan_ccmp_load="YES" @@ -950,6 +959,8 @@ device ath_hal # Atheros Hardware Access Layer device ath_rate_sample # John Bicket's SampleRate stuuralgoritme. device wlan # 802.11 ondersteuning (vereist) +device wlan_scan_ap # 802.11 AP-modus scannen +device wlan_scan_sta # 802.11 STA-modus scannen device wlan_wep # WEP crypto ondersteuning voor 802.11 apparaten device wlan_ccmp # AES-CCMP crypto ondersteuning voor 802.11 apparaten device wlan_tkip # TKIP en Michael crypto ondersteuning voor 802.11 apparaten @@ -1252,7 +1263,7 @@ ifconfig_ath0="ssid uw_ssid_hier inet 192.168.1.100 netmask 255.255.255.0" - + WPA @@ -1554,8 +1565,8 @@ WPA met EAP-TTLS Bij EAP-TLS hebben zowel de authenticatieserver als de - cliënt een certificaat nodig, met EAP-TTLS ( - EAP-Tunneled Transport Layer Security) is een + cliënt een certificaat nodig, met EAP-TTLS + (EAP-Tunneled Transport Layer Security) is een cliëntcertificaat optioneel. Deze methode komt in de buurt van wat sommige beveiligde websites doen, waar de webserver een veilige SSL-tunnel kan aanmaken zelfs als de @@ -1765,7 +1776,10 @@ WEP-sleutel zal worden gebruikt tijdens het verzenden. Hier wordt de derde sleutel gebruikt. Dit dient overeen te komen met de instelling in het toegangspunt. - + Indien onbekend is welke sleutel door het toegangspunt + wordt gebruikt, dient geprobeerd te worden om + 1 (i.e. de eerste sleutel) voor deze + waarde te gebruiken. @@ -2164,8 +2178,8 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS De cliëntmachine heeft het toegangspunt gevonden en - kan ermee geassocieerd worden door de juiste parameters ( - sleutel, enz.) te gebruiken, zie voor meer details. @@ -2273,8 +2287,8 @@ van seriële lijnen, en meer. De Bluetooth stack is in &os; geïmplementeerd door - gebruik te maken van het Netgraph-raamwerk (zie &man.netgraph.4; - ). Een rijke variëteit van Bluetooth USB-dongles wordt + gebruik te maken van het Netgraph-raamwerk (zie + &man.netgraph.4;). Veel van de Bluetooth USB-dongles worden ondersteund door het stuurprogramma &man.ng.ubt.4;. Apparaten gebaseerd op de Broadcom BCM2033 chip worden ondersteund door de stuurprogramma's &man.ubtbcmfw.4; en &man.ng.ubt.4;. De 3Com @@ -2899,8 +2913,8 @@ - Steve - Peterson + Andrew + Thompson Geschreven door @@ -2915,13 +2929,14 @@ bridge - Soms is het handig om één fysiek netwerk ( - zoals een Ethernet-segment) in twee gescheiden netwerksegmenten + Soms is het handig om één fysiek netwerk + (zoals een Ethernet-segment) in twee gescheiden netwerksegmenten te verdelen zonder de noodzaak om een IP-subnet aan te maken en een router te gebruiken om de segmenten met elkaar te verbinden. Een apparaat dat twee netwerken op deze manier met elkaar - verbind wordt een bridge (brug) genoemd. Een - &os;-systeem met twee netwerkkaarten kan als bridge dienen. + verbindt wordt een bridge (brug) genoemd. Een + &os;-systeem met twee netwerkkaarten kan als bridge dienen. + De bridge werkt door de adressen van de MAC-laag (Ethernet-adressen) van de apparaten op elke netwerkinterface @@ -2936,32 +2951,21 @@ Situaties waarin bridging juist is - Er zijn vandaag de dag twee situaties waarin een bridge + Er zijn vandaag de dag veel situaties waarin een bridge gebruikt wordt. - Veel verkeer op een segment + Netwerken verbinden - De eerste situatie doet zich voor wanneer het fysieke - netwerksegment overbelast is met verkeer, en wanneer het niet - gewenst is om het netwerk in subnetten onder te verdelen en - de subnetten met een router te verbinden. - - Beschouw het voorbeeld van een krant waarbij de redactie- - en productie-afdelingen op het zelfde subnetwerk zitten. De - redactie-gebruikers gebruiken allemaal server A - voor bestandsdiensten, en de productie-gebruikers gebruiken - server B. Een Ethernet-netwerk verbindt alle - gebruikers, en hoge netwerkbelastingen zorgen voor - vertragingen. - - Indien de redactie-gebruikers op een netwerksegment gezet - konden worden en de productie-gebruikers op een andere, konden - de twee netwerksegmenten met een bridge verbonden worden. - Alleen het verkeer dat voor interfaces aan de - andere kant van het netwerk bedoeld is zou naar - het andere netwerk gezonden worden, waardoor de belasting op - elk netwerksegment verminderd zou worden. + Het basisgebruik van een bridge is het met elkaar + verbinden van twee of meer netwerksegmenten. Er zijn vele + redenen om een hostgebaseerde bridge te gebruiken in plaats + van simpele netwerkapparaten zoals kabelbeperkingen, + firewalling of het verbinden van pseudonetwerken zoals een + interface van een virtuële machine. Een bridge kan ook + een draadloze interface die in hostap-modus draait met een + bedraad netwerk verbinden en als een toegangspunt dienen. + @@ -2971,15 +2975,16 @@ NAT - De tweede gebruikelijke situatie dient zich voor wanneer - de functionaliteit van een firewall nodig is zonder network - address translation (NAT). + Een gebruikelijke situatie dient zich voor wanneer de + functionaliteit van een firewall nodig is zonder routing of + network address translation (NAT). Een voorbeeld is een klein bedrijf dat via DSL of ISDN met hun internetprovider verbonden is. Dit bedrijf heeft 13 wereldwijd bereikbare IP-adressen van de internetprovider en - 10 PC's op het netwerk. In deze situatie is een firewall die - op een router gebaseerd is lastig wegens subnet-problemen. + 10 PC's op hun netwerk. In deze situatie is een firewall die + op een router gebaseerd is lastig wegens subnet-problemen. + router @@ -2987,120 +2992,439 @@ ISDN - Een firewall die op een bridge gebaseerd is kan net na de - DSL- of ISDN-router ingesteld en geplaatst worden zonder dat - er IP-nummers veranderd hoeven te worden. + Een firewall die op een bridge gebaseerd is kan ingesteld + en net na de DSL- of ISDN-router geplaatst worden zonder dat + er problemen met IP-nummers optreden. + + + + Netwerktap + + Een bridge kan twee netwerksegmenten verbinden en kan + gebruikt worden om alle Ethernetframes die tussen dezen + voorbijkomen te inspecteren. Dit kan òfwel vanuit het + gebruik van &man.bpf.4;/&man.tcpdump.1; op de bridge-interface + òfwel door een kopie van alle frames naar een extra + interface (overspanpoort) te versturen. + + + + Laag 2 VPN + + Twee Ethernetnetwerken kunnen over een IP-verbinding + verbonden worden door de netwerken naar een EtherIP-tunnel te + bridgen of met een oplossing gebaseerd po &man.tap.4; zoals + OpenVPN. + + + + Laag 2 Redundancy + + Een netwerk kan met meerdere verbindingen verbonden worden + en het Spanning Tree Protocol gebruiken om overbodige paden te + blokkeren. Een Ethernetnetwerk kan alleen juist functioneren + indien er slechts één actief pad bestaat tussen + twee apparaten, Spanning Tree zal lussen detecteren en de + overbodige verbindingen in een geblokkeerde toestand zetten. + Indien een van de actieve verbindingen faalt zal het protocol + een andere boom berekenen en een van de geblokkeerde paden + weer activeren om de verbindingen naar alle punten in het + netwerk te herstellen. - Een bridge configureren + De kernel instellen + + Deze sectie behandelt de bridges geïmplementeerd met + &man.if.bridge.4;, een stuurprogramma dat bridges met netgraph + implementeert is ook beschikbaar, zie voor meer informatie de + hulppagina &man.ng.bridge.4;. + + Het bridge-stuurprogramma is een kernelmodule en zal + automatisch door &man.ifconfig.8; worden geladen wanneer er een + bridge-interface wordt aangemaakt. Het is mogelijk om de bridge + in de kernel te compileren door + device if_bridge aan het + kernelinstellingenbestand toe te voegen. + + Pakketfiltering kan met elk firewall-pakket worden gebruikt + dat via het raamwerk &man.pfil.9; aankoppelt. De firewall kan + als een module worden geladen of in de kernel worden + gecompileerd. + + De bridge kan als met &man.altq.4; of &man.dummynet.4; als + een verkeersregelaar worden gebruikt. + + + + De bridge inschakelen + + De bridge wordt aangemaakt door interfaces te klonen. Om + een bridge aan te maken wordt &man.ifconfig.8; gebruikt, indien + het bridge-stuurprogramma niet in de kernel aanwezig is zal het + automatisch worden geladen. + + &prompt.root; ifconfig bridge create +&prompt.root; ifconfig bridge0 +bridge0: flags=8802<BROADCAST,SIMPLEX,MULTICAST> metric 0 mtu 1500 + ether 96:3d:4b:f1:79:7a + id 00:00:00:00:00:00 priority 32768 hellotime 2 fwddelay 15 + maxage 20 holdcnt 6 proto rstp maxaddr 100 timeout 1200 + root id 00:00:00:00:00:00 priority 0 ifcost 0 port 0 + + Een bridge-interface is aangemaakt en er is automatisch een + random gegenereerd Ethernet-adres aan toegekend. De parameters + maxaddr en timeout bepalen + hoeveel MAC-adressen de bridge in de doorstuurtabel houdt en + hoeveel seconden voordat elke regel wordt verwijderd nadat het + voor het laatst gezien is. De andere parameters bepalen hoe + Spanning Tree werkt. + + Voeg de netwerk-interfaces die lid zijn aan de bridge toe. + Om de bridge pakketten te laten doorsturen dienen alle + lid-interfaces en de bridge actief te zijn: + + &prompt.root; ifconfig bridge0 addm fxp0 addm fxp1 up +&prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up + + De bridge stuurt nu Ethernet-frames door tussen + fxp0 en fxp1. + De overeenkomstige configuratie in + /etc/rc.conf zodat de bridge tijdens het + opstarten wordt aangemaakt is: + + cloned_interfaces="bridge0" +ifconfig_bridge0="addm fxp0 addm fxp1 up" +ifconfig_fxp0="up" +ifconfig_fxp1="up" + + Indien de bridge-gastheer een IP-adres nodig heeft dan is de + juiste plaats om dit in te stellen op de bridge-interface zelf + in plaats van op een van de lid-interfaces. Dit kan statisch of + via DHCP worden ingesteld: + + &prompt.root; ifconfig bridge0 inet 192.168.0.1/24 + + Het is ook mogelijk om een IPv6-adres aan een + bridge-interface toe te kennen. + + + + Firewalls gebruiken + + firewall + + Wanneer pakketten worden gefilterd, zullen gebridgede + pakketten het filter inbound op de vertrekkende interface + passeren, op de bridge-interface en outbound op de bestemde + interface. Elke stap kan uitgezet worden. Wanneer de richting + van het pakketverkeer belangrijk is, kan de firewall het beste + op de lid-interfaces draaien en niet op de bridge zelf. + + De bridge heeft verschillende aanpasbare instellingen voor + het doorlaten van non-IP- en ARP-pakketten, en een laag 2 + firewall met IPFW. Zie &man.if.bridge.4; voor meer informatie. + + + + + Opspannende boom + + Het bridge-stuurprogramma implementeert het Rapid Spanning + Tree Protocol (RSTP of 802.1w) met terugwaartse compatibiliteit + met het verouderde Spanning Tree Protocol (STP). Spanning Tree + wordt gebruikt om lussen in een netwerktopologie te detecteren + en verwijderen. RSTP biedt snellere convergentie naar een + opspannende boom dan het verouderde STP, het protocol wisselt + informatie met naburige switches uit om snel naar forwarding + over te gaan zonder lussen te creëren. + + De volgende tabel laat de ondersteunende werkwijzen zien: + + + + +
      - + +and the filter. +This allows the calling application to ensure that the +socket can be created. +If this is not called, +smfi_main() will do so implicitly. +
      Called WhenCalled only from program mainline, before calling -smfi_main().Called only from program mainline, +after calling smfi_setconn() and smfi_register(), +but before calling smfi_main(). +
      Effects smfi_opensocket attempts to create the socket specified previously by a call to smfi_setconn() which will be the interface between MTAs -and the filter. This allows the calling application to ensure that the -socket can be created. If this is not called, smfi_main() will -do so implicitly.
      @@ -58,7 +63,8 @@

    • The interface socket could not be created for any reason.
    • rmsocket was true, and either the socket could not be examined, or exists and could not be removed. -
    • smfi_setconn() has not been called. +
    • smfi_setconn() or smfi_register() + have not been called.
    Otherwise, it will return MI_SUCCESS
    - + +and the filter. +This allows the calling application to ensure that the +socket can be created. +If this is not called, +smfi_main() will do so implicitly. +
    Called WhenCalled only from program mainline, before calling -smfi_main().Called only from program mainline, +after calling smfi_setconn() and smfi_register(), +but before calling smfi_main(). +
    Effects smfi_opensocket attempts to create the socket specified previously by a call to smfi_setconn() which will be the interface between MTAs -and the filter. This allows the calling application to ensure that the -socket can be created. If this is not called, smfi_main() will -do so implicitly.
    @@ -58,7 +63,8 @@
  • The interface socket could not be created for any reason.
  • rmsocket was true, and either the socket could not be examined, or exists and could not be removed. -
  • smfi_setconn() has not been called. +
  • smfi_setconn() or smfi_register() + have not been called. Otherwise, it will return MI_SUCCESS