From owner-p4-projects@FreeBSD.ORG Sun Sep 3 03:34:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1984816A4E1; Sun, 3 Sep 2006 03:34:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E47D816A4DF for ; Sun, 3 Sep 2006 03:34:36 +0000 (UTC) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B1F843D45 for ; Sun, 3 Sep 2006 03:34:36 +0000 (GMT) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k833YaDZ025586 for ; Sun, 3 Sep 2006 03:34:36 GMT (envelope-from tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k833YU0k025581 for perforce@freebsd.org; Sun, 3 Sep 2006 03:34:30 GMT (envelope-from tyler@freebsd.org) Date: Sun, 3 Sep 2006 03:34:30 GMT Message-Id: <200609030334.k833YU0k025581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tyler@freebsd.org using -f From: "R. Tyler Ballance" To: Perforce Change Reviews Cc: Subject: PERFORCE change 105577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 03:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=105577 Change 105577 by tyler@orange on 2006/09/03 03:34:13 IFC to kill time while reading documentation Affected files ... .. //depot/projects/l4bsd/src/MAINTAINERS#3 integrate .. //depot/projects/l4bsd/src/UPDATING#5 integrate .. //depot/projects/l4bsd/src/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/builtins.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/c-common.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/c-common.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/combine.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config.gcc#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config.host#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config.in#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/l4bsd/src/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/l4bsd/src/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/config/x-linux#1 branch .. //depot/projects/l4bsd/src/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/l4bsd/src/contrib/gcc/configure#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/configure.ac#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/coverage.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/cse.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/expmed.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/flow.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/gcc.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/gcov.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/gcse.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/global.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/hooks.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/hooks.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/local-alloc.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/longlong.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/loop.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/md5.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/md5.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/mips-tdump.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/mips-tfile.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/mklibgcc.in#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/optabs.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/reg-stack.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/regrename.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/regs.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/rtl.h#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/sched-rgn.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/simplify-rtx.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/stmt.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/toplev.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/tree.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/unroll.c#2 integrate .. //depot/projects/l4bsd/src/contrib/gcc/version.c#2 integrate .. //depot/projects/l4bsd/src/contrib/libf2c/ChangeLog#2 integrate .. //depot/projects/l4bsd/src/contrib/libobjc/ChangeLog#2 integrate .. //depot/projects/l4bsd/src/contrib/libobjc/README#2 integrate .. //depot/projects/l4bsd/src/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/l4bsd/src/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/l4bsd/src/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/l4bsd/src/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/l4bsd/src/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/l4bsd/src/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/README#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/VERSION#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/bsm/audit.h#3 delete .. //depot/projects/l4bsd/src/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/l4bsd/src/contrib/openbsm/bsm/audit_kevents.h#3 delete .. //depot/projects/l4bsd/src/contrib/openbsm/bsm/audit_record.h#3 delete .. //depot/projects/l4bsd/src/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/configure#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/l4bsd/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/l4bsd/src/etc/Makefile#2 integrate .. //depot/projects/l4bsd/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/l4bsd/src/etc/freebsd-update.conf#1 branch .. //depot/projects/l4bsd/src/etc/hosts.allow#3 integrate .. //depot/projects/l4bsd/src/etc/inetd.conf#2 integrate .. //depot/projects/l4bsd/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/l4bsd/src/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/l4bsd/src/etc/periodic/weekly/120.clean-kvmdb#2 delete .. //depot/projects/l4bsd/src/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/l4bsd/src/etc/phones#2 integrate .. //depot/projects/l4bsd/src/etc/rc.d/powerd#2 integrate .. //depot/projects/l4bsd/src/etc/rc.initdiskless#3 integrate .. //depot/projects/l4bsd/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/l4bsd/src/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/l4bsd/src/lib/libbsm/Makefile#3 integrate .. //depot/projects/l4bsd/src/lib/libc/gen/tls.c#3 integrate .. //depot/projects/l4bsd/src/lib/libc/ia64/gen/_set_tp.c#2 integrate .. //depot/projects/l4bsd/src/lib/libc/powerpc/gen/_set_tp.c#2 integrate .. //depot/projects/l4bsd/src/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/l4bsd/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/l4bsd/src/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/l4bsd/src/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/l4bsd/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/l4bsd/src/lib/libsdp/sdp.h#3 integrate .. //depot/projects/l4bsd/src/lib/libsdp/util.c#3 integrate .. //depot/projects/l4bsd/src/lib/libthr/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_mutex_prioceiling.c#2 delete .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_mutex_protocol.c#2 delete .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_seterrno.c#2 delete .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_sigmask.c#2 delete .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/l4bsd/src/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/l4bsd/src/libexec/lukemftpd/nbsd_pidfile.h#1 branch .. //depot/projects/l4bsd/src/libexec/lukemftpd/pamize.h#2 delete .. //depot/projects/l4bsd/src/libexec/rtld-elf/ia64/reloc.c#2 integrate .. //depot/projects/l4bsd/src/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/l4bsd/src/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/l4bsd/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/l4bsd/src/libexec/save-entropy/save-entropy.sh#2 integrate .. //depot/projects/l4bsd/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/l4bsd/src/release/scripts/kernels-install.sh#2 integrate .. //depot/projects/l4bsd/src/release/scripts/lib32-install.sh#1 branch .. //depot/projects/l4bsd/src/release/scripts/proflibs-install.sh#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/audit.4#3 integrate .. //depot/projects/l4bsd/src/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/dummynet.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/gem.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/ipfirewall.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/ixgb.4#3 integrate .. //depot/projects/l4bsd/src/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/sio.4#3 integrate .. //depot/projects/l4bsd/src/share/man/man5/Makefile#2 integrate .. //depot/projects/l4bsd/src/share/man/man5/freebsd-update.conf.5#1 branch .. //depot/projects/l4bsd/src/share/man/man5/periodic.conf.5#2 integrate .. //depot/projects/l4bsd/src/share/man/man8/Makefile#2 integrate .. //depot/projects/l4bsd/src/share/man/man8/nanobsd.8#1 branch .. //depot/projects/l4bsd/src/share/man/man8/picobsd.8#2 integrate .. //depot/projects/l4bsd/src/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/l4bsd/src/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/l4bsd/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/bsm/audit.h#3 integrate .. //depot/projects/l4bsd/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/l4bsd/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/l4bsd/src/sys/bsm/audit_record.h#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/l4bsd/src/sys/conf/NOTES#6 integrate .. //depot/projects/l4bsd/src/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/l4bsd/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/l4bsd/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/l4bsd/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/l4bsd/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/l4bsd/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/l4bsd/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/l4bsd/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp.c#5 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/l4bsd/src/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/l4bsd/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/l4bsd/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/l4bsd/src/sys/kern/bus_if.m#3 integrate .. //depot/projects/l4bsd/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/l4bsd/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/l4bsd/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/l4bsd/src/sys/modules/Makefile#5 integrate .. //depot/projects/l4bsd/src/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/l4bsd/src/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/l4bsd/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/l4bsd/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/l4bsd/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/l4bsd/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/l4bsd/src/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/l4bsd/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/l4bsd/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/l4bsd/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/l4bsd/src/sys/sys/_bus_dma.h#1 branch .. //depot/projects/l4bsd/src/sys/sys/bus.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/bus_dma.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/msgbuf.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/param.h#4 integrate .. //depot/projects/l4bsd/src/sys/sys/sx.h#4 integrate .. //depot/projects/l4bsd/src/sys/sys/syscall.h#5 integrate .. //depot/projects/l4bsd/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/l4bsd/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/l4bsd/src/sys/sys/systm.h#4 integrate .. //depot/projects/l4bsd/src/sys/sys/umtx.h#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_page.h#4 integrate .. //depot/projects/l4bsd/src/tools/tools/ministat/ministat.c#2 integrate .. //depot/projects/l4bsd/src/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/less/lesspipe.sh#2 integrate .. //depot/projects/l4bsd/src/usr.bin/su/Makefile#2 integrate .. //depot/projects/l4bsd/src/usr.bin/su/su.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/NEWS#2 delete .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/biz22.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/biz31.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/courier.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/df.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/dn11.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/hayes.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/t3000.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/v3451.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/v831.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/libacu/ventel.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/Makefile#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/acu.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/acutab.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/cmds.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/cmdtab.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/cu.1#1 branch .. //depot/projects/l4bsd/src/usr.bin/tip/tip/cu.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/hunt.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/log.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/partab.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/pathnames.h#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/remote.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/tip.1#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/tip.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/tip.h#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/tipout.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/uucplock.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/value.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/tip/tip/vars.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/vgrind/vgrind.1#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/Makefile#4 integrate .. //depot/projects/l4bsd/src/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/eeprom/ofw_options.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/freebsd-update/Makefile#1 branch .. //depot/projects/l4bsd/src/usr.sbin/freebsd-update/freebsd-update.8#1 branch .. //depot/projects/l4bsd/src/usr.sbin/freebsd-update/freebsd-update.sh#1 branch .. //depot/projects/l4bsd/src/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/portsnap/portsnap/Makefile#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/l4bsd/src/usr.sbin/watchdogd/watchdog.8#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/watchdogd/watchdogd.8#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate Differences ... ==== //depot/projects/l4bsd/src/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.139 2006/07/11 06:09:54 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -118,6 +118,7 @@ linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. +freebsd-update cperciva Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/l4bsd/src/UPDATING#5 (text+ko) ==== @@ -44,6 +44,13 @@ the nve(4) driver. Please update your configuration accordingly. +20060514: + The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx + PCnet family of NICs has been removed. The new le(4) driver serves + as an equivalent but cross-platform replacement with the pcn(4) + driver still providing performance-optimized support for the subset + of AMD Am79C971 PCnet-FAST and greater chips as before. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -603,4 +610,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ +$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $ ==== //depot/projects/l4bsd/src/contrib/gcc/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,822 @@ +2006-04-25 Nick Clifton + + * config/m32r/m32r.c (gen_compare): Fix reg/smallconst equal code, + the patch for which was accidentally omitted from the previous + commit. + +2006-04-04 Kazuhiro Inaoka + + PR target/26775 + PR target/26776 + * config/m32r/m32r.c (m32r_output_function_epilogue): Case for + a large stack frame at epilogue. Use fp to recover a stack + pointer for alloca function at epilogue. + + PR target/36276 + * config/m32r/m32r.c (gen_compare): Removed a rule addsi3 codes + to avoid a miss optimizing at simplify_relational_operation(). + * config/m32r/m32r.md (seq): Ditto. Changed reg_or_eq_int16_operand + to reg_or_uint16_operand because seq_insn has not used addsi3 already. + (seq_insn): Ditto. Removed operand check mode "P". Changed + reg_or_eq_int16_operand to reg_or_uint16_operand. + +2006-03-05 Release Manager + + * GCC 3.4.6 released. + +2006-03-01 Gabriel Dos Reis + + Backport + 2005-11-03 James E Wilson + + PR preprocessor/24202 + * cppfiles.c (_cpp_pop_file_buffer): Set buffer_valid to false. + +2006-03-01 Alan Modra + + PR target/21616 + Revert most of 2004-03-10 changes, apply mainline 2005-01-07. + * config/rs6000/rs6000.c (invalid_gpr_mem): Delete. + (base_reg_operand): Delete. + (legitimate_offset_address_p): Revert 2004-03-10 changes. + (secondary_reload_class): Likewise. + (rs6000_legitimize_reload_address): Convert non-word aligned + offset address using ld/std into indirect address. + * config/rs6000/rs6000.h (SECONDARY_RELOAD_CLASS): Define. + (SECONDARY_INPUT_RELOAD_CLASS, SECONDARY_OUTPUT_RELOAD_CLASS): Delete. + (PREDICATE_CODES): Delete invalid_gpr_mem and base_reg_operand. + * config/rs6000/rs6000-protos.h (secondary_reload_class): Update. + * config/rs6000/rs6000.md (movdf_hardfloat64): Remove m->b + alternative and split. + (movdi_internal64): Likewise. + (reload_outdf, reload_indf, reload_outdi, reload_indi): Delete. + +2006-02-28 Gabriel Dos Reis + + Backport + 2004-04-28 Serge Belyshev <1319@bot.ru> + + PR 14944 + * coverage.c (read_counts_file): Fix usage of warning () call. + * pretty-print.c (pp_base_format_text): Fix typo in the comment. + +2006-02-18 Olivier Hainque + + PR ada/13408 + * pa.h (WIDEST_HARDWARE_FP_SIZE): Define. + +2006-02-13 Kaveh R. Ghazi + + Backport: + 2006-02-01 Steve Ellcey + + PR middle-end/24901 + * fold-const.c (fold_checksum_tree): Change type of buf. + +2006-02-11 Kaveh R. Ghazi + + * doc/contrib.texi: Update my entry. + +2006-02-09 Eric Botcazou + + * config/sparc/sparc.c (tls_call_delay): Fix oversight. + +2006-02-07 John David Anglin + + PR target/26109 + * pa.c (attr_length_indirect_call): Don't return length 8 for distances + >= 240000 when generating code for SOM runtime. + (output_indirect_call): Don't use "b,l" instruction for indirect calls + to $$dyncall when generating code for SOM runtime.. + +2006-02-02 Nick Clifton + + PR 24376 + * sched-rgn.c (add_branch_dependences): For cc0 targets extend + the dependencies inside a block back to the very first cc0 setter + in the block. + +2006-01-21 Joseph S. Myers + + * gcc.c (process_command), gcov.c (print_version), gcov-dump.c + (print_version), mips-tdump.c (main), mips-tfile.c (main): Update + copyright notice dates. + +2006-01-12 Kaz Kojima + + PR target/25613 + * config/sh/sh.h (CONSTRAINT_LEN): Use unchecking version. + +2005-12-30 Roger Sayle + + PR target/25213 + Backport from mainline + 2005-09-06 Jakub Jelinek + + PR rtl-optimization/23098 + * cse.c (fold_rtx_mem): Call delegitimize_address target hook. + * simplify-rtx.c (constant_pool_reference_p): New function. + * rtl.h (constant_pool_reference_p): New prototype. + * config/i386/i386.md (pushf split, mov[sdx]f split): Use + constant_pool_reference_p in condition and + avoid_constant_pool_reference in preparation statements. + +2005-12-30 John David Anglin + + PR fortran/25586 + * pa.md: Remove REG_POINTER check from REG+REG peephole2 floating-point + store patterns. + +2005-12-29 Alan Modra + + PR target/25572 + * config/rs6000/rs6000.c (create_TOC_reference): Set regs_ever_live. + +2005-12-17 Steven Bosscher + + PR rtl-optimization/23837 + * optabs.c (expand_binop): For a multi-word rotate, never emit + a REG_NO_CONFLICT block. + +2005-12-16 John David Anglin + + Backport from mainline: + 2004-11-01 Mike Stump + + * inclhack.def (stdio_va_list): Break out clients from here... + (stdio_va_list_clients): ...to here. Also, don't fix if stdarg.h is + included or ifdef va_start. + * fixincl.x: Regenerate. + +2005-12-13 Alan Modra + + * config/rs6000/linux64.h (TARGET_ALIGN_NATURAL): Define. + +2005-12-10 John David Anglin + + PR target/25258 + * pa.c (som_text_section_asm_op): Use .NSUBSPA directive when changing + to the text subspace to output debugging information. + +2005-12-06 Alan Modra + + PR other/13873 + * longlong.h: Merge PPC tests from upstream. + +2005-12-03 Kaveh R. Ghazi + + PR middle-end/25022 + * builtins.c (expand_builtin_fputs, expand_builtin_printf, + expand_builtin_fprintf): Lookup the explicit replacement functions + for any unlocked stdio builtin transformations. + + * builtins.c (expand_builtin_fputs): Defer check for missing + replacement functions. + +2005-12-02 Volker Reichelt + + PR c++/24103 + Backport: + 2002-08-22 Diego Novillo + + * tree.c (simple_cst_equal): Call simple_cst_list_equal to compare + CONSTRUCTOR_ELTS pointers. + +2005-12-01 Gabriel Dos Reis + + * version.c: Bump version number. + * doc/include/gcc-common.texi: Likewise. + +2005-11-30 Release Manager + + * GCC 3.4.5 released. + +2005-11-23 Alan Modra + + PR middle-end/24950 + * expmed.c (store_bit_field): Don't attempt to insv a field + larger than the reg. + + Merge from trunk + 2005-11-14 Dale Johannesen + * expmed.c (store_bit_field): Add offset unconditionally for + memory targets. + (extract_bit_field): Don't force extzv or extv operand into + a register if field is too big. + 2004-12-01 Richard Henderson + * expmed.c (store_bit_field): Use simplify_gen_subreg instead + of gen_rtx_SUBREG directly. + +2005-11-16 Steve Ellcey + + PR target/24718 + * mklibgcc.in: Create dummy object for libgcc_eh.a + * config/ia64/hpux.h (LIBGCC_SPEC): Remove. + +2005-11-13 Andreas Jaeger + + * fixinc/check.tpl: Handle CVS additionally. + +2005-11-10 Uros Bizjak + + PR target/24315 + * config/i386/i386.md (*pushdi2_rex64 splitter) + (*movdi_1_rex64 splitter): Delay splitting after + flow2 pass only when (optimize > 0 && flag_peephole2). + +2005-11-10 Uros Bizjak + + PR target/19340 + * reg-stack.c (reg_to_stack): Update register liveness also + for flag_sched2_use_traces. + +2005-11-09 Per Bothner + Uros Bizjak + + PR c/24101 + * toplev.c (process_options): Initialize debug_hooks early + in case lang_hooks.post_options ends up calling a debug_hook. + * cppinit.c (read_original_filename): Temporarily set + state.in_directive before calling _cpp_lex_direct for + CPP_HASH tokens. + +2005-11-07 Steve Ellcey + + PR bootstrap/24688 + * fixinc/inclhack.def (sco_math): Add bypass. + * fixinc/fixincl.x: Regenerate. + +2005-11-07 James E Wilson + + PR preprocessor/15220 + * cppfiles.c (_cpp_find_file): New parameter angle_brackets. Fix all + callers. Pass to open_file_failed. + (open_file_failed): New parameter angle_brackets. Fix + all callers. use in print_dep assignment. + * cpphash.h (_cpp_find_file): Add new parm to declaration. + * cppinit.c (cpp_read_main_file): Pass another arg to _cpp_find_file. + +2005-11-05 Andreas Jaeger + + * fixinc/check.tpl: Adopt for move to subversion. + +2005-11-03 Richard Guenther + + PR middle-end/24470 + * fold-const.c (fold): Avoid running in circles if we + got some un-folded subtree. + +2005-10-30 Alan Modra + + PR target/23070 + * config/rs6000/rs6000.c (function_arg): For ABI_V4 calls to + stdarg functions, set/clear the fp marker even when no variable + args are passed. + * config/rs6000/sysv4.h (SUBTARGET_SWITCHES): Describe + -mprototype and -mno-prototype. + +2005-10-21 Alan Modra + + PR target/24465 + * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Always + use r2 for 64-bit tls .got access. + +2005-10-19 Paolo Bonzini + + * dojump.c (do_jump): Revert the last patch as it breaks Ada. + +2005-10-19 Paolo Bonzini + + PR #19672 + * dojump.c (do_jump): Handle TRUTH_AND_EXPR and TRUTH_OR_EXPR + like TRUTH_ANDIF_EXPR and TRUTH_ORIF_EXPR, if the branch cost + is low enough. + +2005-10-09 Eric Botcazou + + * config/sparc/gmon-sol2.c (internal_mcount): Mark as used. + +2005-10-08 Janis Johnson + + PR debug/24267 + Partial backport from mainline + 2004-05-04 Paolo Bonzini + Richard Henderson + * tree.c (make_or_reuse_type): New. + (build_common_tree_nodes): Use it. + + PR target/18583 + Partial backport from mainline + 2004-05-04 Paolo Bonzini + Richard Henderson + * c-common.c (vector_types_convertible_p): New function. + * c-common.h: Declare it. + * c-typeck.c (digest_init): Use it. + +2005-10-07 James E Wilson + + PR target/23644 + * doc/invoke.texi (IA-64 Options, item -mtune): Renamed from + -mtune-arch. + +2005-10-01 Richard Earnshaw + + PR target/23985 + Back-port 2004-08-19 Richard Henderson + * config/arm/arm.c (arm_gen_load_multiple): Use + adjust_automodify_address. Take base memory and offset instead + of unchanging/struct/scalar bits. + (arm_gen_store_multiple): Likewise. + (arm_gen_movstrqi): Use adjust_automodify_address. + * config/arm/arm-protos.h: Update decls. + * config/arm/arm.md (load_multiple): Update arm_gen_load_multiple call. + (store_multiple): Similarly. + +2005-09-29 Alan Modra + + PR target/24102 + * config/rs6000/rs6000.md (floatdisf2_internal2): Correct range + check for numbers that need no bit twiddle. + +2005-09-09 Richard Guenther + + PR c/20239 + * cppinit.c (cpp_read_main_file): Avoid segfaulting on + NULL pfile->map. + +2005-09-09 Richard Guenther + + PR c++/23624 + * fold-const.c (fold): Check truth_value_p before calling + invert_truthvalue. + +2005-09-08 Craig Rodrigues + + Backport from mainline + 2005-09-01 Craig Rodrigues + + * c-decl.c (diagnose_mismatched_decls): With -Wredundant-decls, + do not issue warning for a variable definition following + a declaration. + +2005-09-02 Richard Sandiford + + PR c/22061 + * c-decl.c (push_parm_decl): Push and pop x_dont_save_pending_sizes_p + around the call to grokdeclarator. Call grokdeclarator with the + field set to 0. + (store_parm_decls): Always store the pending_sizes in cfun. + (c_expand_body_1): Call put_pending_sizes. + * c-objc-common.c (c_cannot_inline_tree_fn): Always check + pending_sizes. + +2005-09-01 Jakub Jelinek + + PR rtl-optimization/23478 + * regs.h (reg_info): Add throw_calls_crossed. + (REG_N_THROWING_CALLS_CROSSED): Define. + * flow.c (allocate_reg_life_data): Initialize + REG_N_THROWING_CALLS_CROSSED. + (propagate_one_insn, attempt_auto_inc): Update + REG_N_THROWING_CALLS_CROSSED. + * local-alloc.c (struct qty): Add n_throwing_calls_crossed field. + (alloc_qty): Initialize it. + (update_equiv_regs): Clear REG_N_THROWING_CALLS_CROSSED. + (combine_regs): Combine also n_throwing_calls_crossed fields. + (find_free_reg): Don't attempt to caller-save pseudos crossing + calls that might throw. + * global.c (struct allocno): Add throwing_calls_crossed field. + (global_alloc): Initialize throwing_calls_crossed. + (find_reg): Don't attempt to caller-save pseudos crossing calls that + might throw. + +2005-09-01 Richard Earnshaw + + PR rtl-optimization/17810 target/15342 + * regrename.c: Fix polluted patch in previous change. + +2005-09-01 Richard Earnshaw + + PR rtl-optimization/17810 + Backport + 2004-11-04 Richard Sandiford + PR target/15342 + * regrename.c (scan_rtx): Treat the destinations of SETs and CLOBBERs + as OP_INOUT if the instruction is predicated. + +2005-08-31 David Edelsohn + + PR target/23539 + Backport from mainline: + + 2005-08-27 David Edelsohn + * config/rs6000/rs6000.c (expand_block_move): Use HImode when + bytes >= 2 not bytes == 2. + +2005-08-21 Jakub Jelinek + + * simplify-rtx.c (simplify_immed_subreg) : Only + clear up to elem_bitsize bits, not max_bitsize. + +2005-07-20 Steve Ellcey + + PR target/21841 + * doc/invoke.texi (-mgnu-ld): Update description. + (-mhp-ld): Ditto. + +2005-08-09 Paolo Bonzini + + PR rtl-optimization/17860 + * loop.c (check_dbra_loop): Do not try to use an end condition + like "i != 0" in the reversed loop. + +2005-08-08 Josh Conner + + PR rtl-optimization/23241 + * combine.c (simplify_comparison): Fix error in determining + whether to lift a subreg from comparison. + +2005-08-08 Richard Sandiford + + PR middle-end/21964 + * stmt.c (tail_recursion_args): Insert a call to emit_queue. + +2005-08-08 Richard Sandiford + + PR c/22458 + * c-decl.c (c_begin_compound_stmt): Set the initial body to + error_mark_node, not NULL. + +2005-08-07 John David Anglin + + * pa64-regs.h (CONDITIONAL_REGISTER_USAGE): Fix loop upper bound. + +2005-08-06 John David Anglin + + PR pch/14940 + Backport from mainline: + + * config.host (hppa*-*-hpux*, hppa*-*-linux): Define out_host_hook_obj + and host_xmake_file using new host configuration files. + * config/pa/pa-host.c, config/pa/x-hpux, config/pa/x-linux: New files. + +2005-08-06 Christian Joensson + + PR target/20673 + Backport from mainline: + + 2005-04-15 David S. Miller + + * config/sparc/sparc.h (sparc_hard_reg_printed): Mark as GTY(()). + +2005-08-05 John David Anglin + + * pa.c (function_arg): Fix typo in last change. + + * pa.c (function_value): Handle small aggregates on 32-bit targets. + (function_arg): Pass small aggregates in general registers on 32-bit + targets. + * som.h (MEMBER_TYPE_FORCES_BLK): Delete define. + +2005-08-04 Gerald Pfeifer + + * doc/install.texi (Specific): Adjust link to openavr.org. + (Specific): Remove broken reference to GCC 2.8.1 for OS/2. + (Binaries): Adjust HP-UX Porting Center link. + (Binaries): Adjust Free Software Foundation ordering link. + (Binaries): Remove broken link to Sinix/Reliant Unix binaries. + +2005-08-04 Eric Botcazou + + * doc/invoke.texi (Optimize Options): Document that -funswitch-loops + is enabled at -O3. + +2005-08-03 John David Anglin + + PR target/21723 + * pa.md: Remove fcpy alternative from movhi and movqi patterns. + * pa32-regs.h (HARD_REGNO_NREGS): Return two floating point registers + for complex modes when generating code for PA 1.0. + (VALID_FP_MODE_P): New macro. + (HARD_REGNO_MODE_OK): Use VALID_FP_MODE_P. Use non-overlapping register + sets for all general and floating point modes. Align wide floating + point modes to even register boundaries to comply with architectural + requirements. + (CLASS_MAX_NREGS): Update to align with change to HARD_REGNO_NREGS. + * pa64-regs.h (HARD_REGNO_NREGS): Update comment and formatting. + (VALID_FP_MODE_P): New macro. + (HARD_REGNO_MODE_OK): Use VALID_FP_MODE_P. Use non-overlapping register + sets for all general and floating point modes. Align wide floating + point modes to even register boundaries to comply with architectural + requirements. + +2005-08-03 Richard Sandiford + + PR target/18582 + * config/i386/i386.c (ix86_expand_unop_builtin): Force the target + to be a register if do_load is true. + +2005-08-02 Ian Lance Taylor + + PR pch/14400 + Backport from mainline: + + 2005-08-01 Ian Lance Taylor + + * config/host-linux.c (linux_gt_pch_get_address): Add new name + randomize_va_space for virtual address randomization control. + + 2005-02-15 James A. Morrison + + PR pch/14940 + PR target/19300 + * config/host-linux.c (linux_gt_pch_use_address): Copy from + config/pa/pa-host.c:pa_gt_pch_use_address. + + 2004-11-09 James A. Morrison + + PR pch/14940 + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Add __sparc__ + definitions. + + 2004-10-15 Jon Grimm + + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Add __powerpc__ + definition. + + 2004-04-24 Ulrich Weigand + + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __s390__ + and __s390x__ hosts. + + 2004-04-08 Ian Lance Taylor + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Return 1 if file was successfully mapped. + + 2004-03-15 Ian Lance Taylor + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Fix the check for abort and only do the mmap if we can. + + 2004-03-12 Andrew Pinski + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Use ret instead of result. Use addr instead of base. + + 2004-03-10 Richard Henderson + + * c-pch.c (c_common_no_more_pch): Update for gt_pch_use_address >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 3 13:12:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0FF916A4E0; Sun, 3 Sep 2006 13:12:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F78A16A4DE for ; Sun, 3 Sep 2006 13:12:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EBEF43D46 for ; Sun, 3 Sep 2006 13:12:46 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83DCkZ6099612 for ; Sun, 3 Sep 2006 13:12:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83DCkCc099609 for perforce@freebsd.org; Sun, 3 Sep 2006 13:12:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 3 Sep 2006 13:12:46 GMT Message-Id: <200609031312.k83DCkCc099609@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 105586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 13:12:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=105586 Change 105586 by hselasky@hselasky_mini_itx on 2006/09/03 13:12:11 Improve ata-usb reset timeout recovery. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#4 (text) ==== @@ -544,10 +544,6 @@ return; tr_setup: - if (sc->reset_count >= 16) { - device_printf(sc->dev, "timeout: giving up reset!\n"); - return; - } sc->reset_count ++; @@ -916,9 +912,20 @@ sc->last_xfer_no); } - /* start reset before any callback */ + if (sc->reset_count < 16) { + + /* start reset before any callback */ + + atausb_transfer_start(sc, ATAUSB_T_BBB_RESET1); + } else { + + /* suspend reset until next command */ + + sc->last_xfer_no = ATAUSB_T_BBB_RESET1; + sc->reset_count = 0; - atausb_transfer_start(sc, ATAUSB_T_BBB_RESET1); + device_printf(sc->dev, "timeout: giving up reset!\n"); + } } if (request) { From owner-p4-projects@FreeBSD.ORG Sun Sep 3 13:57:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 878D116A4E0; Sun, 3 Sep 2006 13:57:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2198F16A4DA for ; Sun, 3 Sep 2006 13:57:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DD4D43D58 for ; Sun, 3 Sep 2006 13:57:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83Dvkxa002193 for ; Sun, 3 Sep 2006 13:57:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83Dvkdi002190 for perforce@freebsd.org; Sun, 3 Sep 2006 13:57:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 3 Sep 2006 13:57:46 GMT Message-Id: <200609031357.k83Dvkdi002190@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 105589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 13:57:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=105589 Change 105589 by rwatson@rwatson_sesame on 2006/09/03 13:56:46 Update to OpenBSM 1.0 alpha 11. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#27 edit .. //depot/projects/trustedbsd/openbsm/VERSION#12 edit .. //depot/projects/trustedbsd/openbsm/configure#27 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#30 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#27 (text+ko) ==== @@ -1,3 +1,5 @@ +OpenBSM 1.0 alpha 11 + OpenBSM 1.0 alpha 10 - auditd now generates complete audit records for its events, as required for @@ -209,4 +211,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#26 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#27 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#12 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_9 +OPENBSM_1_0_ALPHA_11 ==== //depot/projects/trustedbsd/openbsm/configure#27 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#28 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a10. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a11. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a10' -PACKAGE_STRING='OpenBSM 1.0a10' +PACKAGE_VERSION='1.0a11' +PACKAGE_STRING='OpenBSM 1.0a11' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a10 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a10:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a11:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a10 +OpenBSM configure 1.0a11 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a10, which was +It was created by OpenBSM $as_me 1.0a11, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a10 + VERSION=1.0a11 cat >>confdefs.h <<_ACEOF @@ -23478,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a10, which was +This file was extended by OpenBSM $as_me 1.0a11, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23541,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a10 +OpenBSM config.status 1.0a11 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#30 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a10], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 $]) +AC_INIT([OpenBSM], [1.0a11], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#30 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-p4-projects@FreeBSD.ORG Sun Sep 3 14:47:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9964216A4E2; Sun, 3 Sep 2006 14:47:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7489E16A4E0 for ; Sun, 3 Sep 2006 14:47:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4308443D46 for ; Sun, 3 Sep 2006 14:47:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83Elo1D008381 for ; Sun, 3 Sep 2006 14:47:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83Elnh9008378 for perforce@freebsd.org; Sun, 3 Sep 2006 14:47:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 3 Sep 2006 14:47:49 GMT Message-Id: <200609031447.k83Elnh9008378@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 105593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 14:47:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=105593 Change 105593 by rwatson@rwatson_sesame on 2006/09/03 14:47:06 Add new OpenBSM events for managing the kernel environment and jail attachment, both FreeBSD-specific events. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#41 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#41 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#41 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -467,6 +467,8 @@ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ #define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ +#define AUE_KENV 43114 /* FreeBSD. */ +#define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#12 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#13 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -415,6 +415,8 @@ 43111:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm 43112:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa 43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +43114:AUE_KENV:kenv(8):ad +43115:AUE_JAIL_ATTACH:jail_attach(2):ad # # User space system events. # From owner-p4-projects@FreeBSD.ORG Sun Sep 3 16:43:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61D1C16A4E1; Sun, 3 Sep 2006 16:43:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B90C16A4DE for ; Sun, 3 Sep 2006 16:43:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CEB943D5A for ; Sun, 3 Sep 2006 16:43:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83GhKH1019166 for ; Sun, 3 Sep 2006 16:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83GhKTI019163 for perforce@freebsd.org; Sun, 3 Sep 2006 16:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 3 Sep 2006 16:43:20 GMT Message-Id: <200609031643.k83GhKTI019163@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 105601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 16:43:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=105601 Change 105601 by rwatson@rwatson_sesame on 2006/09/03 16:42:46 First scratchinges at a new approach to jail and privilege: since we now have named privileges being passed in explicitly, the jail decision can be made centrally rather than scattered all over the kernel. The list of privileges here is not yet complete, though. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#2 (text+ko) ==== @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -37,7 +38,6 @@ MALLOC_DEFINE(M_PRISON, "prison", "Prison structures"); -SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW, 0, "Jail rules"); @@ -205,7 +205,7 @@ * a process root from one prison, but attached to the jail * of another. */ - error = suser(td); + error = priv_check(td, PRIV_JAIL_ATTACH); if (error) return (error); @@ -523,6 +523,103 @@ } } +/* + * Check with permission for a specific privilege is granted within jail. We + * have a specific list of accepted privileges; the rest are denied. + */ +int +prison_priv_check(struct ucred *cred, enum priv priv) +{ + + if (!(jailed(cred))) + return (0); + + switch (priv) { + case PRIV_CRED_SETUID: + case PRIV_CRED_SETEUID: + case PRIV_CRED_SETGID: + case PRIV_CRED_SETEGID: + case PRIV_CRED_SETREUID: + case PRIV_CRED_SETREGID: + case PRIV_CRED_SETRESUID: + case PRIV_CRED_SETRESGID: + case PRIV_CRED_SETGROUPS: + /* + * Grant most process credential privileges, as root within a + * jail can set up credentials as it sees fit. The ability + * to modify jail settings, and in particular to attach to a + * jail, is not granted. + */ + return (0); + + case PRIV_SIGNAL_SUGID: + case PRIV_SIGNAL_DIFFCRED: + case PRIV_PROC_SETLOGIN: + /* + * Inter-process privileges are generally granted, since a + * separate jail name space check will be performed to scope + * these calls to the current jail. + */ + return (0); + + case PRIV_SCHED_SETPRIORITY: + case PRIV_PROC_SETRLIMIT: + /* + * Root in jail can modify resource limits and scheduler + * properties as it sees fit. + */ + return (0); + + case PRIV_IPC_READ: + case PRIV_IPC_EXEC: + case PRIV_IPC_WRITE: + case PRIV_IPC_ADMIN: + case PRIV_IPC_MSGSIZE: + /* + * Grant System V IPC privileges -- we enable access to the + * services using a single setting, and assume that if System + * V IPC is available in the jail, privilege will be granted + * to root in the jail. + */ + return (0); + + case PRIV_MQ_ADMIN: + /* + * POSIX message queue administrative privilege is granted: + * if the jail can name the resource, then root in the jail + * can manage it. + */ + return (0); + + case PRIV_VFS_READ: + case PRIV_VFS_WRITE: + case PRIV_VFS_EXEC: + case PRIV_VFS_ADMIN: + case PRIV_VFS_LOOKUP: + /* + * In general, grant file permission exemption in VFS, but + * not the right to manipulate the name space (mounting, + * chroot, etc). + */ + return (0); + + case PRIV_VFS_CHFLAGS_DEV: + case PRIV_VFS_REVOKE: + /* + * Grant rights relating to managing visible device nodes and + * ttys. + */ + + return (0); + + default: + /* + * In all remaining cases, deny the privilege request. + */ + return (EPERM); + } +} + static int sysctl_jail_list(SYSCTL_HANDLER_ARGS) { From owner-p4-projects@FreeBSD.ORG Sun Sep 3 16:49:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3338316A4E9; Sun, 3 Sep 2006 16:49:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BD8216A4DE for ; Sun, 3 Sep 2006 16:49:30 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA57243D49 for ; Sun, 3 Sep 2006 16:49:29 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83GnTPk027409 for ; Sun, 3 Sep 2006 16:49:29 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83GnTDh027406 for perforce@freebsd.org; Sun, 3 Sep 2006 16:49:29 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Sep 2006 16:49:29 GMT Message-Id: <200609031649.k83GnTDh027406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 16:49:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=105603 Change 105603 by mjacob@newisp on 2006/09/03 16:49:15 Don't dump request queue entries at debug0 Affected files ... .. //depot/projects/newisp/dev/isp/isp_pci.c#8 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_pci.c#8 (text+ko) ==== @@ -2388,7 +2388,7 @@ seglim++; datalen -= dm_segs->ds_len; } - if (isp->isp_dblev & ISP_LOGDEBUG0) { + if (isp->isp_dblev & ISP_LOGDEBUG1) { isp_print_bytes(isp, "Continuation", QENTRY_LEN, crq); } isp_put_cont64_req(isp, crq, cqe); @@ -2782,7 +2782,7 @@ return (retval); } mbxsync: - if (isp->isp_dblev & ISP_LOGDEBUG0) { + if (isp->isp_dblev & ISP_LOGDEBUG1) { isp_print_bytes(isp, "Request Queue Entry", QENTRY_LEN, rq); } switch (rq->req_header.rqs_entry_type) { From owner-p4-projects@FreeBSD.ORG Sun Sep 3 16:54:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A9D616A4E1; Sun, 3 Sep 2006 16:54:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB68B16A4E0 for ; Sun, 3 Sep 2006 16:54:39 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE46D43D4C for ; Sun, 3 Sep 2006 16:54:37 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83GsbCH027736 for ; Sun, 3 Sep 2006 16:54:37 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83GsaBG027733 for perforce@freebsd.org; Sun, 3 Sep 2006 16:54:36 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Sep 2006 16:54:36 GMT Message-Id: <200609031654.k83GsaBG027733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 16:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=105604 Change 105604 by mjacob@newisp on 2006/09/03 16:54:13 Sync with head. Affected files ... .. //depot/projects/newisp/bsm/audit_internal.h#2 integrate .. //depot/projects/newisp/bsm/audit_record.h#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/newisp/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/newisp/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/newisp/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/newisp/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/newisp/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/newisp/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/newisp/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/newisp/dev/ata/ata-dma.c#2 integrate .. //depot/projects/newisp/dev/ata/ata-pci.h#2 integrate .. //depot/projects/newisp/dev/bge/if_bge.c#2 integrate .. //depot/projects/newisp/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/newisp/dev/em/if_em.c#3 integrate .. //depot/projects/newisp/dev/gem/if_gem.c#2 integrate .. //depot/projects/newisp/dev/isp/isp_pci.c#9 integrate .. //depot/projects/newisp/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/newisp/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/newisp/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/newisp/kern/bus_if.m#2 integrate .. //depot/projects/newisp/kern/init_sysent.c#3 integrate .. //depot/projects/newisp/kern/kern_exec.c#2 integrate .. //depot/projects/newisp/kern/kern_umtx.c#4 integrate .. //depot/projects/newisp/kern/subr_bus.c#2 integrate .. //depot/projects/newisp/kern/syscalls.c#3 integrate .. //depot/projects/newisp/kern/syscalls.master#3 integrate .. //depot/projects/newisp/kern/systrace_args.c#3 integrate .. //depot/projects/newisp/modules/Makefile#2 integrate .. //depot/projects/newisp/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/newisp/security/audit/audit.c#2 integrate .. //depot/projects/newisp/security/audit/audit.h#2 integrate .. //depot/projects/newisp/security/audit/audit_arg.c#2 integrate .. //depot/projects/newisp/security/audit/audit_bsm.c#2 integrate .. //depot/projects/newisp/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/newisp/security/audit/audit_private.h#2 integrate .. //depot/projects/newisp/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/newisp/sys/_bus_dma.h#1 branch .. //depot/projects/newisp/sys/bus.h#2 integrate .. //depot/projects/newisp/sys/bus_dma.h#2 integrate .. //depot/projects/newisp/sys/msgbuf.h#2 integrate .. //depot/projects/newisp/sys/param.h#2 integrate .. //depot/projects/newisp/sys/syscall.h#3 integrate .. //depot/projects/newisp/sys/syscall.mk#3 integrate .. //depot/projects/newisp/sys/sysproto.h#3 integrate Differences ... ==== //depot/projects/newisp/bsm/audit_internal.h#2 (text) ==== @@ -35,7 +35,7 @@ * @APPLE_BSD_LICENSE_HEADER_END@ * * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.3 2006/08/26 08:17:58 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H @@ -71,9 +71,9 @@ /* * We could determined the header and trailer sizes by defining appropriate - * structures. We hold off that approach until we have a consistant way of + * structures. We hold off that approach until we have a consistent way of * using structures for all tokens. This is not straightforward since these - * token structures may contain pointers of whose contents we dont know the + * token structures may contain pointers of whose contents we do not know the * size (e.g text tokens). */ #define AUDIT_HEADER_SIZE 18 ==== //depot/projects/newisp/bsm/audit_record.h#2 (text) ==== @@ -31,7 +31,7 @@ * @APPLE_BSD_LICENSE_HEADER_END@ * * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.4 2006/08/26 08:17:58 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.5 2006/09/01 11:45:39 wsalamon Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -319,8 +319,13 @@ gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); +#if defined(_KERNEL) || defined(KERNEL) +token_t *au_to_exec_args(char *args, int argc); +token_t *au_to_exec_env(char *envs, int envc); +#else +token_t *au_to_exec_args(char **argv); +token_t *au_to_exec_env(char **envp); +#endif token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); ==== //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#2 (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.58 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.60 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -455,7 +455,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL -#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE #define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION #define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN #define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#2 (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.56 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.58 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 @@ -311,4 +311,4 @@ #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 #define FREEBSD32_SYS_abort2 463 -#define FREEBSD32_SYS_MAXSYSCALL 469 +#define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#2 (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.47 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.49 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ const char *freebsd32_syscallnames[] = { @@ -167,7 +167,7 @@ "old.freebsd32_statfs", /* 157 = old freebsd32_statfs */ "old.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */ "#159", /* 159 = nosys */ - "#160", /* 160 = nosys */ + "#160", /* 160 = lgetfh */ "getfh", /* 161 = getfh */ "getdomainname", /* 162 = getdomainname */ "setdomainname", /* 163 = setdomainname */ @@ -476,4 +476,6 @@ "#466", /* 466 = thr_setscheduler */ "#467", /* 467 = thr_getscheduler */ "#468", /* 468 = thr_setschedparam */ + "#469", /* 469 = __getpath_fromfd */ + "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#2 (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.57 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.59 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ #include "opt_compat.h" @@ -192,13 +192,13 @@ { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0 }, /* 157 = old freebsd32_statfs */ { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0 }, /* 158 = old freebsd32_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 159 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = lgetfh */ { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 }, /* 161 = getfh */ - { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_O_GETDOMAINNAME, NULL, 0, 0 }, /* 162 = getdomainname */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_SETDOMAINNAME, NULL, 0, 0 }, /* 163 = setdomainname */ + { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 162 = getdomainname */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 163 = setdomainname */ { AS(uname_args), (sy_call_t *)uname, AUE_NULL, NULL, 0, 0 }, /* 164 = uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL, NULL, 0, 0 }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL, NULL, 0, 0 }, /* 166 = rtprio */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0 }, /* 165 = sysarch */ + { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0 }, /* 166 = rtprio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 167 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 168 = nosys */ { AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys, AUE_SEMSYS, NULL, 0, 0 }, /* 169 = freebsd32_semsys */ @@ -208,7 +208,7 @@ { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = freebsd32_pread */ { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = freebsd32_pwrite */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */ - { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ + { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 178 = getdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 179 = setdescriptor */ @@ -358,7 +358,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 324 = mlockall */ { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 325 = munlockall */ - { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL, NULL, 0, 0 }, /* 326 = __getcwd */ + { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 326 = __getcwd */ { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0 }, /* 327 = sched_setparam */ { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0 }, /* 328 = sched_getparam */ { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 329 = sched_setscheduler */ @@ -370,7 +370,7 @@ { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */ { compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */ - { AS(jail_args), (sy_call_t *)jail, AUE_NULL, NULL, 0, 0 }, /* 338 = jail */ + { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */ { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */ { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */ @@ -379,7 +379,7 @@ { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old freebsd32_sigreturn */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 345 = sigtimedwait */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */ - { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_JAIL, NULL, 0, 0 }, /* 347 = __acl_get_file */ + { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */ { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */ { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */ { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0 }, /* 350 = __acl_set_fd */ @@ -387,14 +387,14 @@ { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 352 = __acl_delete_fd */ { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0 }, /* 353 = __acl_aclcheck_file */ { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0 }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL, NULL, 0, 0 }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL, NULL, 0, 0 }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL, NULL, 0, 0 }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL, NULL, 0, 0 }, /* 358 = extattr_delete_file */ + { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0 }, /* 355 = extattrctl */ + { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ + { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ + { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL, NULL, 0, 0 }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL, NULL, 0, 0 }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_NULL, NULL, 0, 0 }, /* 362 = kqueue */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ + { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_NULL, NULL, 0, 0 }, /* 363 = freebsd32_kevent */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 364 = __cap_get_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 365 = __cap_set_proc */ @@ -403,14 +403,14 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL, NULL, 0, 0 }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL, NULL, 0, 0 }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ + { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ + { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ + { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0 }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL, NULL, 0, 0 }, /* 376 = eaccess */ + { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL, NULL, 0, 0 }, /* 378 = nmount */ + { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ { 0, (sy_call_t *)kse_exit, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ { AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ { AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ @@ -425,12 +425,12 @@ { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0 }, /* 390 = kenv */ { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0 }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0 }, /* 392 = uuidgen */ - { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_NULL, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */ + { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 394 = mac_syscall */ { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0 }, /* 395 = getfsstat */ { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0 }, /* 396 = statfs */ { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL, NULL, 0, 0 }, /* 398 = fhstatfs */ + { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0 }, /* 398 = fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 399 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 400 = ksem_close */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 401 = ksem_post */ @@ -476,7 +476,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ - { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL, NULL, 0, 0 }, /* 444 = kldunloadf */ + { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 445 = audit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 446 = auditon */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 447 = getauid */ @@ -501,4 +501,6 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/newisp/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.71 2006/08/16 22:32:50 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -238,8 +238,8 @@ 126 AUE_SETREUID NOPROTO { int setreuid(int ruid, int euid); } 127 AUE_SETREGID NOPROTO { int setregid(int rgid, int egid); } 128 AUE_RENAME NOPROTO { int rename(char *from, char *to); } -129 AUE_NULL OBSOL otruncate -130 AUE_NULL OBSOL ftruncate +129 AUE_TRUNCATE OBSOL otruncate +130 AUE_FTRUNCATE OBSOL ftruncate 131 AUE_FLOCK NOPROTO { int flock(int fd, int how); } 132 AUE_MKFIFO NOPROTO { int mkfifo(char *path, int mode); } 133 AUE_SENDTO NOPROTO { int sendto(int s, caddr_t buf, \ @@ -256,17 +256,17 @@ 140 AUE_ADJTIME STD { int freebsd32_adjtime( \ struct timeval32 *delta, \ struct timeval32 *olddelta); } -141 AUE_NULL OBSOL ogetpeername -142 AUE_NULL OBSOL ogethostid -143 AUE_NULL OBSOL sethostid -144 AUE_NULL OBSOL getrlimit -145 AUE_NULL OBSOL setrlimit -146 AUE_NULL OBSOL killpg +141 AUE_GETPEERNAME OBSOL ogetpeername +142 AUE_SYSCTL OBSOL ogethostid +143 AUE_SYSCTL OBSOL sethostid +144 AUE_GETRLIMIT OBSOL getrlimit +145 AUE_SETRLIMIT OBSOL setrlimit +146 AUE_KILLPG OBSOL killpg 147 AUE_SETSID NOPROTO { int setsid(void); } 148 AUE_QUOTACTL NOPROTO { int quotactl(char *path, int cmd, int uid, \ caddr_t arg); } -149 AUE_NULL OBSOL oquota -150 AUE_NULL OBSOL ogetsockname +149 AUE_O_QUOTA OBSOL oquota +150 AUE_GETSOCKNAME OBSOL ogetsockname ; Syscalls 151-180 inclusive are reserved for vendor-specific ; system calls. (This includes various calls added for compatibity @@ -278,23 +278,23 @@ 154 AUE_NULL UNIMPL nosys ; 155 is initialized by the NFS code, if present. ; XXX this is a problem!!! -155 AUE_NFSSVC UNIMPL nfssvc -156 AUE_NULL OBSOL ogetdirentries +155 AUE_NFS_SVC UNIMPL nfssvc +156 AUE_GETDIRENTRIES OBSOL ogetdirentries 157 AUE_STATFS COMPAT4 { int freebsd32_statfs(char *path, \ struct statfs32 *buf); } 158 AUE_FSTATFS COMPAT4 { int freebsd32_fstatfs(int fd, \ struct statfs32 *buf); } 159 AUE_NULL UNIMPL nosys -160 AUE_NULL UNIMPL nosys +160 AUE_LGETFH UNIMPL lgetfh 161 AUE_NFS_GETFH NOPROTO { int getfh(char *fname, \ struct fhandle *fhp); } -162 AUE_O_GETDOMAINNAME NOPROTO { int getdomainname(char *domainname, \ +162 AUE_SYSCTL NOPROTO { int getdomainname(char *domainname, \ int len); } -163 AUE_O_SETDOMAINNAME NOPROTO { int setdomainname(char *domainname, \ +163 AUE_SYSCTL NOPROTO { int setdomainname(char *domainname, \ int len); } 164 AUE_NULL NOPROTO { int uname(struct utsname *name); } -165 AUE_NULL NOPROTO { int sysarch(int op, char *parms); } -166 AUE_NULL NOPROTO { int rtprio(int function, pid_t pid, \ +165 AUE_SYSARCH NOPROTO { int sysarch(int op, char *parms); } +166 AUE_RTPRIO NOPROTO { int rtprio(int function, pid_t pid, \ struct rtprio *rtp); } 167 AUE_NULL UNIMPL nosys 168 AUE_NULL UNIMPL nosys @@ -314,7 +314,7 @@ u_int32_t offsetlo, u_int32_t offsethi); } ; XXX note - bigendian is different 175 AUE_NULL UNIMPL nosys -176 AUE_ADJTIME NOPROTO { int ntp_adjtime(struct timex *tp); } +176 AUE_NTP_ADJTIME NOPROTO { int ntp_adjtime(struct timex *tp); } 177 AUE_NULL UNIMPL sfork (BSD/OS 2.x) 178 AUE_NULL UNIMPL getdescriptor (BSD/OS 2.x) 179 AUE_NULL UNIMPL setdescriptor (BSD/OS 2.x) @@ -542,7 +542,7 @@ 323 AUE_NULL OBSOL thr_wakeup 324 AUE_MLOCKALL NOPROTO { int mlockall(int how); } 325 AUE_MUNLOCKALL NOPROTO { int munlockall(void); } -326 AUE_NULL NOPROTO { int __getcwd(u_char *buf, u_int buflen); } +326 AUE_GETCWD NOPROTO { int __getcwd(u_char *buf, u_int buflen); } 327 AUE_NULL NOPROTO { int sched_setparam (pid_t pid, \ const struct sched_param *param); } @@ -567,7 +567,7 @@ off_t *sbytes, int flags); } 337 AUE_NULL NOPROTO { int kldsym(int fileid, int cmd, \ void *data); } -338 AUE_NULL NOPROTO { int jail(struct jail *jail); } +338 AUE_JAIL NOPROTO { int jail(struct jail *jail); } 339 AUE_NULL UNIMPL pioctl 340 AUE_SIGPROCMASK NOPROTO { int sigprocmask(int how, \ const sigset_t *set, sigset_t *oset); } @@ -579,10 +579,10 @@ 344 AUE_SIGRETURN COMPAT4 { int freebsd32_sigreturn( \ const struct freebsd4_freebsd32_ucontext *sigcntxp); } ; XXX implement -345 AUE_NULL UNIMPL sigtimedwait +345 AUE_SIGWAIT UNIMPL sigtimedwait ; XXX implement 346 AUE_NULL UNIMPL sigwaitinfo -347 AUE_JAIL NOPROTO { int __acl_get_file(const char *path, \ +347 AUE_NULL NOPROTO { int __acl_get_file(const char *path, \ acl_type_t type, struct acl *aclp); } 348 AUE_NULL NOPROTO { int __acl_set_file(const char *path, \ acl_type_t type, struct acl *aclp); } @@ -598,24 +598,26 @@ acl_type_t type, struct acl *aclp); } 354 AUE_NULL NOPROTO { int __acl_aclcheck_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -355 AUE_NULL NOPROTO { int extattrctl(const char *path, int cmd, \ +355 AUE_EXTATTRCTL NOPROTO { int extattrctl(const char *path, int cmd, \ const char *filename, int attrnamespace, \ const char *attrname); } -356 AUE_NULL NOPROTO { int extattr_set_file(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -357 AUE_NULL NOPROTO { ssize_t extattr_get_file(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -358 AUE_NULL NOPROTO { int extattr_delete_file(const char *path, \ - int attrnamespace, \ +356 AUE_EXTATTR_SET_FILE NOPROTO { int extattr_set_file( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +357 AUE_EXTATTR_GET_FILE NOPROTO { ssize_t extattr_get_file( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +358 AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \ + const char *path, int attrnamespace, \ const char *attrname); } 359 AUE_NULL UNIMPL aio_waitcomplete -360 AUE_NULL NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ +360 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } -361 AUE_NULL NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ +361 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ gid_t *sgid); } -362 AUE_NULL NOPROTO { int kqueue(void); } +362 AUE_KQUEUE NOPROTO { int kqueue(void); } 363 AUE_NULL STD { int freebsd32_kevent(int fd, \ const struct kevent32 *changelist, \ int nchanges, \ @@ -628,20 +630,20 @@ 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file 370 AUE_NULL UNIMPL lkmressys -371 AUE_NULL NOPROTO { int extattr_set_fd(int fd, \ +371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -372 AUE_NULL NOPROTO { ssize_t extattr_get_fd(int fd, \ +372 AUE_EXTATTR_GET_FD NOPROTO { ssize_t extattr_get_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -373 AUE_NULL NOPROTO { int extattr_delete_fd(int fd, \ +373 AUE_EXTATTR_DELETE_FD NOPROTO { int extattr_delete_fd(int fd, \ int attrnamespace, \ const char *attrname); } 374 AUE_NULL NOPROTO { int __setugid(int flag); } 375 AUE_NULL UNIMPL nfsclnt -376 AUE_NULL NOPROTO { int eaccess(char *path, int flags); } +376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); } 377 AUE_NULL UNIMPL afs_syscall -378 AUE_NULL NOPROTO { int nmount(struct iovec *iovp, \ +378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \ unsigned int iovcnt, int flags); } 379 AUE_NULL NOPROTO { int kse_exit(void); } 380 AUE_NULL NOPROTO { int kse_wakeup(struct kse_mailbox *mbx); } @@ -661,7 +663,7 @@ 391 AUE_LCHFLAGS NOPROTO { int lchflags(const char *path, int flags); } 392 AUE_NULL NOPROTO { int uuidgen(struct uuid *store, \ int count); } -393 AUE_NULL STD { int freebsd32_sendfile(int fd, int s, \ +393 AUE_SENDFILE STD { int freebsd32_sendfile(int fd, int s, \ u_int32_t offsetlo, u_int32_t offsethi, \ size_t nbytes, struct sf_hdtr32 *hdtr, \ off_t *sbytes, int flags); } @@ -671,7 +673,7 @@ 396 AUE_STATFS NOPROTO { int statfs(char *path, \ struct statfs *buf); } 397 AUE_FSTATFS NOPROTO { int fstatfs(int fd, struct statfs *buf); } -398 AUE_NULL NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \ +398 AUE_FHSTATFS NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \ struct statfs *buf); } 399 AUE_NULL UNIMPL nosys ; XXX implement these? @@ -687,9 +689,9 @@ 409 AUE_NULL UNIMPL __mac_get_pid 410 AUE_NULL UNIMPL __mac_get_link 411 AUE_NULL UNIMPL __mac_set_link -412 AUE_NULL UNIMPL extattr_set_link -413 AUE_NULL UNIMPL extattr_get_link -414 AUE_NULL UNIMPL extattr_delete_link +412 AUE_EXTATTR_SET_LINK UNIMPL extattr_set_link +413 AUE_EXTATTR_GET_LINK UNIMPL extattr_get_link +414 AUE_EXTATTR_DELETE_LINK UNIMPL extattr_delete_link 415 AUE_NULL UNIMPL __mac_execve 416 AUE_SIGACTION STD { int freebsd32_sigaction(int sig, \ struct sigaction32 *act, \ @@ -721,15 +723,15 @@ 434 AUE_NULL NOPROTO { int _umtx_lock(struct umtx *umtx); } 435 AUE_NULL NOPROTO { int _umtx_unlock(struct umtx *umtx); } 436 AUE_NULL NOPROTO { int jail_attach(int jid); } -437 AUE_NULL UNIMPL extattr_list_fd -438 AUE_NULL UNIMPL extattr_list_file -439 AUE_NULL UNIMPL extattr_list_link +437 AUE_EXTATTR_LIST_FD UNIMPL extattr_list_fd +438 AUE_EXTATTR_LIST_FILE UNIMPL extattr_list_file +439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link 440 AUE_NULL UNIMPL kse_switchin 441 AUE_NULL UNIMPL ksem_timedwait 442 AUE_NULL NOPROTO { int thr_suspend( \ const struct timespec *timeout); } 443 AUE_NULL NOPROTO { int thr_wake(long id); } -444 AUE_NULL NOPROTO { int kldunloadf(int fileid, int flags); } +444 AUE_MODUNLOAD NOPROTO { int kldunloadf(int fileid, int flags); } 445 AUE_AUDIT UNIMPL audit 446 AUE_AUDITON UNIMPL auditon 447 AUE_GETAUID UNIMPL getauid ==== //depot/projects/newisp/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.22 2005/09/28 07:03:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.23 2006/09/02 08:18:22 rwatson Exp $"); #include #include @@ -470,14 +470,10 @@ break; #if defined(WHY_DOES_AN_EMULATOR_WANT_TO_SET_HOSTNAMES) case SVR4_SI_SET_HOSTNAME: - if ((error = suser(td)) != 0) - return error; name = KERN_HOSTNAME; return kern_sysctl(&name, 1, 0, 0, uap->buf, rlen, td); case SVR4_SI_SET_SRPC_DOMAIN: - if ((error = suser(td)) != 0) - return error; name = KERN_NISDOMAINNAME; return kern_sysctl(&name, 1, 0, 0, uap->buf, rlen, td); #else ==== //depot/projects/newisp/dev/acpica/acpi_thermal.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.62 2006/07/25 02:27:37 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.63 2006/09/03 15:10:04 ume Exp $"); #include "opt_acpi.h" #include @@ -733,7 +733,6 @@ return (EPERM); /* Check user-supplied value for sanity. */ - temp = (temp * 10) + TZ_ZEROC; acpi_tz_sanity(sc, &temp, "user-supplied temp"); if (temp == -1) return (EINVAL); ==== //depot/projects/newisp/dev/aic7xxx/ahc_eisa.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.35 2005/01/06 01:42:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.36 2006/09/03 00:27:40 jmg Exp $"); #include @@ -131,8 +131,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/newisp/dev/aic7xxx/ahc_isa.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.6 2005/01/06 01:42:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.7 2006/09/03 00:27:40 jmg Exp $"); #include @@ -254,8 +254,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the VLB/ISA bus dma tag */ - error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/newisp/dev/aic7xxx/ahc_pci.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.64 2005/03/05 19:24:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.65 2006/09/03 00:27:40 jmg Exp $"); #include @@ -107,8 +107,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, (ahc->flags & AHC_39BIT_ADDRESSING) ? 0x7FFFFFFFFFLL : BUS_SPACE_MAXADDR_32BIT, ==== //depot/projects/newisp/dev/aic7xxx/ahd_pci.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.19 2005/09/22 04:56:59 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.20 2006/09/03 00:27:40 jmg Exp $"); #include @@ -109,8 +109,8 @@ /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = aic_dma_tag_create(ahd, /*parent*/NULL, /*alignment*/1, - /*boundary*/0, + error = aic_dma_tag_create(ahd, /*parent*/bus_get_dma_tag(dev), + /*alignment*/1, /*boundary*/0, (ahd->flags & AHD_39BIT_ADDRESSING) ? 0x7FFFFFFFFF : BUS_SPACE_MAXADDR_32BIT, ==== //depot/projects/newisp/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.172 2006/08/30 11:50:22 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.173 2006/09/02 12:55:42 sos Exp $"); #include "opt_ata.h" #include @@ -4750,12 +4750,14 @@ { ATA_VIA8233A, 0x00, VIA133, 0x00, ATA_UDMA6, "8233A" }, { ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "8235" }, { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" }, + { ATA_VIA8237A, 0x00, VIA133, 0x00, ATA_UDMA6, "8237A" }, { ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" }, { 0, 0, 0, 0, 0, 0 }}; static struct ata_chip_id new_ids[] = {{ ATA_VIA6410, 0x00, 0, 0x00, ATA_UDMA6, "6410" }, { ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" }, { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" }, + { ATA_VIA8237A, 0x00, 0, 0x00, ATA_SA150, "8237A" }, { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; ==== //depot/projects/newisp/dev/ata/ata-dma.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.141 2006/01/05 21:27:19 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.142 2006/09/03 00:27:41 jmg Exp $"); #include #include @@ -96,7 +96,7 @@ struct ata_channel *ch = device_get_softc(dev); struct ata_dc_cb_args ccba; - if (bus_dma_tag_create(NULL, ch->dma->alignment, 0, + if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, ch->dma->max_iosize, ATA_DMA_ENTRIES, ch->dma->segsize, ==== //depot/projects/newisp/dev/ata/ata-pci.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/ata/ata-pci.h,v 1.69 2006/08/14 19:39:33 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.70 2006/09/02 12:55:42 sos Exp $ */ /* structure holding chipset config info */ @@ -337,6 +337,7 @@ #define ATA_VIA8233C 0x31091106 #define ATA_VIA8235 0x31771106 #define ATA_VIA8237 0x32271106 +#define ATA_VIA8237A 0x05911106 #define ATA_VIA8251 0x33491106 #define ATA_VIA8361 0x31121106 #define ATA_VIA8363 0x03051106 ==== //depot/projects/newisp/dev/bge/if_bge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.140 2006/08/24 14:41:16 oleg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.143 2006/09/03 00:27:41 jmg Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1702,7 +1702,7 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),/* parent */ PAGE_SIZE, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2326,6 +2326,12 @@ } } + /* + * Write the magic number to the firmware mailbox at 0xb50 + * so that the driver can synchronize with the firmware. + */ + bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); + /* Issue global reset */ bge_writereg_ind(sc, BGE_MISC_CFG, reset); @@ -2362,11 +2368,6 @@ CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE); /* - * Prevent PXE restart: write a magic number to the - * general communications memory at 0xB50. - */ - bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); - /* * Poll the value location we just wrote until * we see the 1's complement of the magic number. * This indicates that the firmware initialization ==== //depot/projects/newisp/dev/bge/if_bgereg.h#2 (text+ko) ==== @@ -30,7 +30,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/bge/if_bgereg.h,v 1.52 2006/08/23 11:32:54 glebius Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.54 2006/09/01 22:45:11 davidch Exp $ */ /* @@ -1768,10 +1768,11 @@ } while(0) /* - * This magic number is used to prevent PXE restart when we - * issue a software reset. We write this magic number to the - * firmware mailbox at 0xB50 in order to prevent the PXE boot - * code from running. + * This magic number is written to the firmware mailbox at 0xb50 + * before a software reset is issued. After the internal firmware + * has completed its initialization it will write the opposite of + * this value, ~BGE_MAGIC_NUMBER, to the same location, allowing the + * driver to synchronize with the firmware. */ #define BGE_MAGIC_NUMBER 0x4B657654 ==== //depot/projects/newisp/dev/em/if_em.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.134 2006/08/31 18:49:41 jhb Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.139 2006/09/03 00:27:41 jmg Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -1321,14 +1321,17 @@ INIT_DEBUGOUT("em_media_status: begin"); + EM_LOCK(adapter); em_check_for_link(&adapter->hw); em_update_link_status(adapter); ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; - if (!adapter->link_active) + if (!adapter->link_active) { + EM_UNLOCK(adapter); return; + } ifmr->ifm_status |= IFM_ACTIVE; @@ -1355,6 +1358,7 @@ else ifmr->ifm_active |= IFM_HDX; } + EM_UNLOCK(adapter); } /********************************************************************* @@ -1376,6 +1380,7 @@ if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) return (EINVAL); + EM_LOCK(adapter); switch (IFM_SUBTYPE(ifm->ifm_media)) { case IFM_AUTO: adapter->hw.autoneg = DO_AUTO_NEG; @@ -1412,7 +1417,8 @@ */ adapter->hw.phy_reset_disable = FALSE; - em_init(adapter); + em_init_locked(adapter); + EM_UNLOCK(adapter); return (0); } @@ -1961,7 +1967,7 @@ } -/********************************************************************* +/******************************************************************** * * Determine hardware revision. * @@ -1972,22 +1978,16 @@ device_t dev = adapter->dev; /* Make sure our PCI config space has the necessary stuff set */ + pci_enable_busmaster(dev); + pci_enable_io(dev, SYS_RES_MEMORY); adapter->hw.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); - if ((adapter->hw.pci_cmd_word & PCIM_CMD_BUSMASTEREN) == 0 && - (adapter->hw.pci_cmd_word & PCIM_CMD_MEMEN)) { - device_printf(dev, "Memory Access and/or Bus Master bits " - "were not set!\n"); - adapter->hw.pci_cmd_word |= - (PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN); - pci_write_config(dev, PCIR_COMMAND, adapter->hw.pci_cmd_word, 2); - } /* Save off the information about this board */ adapter->hw.vendor_id = pci_get_vendor(dev); adapter->hw.device_id = pci_get_device(dev); - adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1); - adapter->hw.subsystem_vendor_id = pci_read_config(dev, PCIR_SUBVEND_0, 2); - adapter->hw.subsystem_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); + adapter->hw.revision_id = pci_get_revid(dev); + adapter->hw.subsystem_vendor_id = pci_get_subvendor(dev); + adapter->hw.subsystem_id = pci_get_subdevice(dev); /* Identify the MAC */ if (em_set_mac_type(&adapter->hw)) @@ -2285,7 +2285,7 @@ em_media_status); if ((adapter->hw.media_type == em_media_type_fiber) || (adapter->hw.media_type == em_media_type_internal_serdes)) { - u_char fiber_type = IFM_1000_SX; // default type; + u_char fiber_type = IFM_1000_SX; /* default type; */ if (adapter->hw.mac_type == em_82545) fiber_type = IFM_1000_LX; @@ -2389,7 +2389,7 @@ { int error; - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(adapter->dev), /* parent */ EM_DBA_ALIGN, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2493,7 +2493,7 @@ * Setup DMA descriptor areas. */ size = roundup2(adapter->hw.max_frame_size, MCLBYTES); - if ((error = bus_dma_tag_create(NULL, /* parent */ + if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -2905,7 +2905,7 @@ bzero(adapter->rx_buffer_area, sizeof(struct em_buffer) * adapter->num_rx_desc); - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/newisp/dev/gem/if_gem.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.38 2006/06/02 23:14:39 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.39 2006/09/03 00:27:41 jmg Exp $"); /* * Driver for Sun GEM ethernet controllers. @@ -153,9 +153,10 @@ gem_reset(sc); GEM_UNLOCK(sc); - error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, GEM_NSEGS, - BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_pdmatag); + error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + MCLBYTES, GEM_NSEGS, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, + &sc->sc_pdmatag); if (error) goto fail_ifnet; ==== //depot/projects/newisp/dev/isp/isp_pci.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 3 19:12:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7732216A4E5; Sun, 3 Sep 2006 19:12:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3014016A4E0 for ; Sun, 3 Sep 2006 19:12:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1251843D6B for ; Sun, 3 Sep 2006 19:12:33 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83JCXkw039125 for ; Sun, 3 Sep 2006 19:12:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83JCXOM039122 for perforce@freebsd.org; Sun, 3 Sep 2006 19:12:33 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 3 Sep 2006 19:12:33 GMT Message-Id: <200609031912.k83JCXOM039122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 105609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 19:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=105609 Change 105609 by kmacy@kmacy_storage:sun4v_work_stable on 2006/09/03 19:11:52 undo panic breakage Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_shutdown.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_shutdown.c#3 (text+ko) ==== @@ -506,8 +506,7 @@ static char buf[256]; #ifdef SMP - struct pcpu *pc; - static int cpusprinted = 0; + DELAY(10000000*curcpu); /* * We don't want multiple CPU's to panic at the same time, so we * use panic_cpu as a simple spinlock. We have to keep checking @@ -520,15 +519,6 @@ while (panic_cpu != NOCPU) ; /* nothing */ - if (!cpusprinted) { - SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { - printf("cpu%d tl=%d trapid=%d\n", pc->pc_cpuid, - pc->pc_tl, pc->pc_trapid); - db_trace_thread(pc->pc_curthread, 20); - } - cpusprinted = 1; - } - #endif bootopt = RB_AUTOBOOT | RB_DUMP; From owner-p4-projects@FreeBSD.ORG Sun Sep 3 20:15:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0289116A4DE; Sun, 3 Sep 2006 20:15:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBAC816A4DA for ; Sun, 3 Sep 2006 20:15:56 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7936A43D45 for ; Sun, 3 Sep 2006 20:15:56 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83KFufY049248 for ; Sun, 3 Sep 2006 20:15:56 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83KFumZ049245 for perforce@freebsd.org; Sun, 3 Sep 2006 20:15:56 GMT (envelope-from jmg@freebsd.org) Date: Sun, 3 Sep 2006 20:15:56 GMT Message-Id: <200609032015.k83KFumZ049245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 105612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 20:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=105612 Change 105612 by jmg@jmg_csjp on 2006/09/03 20:15:13 route interrupts using the interrupt-map in hv_pci.c... just pass through the setup_intr and teardown_intr... get the immediate subordinate device for setuping up the interrupt in nexus now that hv_pci passes the calls through... This gets mpt working on the T1k: mpt0: MPI Version=1.5.10.0 mpt0: mpt_cam_event: MPI_EVENT_SAS_DEVICE_STATUS_CHANGE da0 at mpt0 bus 0 target 0 lun 0 da0: Fixed Direct Access SCSI-5 device da0: 300.000MB/s transfers, Tagged Queueing Enabled da0: 76319MB (156301488 512 byte sectors: 255H 63S/T 9729C) Though apprently doesn't fix ata on the T2k... Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/hv_pcivar.h#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/hv_pci.c#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/nexus.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/hv_pcivar.h#2 (text+ko) ==== @@ -31,23 +31,20 @@ #define _HV_PCIVAR_H_ struct hvpci_softc { - devhandle_t hs_devhandle; - phandle_t hs_node; - uint8_t hs_busnum; + devhandle_t hs_devhandle; + phandle_t hs_node; + uint8_t hs_busnum; + + struct ofw_bus_iinfo hs_pci_iinfo; struct bus_dma_tag hs_dmatag; - struct resource *hs_intr[4]; - int hs_intrrefcnt[4]; - - struct rman hs_pci_intr_rman; - - struct rman hs_pci_mem_rman; - bus_space_tag_t hs_pci_memt; + struct rman hs_pci_mem_rman; + bus_space_tag_t hs_pci_memt; bus_space_handle_t hs_pci_memh; - struct rman hs_pci_io_rman; - bus_space_tag_t hs_pci_iot; + struct rman hs_pci_io_rman; + bus_space_tag_t hs_pci_iot; bus_space_handle_t hs_pci_ioh; }; ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/hv_pci.c#2 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include +#include #include #include @@ -71,8 +72,6 @@ static device_attach_t hvpci_attach; static bus_read_ivar_t hvpci_read_ivar; static bus_write_ivar_t hvpci_write_ivar; -static bus_setup_intr_t hvpci_setup_intr; -static bus_teardown_intr_t hvpci_teardown_intr; static bus_alloc_resource_t hvpci_alloc_resource; static bus_activate_resource_t hvpci_activate_resource; static bus_deactivate_resource_t hvpci_deactivate_resource; @@ -98,8 +97,8 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, hvpci_read_ivar), DEVMETHOD(bus_write_ivar, hvpci_write_ivar), - DEVMETHOD(bus_setup_intr, hvpci_setup_intr), - DEVMETHOD(bus_teardown_intr, hvpci_teardown_intr), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, hvpci_alloc_resource), DEVMETHOD(bus_activate_resource, hvpci_activate_resource), DEVMETHOD(bus_deactivate_resource, hvpci_deactivate_resource), @@ -176,14 +175,6 @@ /* Setup the HyperVisor devhandle for this bus */ sc->hs_devhandle = nexus_get_devhandle(dev); - /* initalize intr resources */ - sc->hs_pci_intr_rman.rm_type = RMAN_ARRAY; - sc->hs_pci_intr_rman.rm_descr = "HyperVisor PCI Interrupts"; - if (rman_init(&sc->hs_pci_intr_rman) != 0 || - /* We use 1 (INTA) through 4 (INTD) */ - rman_manage_region(&sc->hs_pci_intr_rman, 1, 4) != 0) - panic("%s: failed to set up intr rman", __func__); - /* Pull in the ra addresses out of OFW */ nrange = OF_getprop_alloc(node, "ranges", sizeof *range, (void **)&range); @@ -248,6 +239,9 @@ free(dvma, M_OFWPROP); + /* Setup ofw imap */ + ofw_bus_setup_iinfo(node, &sc->hs_pci_iinfo, sizeof(ofw_pci_intr_t)); + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); @@ -341,8 +335,24 @@ static int hvpci_route_interrupt(device_t bridge, device_t dev, int pin) { + struct hvpci_softc *sc; + struct ofw_pci_register reg; + phandle_t node; + ofw_pci_intr_t pintr, mintr; + int obli; + uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; - return (pin); + sc = device_get_softc(bridge); + node = ofw_bus_get_node(dev); + pintr = pin; + obli = ofw_bus_lookup_imap(node, &sc->hs_pci_iinfo, ®, sizeof(reg), + &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf); + device_printf(dev, "called hvpci_route_intr: %d, got: mintr: %#x\n", + obli, mintr); + if (obli) + return (mintr); + + panic("pin %d not found in imap of %s", pin, device_get_nameunit(bridge)); } static phandle_t @@ -419,74 +429,6 @@ return (ENOENT); } -static int -hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, - int flags, driver_intr_t *intr, void *arg, void **cookiep) -{ - struct hvpci_softc *sc; - int pciintr, rid; - int error; - - - sc = device_get_softc(dev); - - rid = rman_get_start(ires); - KASSERT(rid >= 1 && rid <= 4, ("interrupt out of range")); - - pciintr = rid - 1; - if (sc->hs_intr[pciintr] == NULL) { - if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, - SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { - device_printf(dev, "couldn't alloc interrupt\n"); - return (ENXIO); - } - sc->hs_intrrefcnt[pciintr] = 1; - } else - sc->hs_intrrefcnt[pciintr]++; - - error = bus_setup_intr(dev, sc->hs_intr[pciintr], flags, intr, arg, - cookiep); - if (error) { - sc->hs_intrrefcnt[pciintr]--; - if (sc->hs_intrrefcnt[pciintr] == 0) { - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), - sc->hs_intr[pciintr]); - sc->hs_intr[pciintr] = NULL; - } - device_printf(dev, "bus_setup_intr: %d\n", error); - return (error); - } - return (0); -} - -static int -hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec, - void *cookie) -{ - struct hvpci_softc *sc; - int pciintr; - int error; - - sc = device_get_softc(dev); - pciintr = rman_get_start(vec); - KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); - pciintr--; - - error = bus_teardown_intr(dev, sc->hs_intr[pciintr], cookie); - if (error) - return (error); - - sc->hs_intrrefcnt[pciintr]--; - if (sc->hs_intrrefcnt[pciintr] == 0) { - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); - sc->hs_intr[pciintr] = NULL; - } - - return (0); -} - static struct resource * hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -505,11 +447,8 @@ switch (type) { case SYS_RES_IRQ: - if (end - start != 0) - return NULL; - rm = &sc->hs_pci_intr_rman; - bt = NULL; - bh = 0; + return BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, + rid, start, end, count, flags); break; case SYS_RES_MEMORY: @@ -532,12 +471,6 @@ } rv = rman_reserve_resource(rm, start, end, count, flags, child); -#ifdef DEBUG - if (type == SYS_RES_IRQ) { - printf("%s: reserve_resource: start: %ld, end: %ld, flags: %#x, rv: %p\n", - __func__, start, end, flags, rv); - } -#endif if (rv == NULL) return (NULL); ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/nexus.c#3 (text+ko) ==== @@ -306,11 +306,17 @@ driver_intr_t *intr, void *arg, void **cookiep) { struct nexus_devinfo *ndi; + device_t ichild; uint64_t ihdl; uint64_t ino; int error, cpuid; - ndi = device_get_ivars(child); + /* we need the devinfo from the immediate child */ + ichild = child; + while (device_get_parent(ichild) != dev) + ichild = device_get_parent(ichild); + + ndi = device_get_ivars(ichild); if (res == NULL) panic("%s: NULL interrupt resource!", __func__); From owner-p4-projects@FreeBSD.ORG Sun Sep 3 20:46:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C481016A4E0; Sun, 3 Sep 2006 20:46:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66FA716A4DE for ; Sun, 3 Sep 2006 20:46:36 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 387F443D46 for ; Sun, 3 Sep 2006 20:46:36 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83KkamW051636 for ; Sun, 3 Sep 2006 20:46:36 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83KkaKr051632 for perforce@freebsd.org; Sun, 3 Sep 2006 20:46:36 GMT (envelope-from jmg@freebsd.org) Date: Sun, 3 Sep 2006 20:46:36 GMT Message-Id: <200609032046.k83KkaKr051632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 105614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 20:46:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=105614 Change 105614 by jmg@jmg_carbon-60 on 2006/09/03 20:46:06 debugging for ata on t2k.. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -665,6 +665,7 @@ device_t master_child = NULL, slave_child = NULL; int master_unit = -1, slave_unit = -1; + device_printf(dev, "ata_identify\n"); if (ch->devices & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) { if (!(master = malloc(sizeof(struct ata_device), M_ATA, M_NOWAIT | M_ZERO))) { @@ -700,15 +701,18 @@ slave = NULL; } + device_printf(dev, "slave ata_getparam\n"); if (slave && ata_getparam(slave, 1)) { device_delete_child(dev, slave_child); free(slave, M_ATA); } + device_printf(dev, "master ata_getparam\n"); if (master && ata_getparam(master, 1)) { device_delete_child(dev, master_child); free(master, M_ATA); } + device_printf(dev, "probe and attach\n"); bus_generic_probe(dev); bus_generic_attach(dev); return 0; From owner-p4-projects@FreeBSD.ORG Sun Sep 3 21:01:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82EDE16A4E1; Sun, 3 Sep 2006 21:01:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D28916A4DD for ; Sun, 3 Sep 2006 21:01:58 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EFA343D4C for ; Sun, 3 Sep 2006 21:01:56 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k83L1tka061293 for ; Sun, 3 Sep 2006 21:01:55 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k83L1tIQ061290 for perforce@freebsd.org; Sun, 3 Sep 2006 21:01:55 GMT (envelope-from jmg@freebsd.org) Date: Sun, 3 Sep 2006 21:01:55 GMT Message-Id: <200609032101.k83L1tIQ061290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 105615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Sep 2006 21:01:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=105615 Change 105615 by jmg@jmg_carbon-60 on 2006/09/03 21:01:05 add a bit more debugging.. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.c#3 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.h#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-queue.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.c#3 (text+ko) ==== @@ -571,6 +571,7 @@ u_int8_t command = 0; int error = ENOMEM, retries = 2; + device_printf(atadev->dev, "ata_getparam called\n"); if (ch->devices & (atadev->unit == ATA_MASTER ? ATA_ATA_MASTER : ATA_ATA_SLAVE)) command = ATA_ATA_IDENTIFY; @@ -592,10 +593,12 @@ request->bytecount = sizeof(struct ata_params); request->donecount = 0; request->transfersize = DEV_BSIZE; + device_printf(atadev->dev, "ata_queue_request called\n"); ata_queue_request(request); error = request->result; ata_free_request(request); } + device_printf(atadev->dev, "ata_queue_request done\n"); if (!error && (isprint(atadev->param.model[0]) || isprint(atadev->param.model[1]))) { ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-all.h#4 (text+ko) ==== @@ -357,7 +357,7 @@ }; /* define this for debugging request processing */ -#if 0 +#if 1 #define ATA_DEBUG_RQ(request, string) \ { \ if (request->flags & ATA_R_DEBUG) \ ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-queue.c#3 (text+ko) ==== @@ -63,6 +63,7 @@ (request->callback)(request); return; } + device_printf(request->dev, "in ata_queue_request\n"); ch = device_get_softc(request->parent); callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED); if (!request->callback && !(request->flags & ATA_R_REQUEUE)) From owner-p4-projects@FreeBSD.ORG Mon Sep 4 04:02:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4544016A4EA; Mon, 4 Sep 2006 04:02:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E572516A4E8 for ; Mon, 4 Sep 2006 04:02:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5ED443D46 for ; Mon, 4 Sep 2006 04:02:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8442sYv098170 for ; Mon, 4 Sep 2006 04:02:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8442sdY098167 for perforce@freebsd.org; Mon, 4 Sep 2006 04:02:54 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 4 Sep 2006 04:02:54 GMT Message-Id: <200609040402.k8442sdY098167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 105631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 04:02:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=105631 Change 105631 by kmacy@kmacy_storage:sun4v_work_stable on 2006/09/04 04:02:02 add support for obtaining a virtual device handle this allows us to query machine description node attributes for the device (local-mac-address, tx-ino, rx-ino) Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.sun4v#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/cddl/mdesc.h#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/mdesc_bus.h#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/mdesc_bus_subr.h#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/mdesc/mdesc_bus_if.m#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/mdesc/mdesc_bus_subr.c#2 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 add Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/conf/files.sun4v#4 (text+ko) ==== @@ -112,4 +112,4 @@ sun4v/mdesc/mdesc_findname.c standard sun4v/mdesc/mdesc_nodecount.c standard sun4v/mdesc/mdesc_findnodeprop.c standard - +sun4v/mdesc/mdesc_vdevfindval.c standard ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/cddl/mdesc.h#2 (text+ko) ==== @@ -177,6 +177,9 @@ #include extern int md_get_prop_alloc(md_t *, mde_cookie_t, char *, int, uint8_t **); +extern int md_vdev_find_val(device_t dev, char *namep, + uint64_t *valp); + MALLOC_DECLARE(M_MDPROP); extern void mdesc_init(void); ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/mdesc_bus.h#2 (text+ko) ==== @@ -34,4 +34,11 @@ return (MDESC_BUS_GET_TYPE(device_get_parent(dev), dev)); } +static __inline uint64_t +mdesc_bus_get_handle(device_t dev) +{ + + return (MDESC_BUS_GET_HANDLE(device_get_parent(dev), dev)); +} + #endif /* !_MACHINE_MDESC_BUS_H_ */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/mdesc_bus_subr.h#2 (text+ko) ==== @@ -14,5 +14,6 @@ mdesc_bus_get_compat_t mdesc_bus_gen_get_compat; mdesc_bus_get_name_t mdesc_bus_gen_get_name; mdesc_bus_get_type_t mdesc_bus_gen_get_type; +mdesc_bus_get_handle_t mdesc_bus_gen_get_handle; #endif /* !_MACHINE_MDESC_MDESC_BUS_SUBR_H_ */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/mdesc/mdesc_bus_if.m#2 (text+ko) ==== @@ -82,6 +82,13 @@ return (NULL); } + + static uint64_t + mdesc_bus_default_get_handle(device_t bus, device_t dev) + { + + return (0); + } }; # Get the mdesc_bus_devinfo struct for the device dev on the bus. Used for bus @@ -113,3 +120,8 @@ device_t bus; device_t dev; } DEFAULT mdesc_bus_default_get_type; + +METHOD uint64_t get_handle { + device_t bus; + device_t dev; +} DEFAULT mdesc_bus_default_get_handle; ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/mdesc/mdesc_bus_subr.c#2 (text+ko) ==== @@ -84,6 +84,21 @@ return (mbd->mbd_type); } +uint64_t +mdesc_bus_gen_get_handle(device_t bus, device_t dev) +{ + const struct mdesc_bus_devinfo *mbd; + + mbd = MDESC_BUS_GET_DEVINFO(bus, dev); + if (mbd == NULL) + return (0); + return (mbd->mbd_handle); +} + + + + + From owner-p4-projects@FreeBSD.ORG Mon Sep 4 05:12:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B16AD16A4E2; Mon, 4 Sep 2006 05:12:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88EBE16A4DA for ; Mon, 4 Sep 2006 05:12:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B0EA43D46 for ; Mon, 4 Sep 2006 05:12:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k845CPlG011650 for ; Mon, 4 Sep 2006 05:12:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k845CJ7S011647 for perforce@freebsd.org; Mon, 4 Sep 2006 05:12:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 4 Sep 2006 05:12:19 GMT Message-Id: <200609040512.k845CJ7S011647@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 105632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 05:12:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=105632 Change 105632 by rwatson@rwatson_zoo on 2006/09/04 05:12:01 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - freebsd-update(8) client - gcc update - lukemftpd(8) update - TLS for ppc, ia64, etc. - further umtx cleanup, optimization - __getpath_fromfd(), __getpath_fromaddr() - tip(1) sync to OpenBSD TrustedBSD related: - OpenBSM 1.0a10 - auditpipe maxauditdata ioctl - More AUE_ assignments for native system calls. - Trimmage of unneeded susers in svr4 - execve auditing - mac/mpo_associate_nfsd_label - su(1) audit support Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#42 integrate .. //depot/projects/trustedbsd/base/UPDATING#70 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ansidecl.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-objc-common.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgcleanup.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.host#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.in#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/hpux.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix51.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/gmon-sol2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/x-linux#5 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/configure#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.ac#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/coverage.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.def#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/method.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppfiles.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpphash.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppinit.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cse.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/contrib.texi#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gcc-common.texi#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expmed.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/g77.texi#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/g77spec.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/flow.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcov.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcse.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ggc-common.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/global.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/local-alloc.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/longlong.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/md5.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/md5.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mips-tdump.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mips-tfile.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mklibgcc.in#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/optabs.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reg-stack.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regrename.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regs.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.h#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-rgn.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/simplify-rtx.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stmt.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unroll.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog#13 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/ChangeLog#15 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog#16 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/c++config#14 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/fstream.tcc#10 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_std/std_cmath.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/cmds.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/conf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/extern.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpcmd.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.conf.5#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/logutmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/logwtmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/pathnames.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/popen.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/version.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#5 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_internal.h#4 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_kevents.h#4 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#5 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#6 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#50 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#21 integrate .. //depot/projects/trustedbsd/base/etc/freebsd-update.conf#1 branch .. //depot/projects/trustedbsd/base/etc/hosts.allow#9 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#17 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#43 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.var.dist#14 integrate .. //depot/projects/trustedbsd/base/etc/periodic/weekly/120.clean-kvmdb#2 delete .. //depot/projects/trustedbsd/base/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/phones#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/powerd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.initdiskless#7 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#53 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libbsm/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tls.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#31 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/pthread_md.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/sdp.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/util.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex_prioceiling.c#4 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex_protocol.c#4 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#23 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_seterrno.c#3 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sigmask.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/nbsd2fbsd.h#3 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/nbsd_pidfile.h#1 branch .. //depot/projects/trustedbsd/base/libexec/lukemftpd/pamize.h#2 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/reloc.c#14 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/rtld_machdep.h#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/reloc.c#7 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#32 integrate .. //depot/projects/trustedbsd/base/libexec/save-entropy/save-entropy.sh#3 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#109 integrate .. //depot/projects/trustedbsd/base/release/scripts/kernels-install.sh#3 integrate .. //depot/projects/trustedbsd/base/release/scripts/lib32-install.sh#1 branch .. //depot/projects/trustedbsd/base/release/scripts/proflibs-install.sh#2 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#26 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/audit.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/auditpipe.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dummynet.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gem.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipfirewall.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ixgb.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/sbus.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sio.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#24 integrate .. //depot/projects/trustedbsd/base/share/man/man5/freebsd-update.conf.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#20 integrate .. //depot/projects/trustedbsd/base/share/man/man8/Makefile#12 integrate .. //depot/projects/trustedbsd/base/share/man/man8/nanobsd.8#1 branch .. //depot/projects/trustedbsd/base/share/man/man8/picobsd.8#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/fusu.S#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#18 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/asm.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stat.c#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#76 integrate .. //depot/projects/trustedbsd/base/sys/crypto/sha2/sha2.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahd_pci.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#58 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#56 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_sbus.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ispfw/ispfw.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirmio.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/support.s#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#24 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/support.S#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/bus_if.m#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#80 integrate .. //depot/projects/trustedbsd/base/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#51 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#51 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#38 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_ati.c#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/copyinout.c#9 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#33 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#44 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.S#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/_bus_dma.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/bus.h#20 integrate .. //depot/projects/trustedbsd/base/sys/sys/bus_dma.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/msgbuf.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#57 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#57 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#39 integrate .. //depot/projects/trustedbsd/base/sys/sys/umtx.h#9 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#66 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#34 integrate .. //depot/projects/trustedbsd/base/tools/tools/ministat/ministat.c#8 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/http/http.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/less/lesspipe.sh#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#24 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/NEWS#2 delete .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/biz22.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/biz31.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/courier.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/df.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/dn11.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/hayes.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/t3000.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/v3451.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/v831.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/libacu/ventel.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/acu.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/acutab.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/cmds.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/cmdtab.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/cu.1#1 branch .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/cu.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/hunt.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/log.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/partab.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/pathnames.h#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/remote.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/tip.1#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/tip.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/tip.h#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/tipout.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/uucplock.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/value.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/vars.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/vgrind/vgrind.1#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#55 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/crontab/crontab.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/eeprom/eeprom.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/eeprom/ofw_options.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/freebsd-update/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/freebsd-update/freebsd-update.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/freebsd-update/freebsd-update.sh#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#27 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#25 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watchdogd/watchdog.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watchdogd/watchdogd.8#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#42 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.139 2006/07/11 06:09:54 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -118,6 +118,7 @@ linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. +freebsd-update cperciva Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/trustedbsd/base/UPDATING#70 (text+ko) ==== @@ -44,6 +44,13 @@ the nve(4) driver. Please update your configuration accordingly. +20060514: + The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx + PCnet family of NICs has been removed. The new le(4) driver serves + as an equivalent but cross-platform replacement with the pcn(4) + driver still providing performance-optimized support for the subset + of AMD Am79C971 PCnet-FAST and greater chips as before. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -603,4 +610,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ +$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $ ==== //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#17 (text+ko) ==== @@ -1,3 +1,822 @@ +2006-04-25 Nick Clifton + + * config/m32r/m32r.c (gen_compare): Fix reg/smallconst equal code, + the patch for which was accidentally omitted from the previous + commit. + +2006-04-04 Kazuhiro Inaoka + + PR target/26775 + PR target/26776 + * config/m32r/m32r.c (m32r_output_function_epilogue): Case for + a large stack frame at epilogue. Use fp to recover a stack + pointer for alloca function at epilogue. + + PR target/36276 + * config/m32r/m32r.c (gen_compare): Removed a rule addsi3 codes + to avoid a miss optimizing at simplify_relational_operation(). + * config/m32r/m32r.md (seq): Ditto. Changed reg_or_eq_int16_operand + to reg_or_uint16_operand because seq_insn has not used addsi3 already. + (seq_insn): Ditto. Removed operand check mode "P". Changed + reg_or_eq_int16_operand to reg_or_uint16_operand. + +2006-03-05 Release Manager + + * GCC 3.4.6 released. + +2006-03-01 Gabriel Dos Reis + + Backport + 2005-11-03 James E Wilson + + PR preprocessor/24202 + * cppfiles.c (_cpp_pop_file_buffer): Set buffer_valid to false. + +2006-03-01 Alan Modra + + PR target/21616 + Revert most of 2004-03-10 changes, apply mainline 2005-01-07. + * config/rs6000/rs6000.c (invalid_gpr_mem): Delete. + (base_reg_operand): Delete. + (legitimate_offset_address_p): Revert 2004-03-10 changes. + (secondary_reload_class): Likewise. + (rs6000_legitimize_reload_address): Convert non-word aligned + offset address using ld/std into indirect address. + * config/rs6000/rs6000.h (SECONDARY_RELOAD_CLASS): Define. + (SECONDARY_INPUT_RELOAD_CLASS, SECONDARY_OUTPUT_RELOAD_CLASS): Delete. + (PREDICATE_CODES): Delete invalid_gpr_mem and base_reg_operand. + * config/rs6000/rs6000-protos.h (secondary_reload_class): Update. + * config/rs6000/rs6000.md (movdf_hardfloat64): Remove m->b + alternative and split. + (movdi_internal64): Likewise. + (reload_outdf, reload_indf, reload_outdi, reload_indi): Delete. + +2006-02-28 Gabriel Dos Reis + + Backport + 2004-04-28 Serge Belyshev <1319@bot.ru> + + PR 14944 + * coverage.c (read_counts_file): Fix usage of warning () call. + * pretty-print.c (pp_base_format_text): Fix typo in the comment. + +2006-02-18 Olivier Hainque + + PR ada/13408 + * pa.h (WIDEST_HARDWARE_FP_SIZE): Define. + +2006-02-13 Kaveh R. Ghazi + + Backport: + 2006-02-01 Steve Ellcey + + PR middle-end/24901 + * fold-const.c (fold_checksum_tree): Change type of buf. + +2006-02-11 Kaveh R. Ghazi + + * doc/contrib.texi: Update my entry. + +2006-02-09 Eric Botcazou + + * config/sparc/sparc.c (tls_call_delay): Fix oversight. + +2006-02-07 John David Anglin + + PR target/26109 + * pa.c (attr_length_indirect_call): Don't return length 8 for distances + >= 240000 when generating code for SOM runtime. + (output_indirect_call): Don't use "b,l" instruction for indirect calls + to $$dyncall when generating code for SOM runtime.. + +2006-02-02 Nick Clifton + + PR 24376 + * sched-rgn.c (add_branch_dependences): For cc0 targets extend + the dependencies inside a block back to the very first cc0 setter + in the block. + +2006-01-21 Joseph S. Myers + + * gcc.c (process_command), gcov.c (print_version), gcov-dump.c + (print_version), mips-tdump.c (main), mips-tfile.c (main): Update + copyright notice dates. + +2006-01-12 Kaz Kojima + + PR target/25613 + * config/sh/sh.h (CONSTRAINT_LEN): Use unchecking version. + +2005-12-30 Roger Sayle + + PR target/25213 + Backport from mainline + 2005-09-06 Jakub Jelinek + + PR rtl-optimization/23098 + * cse.c (fold_rtx_mem): Call delegitimize_address target hook. + * simplify-rtx.c (constant_pool_reference_p): New function. + * rtl.h (constant_pool_reference_p): New prototype. + * config/i386/i386.md (pushf split, mov[sdx]f split): Use + constant_pool_reference_p in condition and + avoid_constant_pool_reference in preparation statements. + +2005-12-30 John David Anglin + + PR fortran/25586 + * pa.md: Remove REG_POINTER check from REG+REG peephole2 floating-point + store patterns. + +2005-12-29 Alan Modra + + PR target/25572 + * config/rs6000/rs6000.c (create_TOC_reference): Set regs_ever_live. + +2005-12-17 Steven Bosscher + + PR rtl-optimization/23837 + * optabs.c (expand_binop): For a multi-word rotate, never emit + a REG_NO_CONFLICT block. + +2005-12-16 John David Anglin + + Backport from mainline: + 2004-11-01 Mike Stump + + * inclhack.def (stdio_va_list): Break out clients from here... + (stdio_va_list_clients): ...to here. Also, don't fix if stdarg.h is + included or ifdef va_start. + * fixincl.x: Regenerate. + +2005-12-13 Alan Modra + + * config/rs6000/linux64.h (TARGET_ALIGN_NATURAL): Define. + +2005-12-10 John David Anglin + + PR target/25258 + * pa.c (som_text_section_asm_op): Use .NSUBSPA directive when changing + to the text subspace to output debugging information. + +2005-12-06 Alan Modra + + PR other/13873 + * longlong.h: Merge PPC tests from upstream. + +2005-12-03 Kaveh R. Ghazi + + PR middle-end/25022 + * builtins.c (expand_builtin_fputs, expand_builtin_printf, + expand_builtin_fprintf): Lookup the explicit replacement functions + for any unlocked stdio builtin transformations. + + * builtins.c (expand_builtin_fputs): Defer check for missing + replacement functions. + +2005-12-02 Volker Reichelt + + PR c++/24103 + Backport: + 2002-08-22 Diego Novillo + + * tree.c (simple_cst_equal): Call simple_cst_list_equal to compare + CONSTRUCTOR_ELTS pointers. + +2005-12-01 Gabriel Dos Reis + + * version.c: Bump version number. + * doc/include/gcc-common.texi: Likewise. + +2005-11-30 Release Manager + + * GCC 3.4.5 released. + +2005-11-23 Alan Modra + + PR middle-end/24950 + * expmed.c (store_bit_field): Don't attempt to insv a field + larger than the reg. + + Merge from trunk + 2005-11-14 Dale Johannesen + * expmed.c (store_bit_field): Add offset unconditionally for + memory targets. + (extract_bit_field): Don't force extzv or extv operand into + a register if field is too big. + 2004-12-01 Richard Henderson + * expmed.c (store_bit_field): Use simplify_gen_subreg instead + of gen_rtx_SUBREG directly. + +2005-11-16 Steve Ellcey + + PR target/24718 + * mklibgcc.in: Create dummy object for libgcc_eh.a + * config/ia64/hpux.h (LIBGCC_SPEC): Remove. + +2005-11-13 Andreas Jaeger + + * fixinc/check.tpl: Handle CVS additionally. + +2005-11-10 Uros Bizjak + + PR target/24315 + * config/i386/i386.md (*pushdi2_rex64 splitter) + (*movdi_1_rex64 splitter): Delay splitting after + flow2 pass only when (optimize > 0 && flag_peephole2). + +2005-11-10 Uros Bizjak + + PR target/19340 + * reg-stack.c (reg_to_stack): Update register liveness also + for flag_sched2_use_traces. + +2005-11-09 Per Bothner + Uros Bizjak + + PR c/24101 + * toplev.c (process_options): Initialize debug_hooks early + in case lang_hooks.post_options ends up calling a debug_hook. + * cppinit.c (read_original_filename): Temporarily set + state.in_directive before calling _cpp_lex_direct for + CPP_HASH tokens. + +2005-11-07 Steve Ellcey + + PR bootstrap/24688 + * fixinc/inclhack.def (sco_math): Add bypass. + * fixinc/fixincl.x: Regenerate. + +2005-11-07 James E Wilson + + PR preprocessor/15220 + * cppfiles.c (_cpp_find_file): New parameter angle_brackets. Fix all + callers. Pass to open_file_failed. + (open_file_failed): New parameter angle_brackets. Fix + all callers. use in print_dep assignment. + * cpphash.h (_cpp_find_file): Add new parm to declaration. + * cppinit.c (cpp_read_main_file): Pass another arg to _cpp_find_file. + +2005-11-05 Andreas Jaeger + + * fixinc/check.tpl: Adopt for move to subversion. + +2005-11-03 Richard Guenther + + PR middle-end/24470 + * fold-const.c (fold): Avoid running in circles if we + got some un-folded subtree. + +2005-10-30 Alan Modra + + PR target/23070 + * config/rs6000/rs6000.c (function_arg): For ABI_V4 calls to + stdarg functions, set/clear the fp marker even when no variable + args are passed. + * config/rs6000/sysv4.h (SUBTARGET_SWITCHES): Describe + -mprototype and -mno-prototype. + +2005-10-21 Alan Modra + + PR target/24465 + * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Always + use r2 for 64-bit tls .got access. + +2005-10-19 Paolo Bonzini + + * dojump.c (do_jump): Revert the last patch as it breaks Ada. + +2005-10-19 Paolo Bonzini + + PR #19672 + * dojump.c (do_jump): Handle TRUTH_AND_EXPR and TRUTH_OR_EXPR + like TRUTH_ANDIF_EXPR and TRUTH_ORIF_EXPR, if the branch cost + is low enough. + +2005-10-09 Eric Botcazou + + * config/sparc/gmon-sol2.c (internal_mcount): Mark as used. + +2005-10-08 Janis Johnson + + PR debug/24267 + Partial backport from mainline + 2004-05-04 Paolo Bonzini + Richard Henderson + * tree.c (make_or_reuse_type): New. + (build_common_tree_nodes): Use it. + + PR target/18583 + Partial backport from mainline + 2004-05-04 Paolo Bonzini + Richard Henderson + * c-common.c (vector_types_convertible_p): New function. + * c-common.h: Declare it. + * c-typeck.c (digest_init): Use it. + +2005-10-07 James E Wilson + + PR target/23644 + * doc/invoke.texi (IA-64 Options, item -mtune): Renamed from + -mtune-arch. + +2005-10-01 Richard Earnshaw + + PR target/23985 + Back-port 2004-08-19 Richard Henderson + * config/arm/arm.c (arm_gen_load_multiple): Use + adjust_automodify_address. Take base memory and offset instead + of unchanging/struct/scalar bits. + (arm_gen_store_multiple): Likewise. + (arm_gen_movstrqi): Use adjust_automodify_address. + * config/arm/arm-protos.h: Update decls. + * config/arm/arm.md (load_multiple): Update arm_gen_load_multiple call. + (store_multiple): Similarly. + +2005-09-29 Alan Modra + + PR target/24102 + * config/rs6000/rs6000.md (floatdisf2_internal2): Correct range + check for numbers that need no bit twiddle. + +2005-09-09 Richard Guenther + + PR c/20239 + * cppinit.c (cpp_read_main_file): Avoid segfaulting on + NULL pfile->map. + +2005-09-09 Richard Guenther + + PR c++/23624 + * fold-const.c (fold): Check truth_value_p before calling + invert_truthvalue. + +2005-09-08 Craig Rodrigues + + Backport from mainline + 2005-09-01 Craig Rodrigues + + * c-decl.c (diagnose_mismatched_decls): With -Wredundant-decls, + do not issue warning for a variable definition following + a declaration. + +2005-09-02 Richard Sandiford + + PR c/22061 + * c-decl.c (push_parm_decl): Push and pop x_dont_save_pending_sizes_p + around the call to grokdeclarator. Call grokdeclarator with the + field set to 0. + (store_parm_decls): Always store the pending_sizes in cfun. + (c_expand_body_1): Call put_pending_sizes. + * c-objc-common.c (c_cannot_inline_tree_fn): Always check + pending_sizes. + +2005-09-01 Jakub Jelinek + + PR rtl-optimization/23478 + * regs.h (reg_info): Add throw_calls_crossed. + (REG_N_THROWING_CALLS_CROSSED): Define. + * flow.c (allocate_reg_life_data): Initialize + REG_N_THROWING_CALLS_CROSSED. + (propagate_one_insn, attempt_auto_inc): Update + REG_N_THROWING_CALLS_CROSSED. + * local-alloc.c (struct qty): Add n_throwing_calls_crossed field. + (alloc_qty): Initialize it. + (update_equiv_regs): Clear REG_N_THROWING_CALLS_CROSSED. + (combine_regs): Combine also n_throwing_calls_crossed fields. + (find_free_reg): Don't attempt to caller-save pseudos crossing + calls that might throw. + * global.c (struct allocno): Add throwing_calls_crossed field. + (global_alloc): Initialize throwing_calls_crossed. + (find_reg): Don't attempt to caller-save pseudos crossing calls that + might throw. + +2005-09-01 Richard Earnshaw + + PR rtl-optimization/17810 target/15342 + * regrename.c: Fix polluted patch in previous change. + +2005-09-01 Richard Earnshaw + + PR rtl-optimization/17810 + Backport + 2004-11-04 Richard Sandiford + PR target/15342 + * regrename.c (scan_rtx): Treat the destinations of SETs and CLOBBERs + as OP_INOUT if the instruction is predicated. + +2005-08-31 David Edelsohn + + PR target/23539 + Backport from mainline: + + 2005-08-27 David Edelsohn + * config/rs6000/rs6000.c (expand_block_move): Use HImode when + bytes >= 2 not bytes == 2. + +2005-08-21 Jakub Jelinek + + * simplify-rtx.c (simplify_immed_subreg) : Only + clear up to elem_bitsize bits, not max_bitsize. + +2005-07-20 Steve Ellcey + + PR target/21841 + * doc/invoke.texi (-mgnu-ld): Update description. + (-mhp-ld): Ditto. + +2005-08-09 Paolo Bonzini + + PR rtl-optimization/17860 + * loop.c (check_dbra_loop): Do not try to use an end condition + like "i != 0" in the reversed loop. + +2005-08-08 Josh Conner + + PR rtl-optimization/23241 + * combine.c (simplify_comparison): Fix error in determining + whether to lift a subreg from comparison. + +2005-08-08 Richard Sandiford + + PR middle-end/21964 + * stmt.c (tail_recursion_args): Insert a call to emit_queue. + +2005-08-08 Richard Sandiford + + PR c/22458 + * c-decl.c (c_begin_compound_stmt): Set the initial body to + error_mark_node, not NULL. + +2005-08-07 John David Anglin + + * pa64-regs.h (CONDITIONAL_REGISTER_USAGE): Fix loop upper bound. + +2005-08-06 John David Anglin + + PR pch/14940 + Backport from mainline: + + * config.host (hppa*-*-hpux*, hppa*-*-linux): Define out_host_hook_obj + and host_xmake_file using new host configuration files. + * config/pa/pa-host.c, config/pa/x-hpux, config/pa/x-linux: New files. + +2005-08-06 Christian Joensson + + PR target/20673 + Backport from mainline: + + 2005-04-15 David S. Miller + + * config/sparc/sparc.h (sparc_hard_reg_printed): Mark as GTY(()). + +2005-08-05 John David Anglin + + * pa.c (function_arg): Fix typo in last change. + + * pa.c (function_value): Handle small aggregates on 32-bit targets. + (function_arg): Pass small aggregates in general registers on 32-bit + targets. + * som.h (MEMBER_TYPE_FORCES_BLK): Delete define. + +2005-08-04 Gerald Pfeifer + + * doc/install.texi (Specific): Adjust link to openavr.org. + (Specific): Remove broken reference to GCC 2.8.1 for OS/2. + (Binaries): Adjust HP-UX Porting Center link. + (Binaries): Adjust Free Software Foundation ordering link. + (Binaries): Remove broken link to Sinix/Reliant Unix binaries. + +2005-08-04 Eric Botcazou + + * doc/invoke.texi (Optimize Options): Document that -funswitch-loops + is enabled at -O3. + +2005-08-03 John David Anglin + + PR target/21723 + * pa.md: Remove fcpy alternative from movhi and movqi patterns. + * pa32-regs.h (HARD_REGNO_NREGS): Return two floating point registers + for complex modes when generating code for PA 1.0. + (VALID_FP_MODE_P): New macro. + (HARD_REGNO_MODE_OK): Use VALID_FP_MODE_P. Use non-overlapping register + sets for all general and floating point modes. Align wide floating + point modes to even register boundaries to comply with architectural + requirements. + (CLASS_MAX_NREGS): Update to align with change to HARD_REGNO_NREGS. + * pa64-regs.h (HARD_REGNO_NREGS): Update comment and formatting. + (VALID_FP_MODE_P): New macro. + (HARD_REGNO_MODE_OK): Use VALID_FP_MODE_P. Use non-overlapping register + sets for all general and floating point modes. Align wide floating + point modes to even register boundaries to comply with architectural + requirements. + +2005-08-03 Richard Sandiford + + PR target/18582 + * config/i386/i386.c (ix86_expand_unop_builtin): Force the target + to be a register if do_load is true. + +2005-08-02 Ian Lance Taylor + + PR pch/14400 + Backport from mainline: + + 2005-08-01 Ian Lance Taylor + + * config/host-linux.c (linux_gt_pch_get_address): Add new name + randomize_va_space for virtual address randomization control. + + 2005-02-15 James A. Morrison + + PR pch/14940 + PR target/19300 + * config/host-linux.c (linux_gt_pch_use_address): Copy from + config/pa/pa-host.c:pa_gt_pch_use_address. + + 2004-11-09 James A. Morrison + + PR pch/14940 + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Add __sparc__ + definitions. + + 2004-10-15 Jon Grimm + + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Add __powerpc__ + definition. + + 2004-04-24 Ulrich Weigand + + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __s390__ + and __s390x__ hosts. + + 2004-04-08 Ian Lance Taylor + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Return 1 if file was successfully mapped. + + 2004-03-15 Ian Lance Taylor + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Fix the check for abort and only do the mmap if we can. + + 2004-03-12 Andrew Pinski + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 4 05:22:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EACD916A4DF; Mon, 4 Sep 2006 05:22:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC1C816A4DA for ; Mon, 4 Sep 2006 05:22:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE6F43D53 for ; Mon, 4 Sep 2006 05:22:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k845Mekt015043 for ; Mon, 4 Sep 2006 05:22:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k845Mctn015040 for perforce@freebsd.org; Mon, 4 Sep 2006 05:22:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 4 Sep 2006 05:22:38 GMT Message-Id: <200609040522.k845Mctn015040@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 105633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 05:22:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=105633 Change 105633 by rwatson@rwatson_zoo on 2006/09/04 05:21:42 Integrate TrustedBSD privilege branch from TrustedBSD base branch; see @105632 for a description of changes merged. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/asm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/support.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/bus_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exec.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thread.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_bus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.master#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/agp_ati.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/_bus_dma.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/bus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/bus_dma.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/msgbuf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sx.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/umtx.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/support.S#2 (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/amd64/amd64/support.S,v 1.119 2006/08/16 22:22:28 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.120 2006/08/28 02:28:14 davidxu Exp $ */ #include "opt_ddb.h" @@ -314,6 +314,34 @@ ret /* + * casuword32. Compare and set user integer. Returns -1 or the current value. + * dst = %rdi, old = %rsi, new = %rdx + */ +ENTRY(casuword32) + movq PCPU(CURPCB),%rcx + movq $fusufault,PCB_ONFAULT(%rcx) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rdi /* verify address is valid */ + ja fusufault + + movl %esi,%eax /* old */ +#ifdef SMP + lock +#endif + cmpxchgl %edx,(%rdi) /* new = %edx */ + + /* + * The old value is in %eax. If the store succeeded it will be the + * value we expected (old) from before the store, otherwise it will + * be the current value. + */ + + movq PCPU(CURPCB),%rcx + movq $0,PCB_ONFAULT(%rcx) + ret + +/* * casuptr. Compare and set user pointer. Returns -1 or the current value. * dst = %rdi, old = %rsi, new = %rdx */ ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.4 2006/08/15 12:54:29 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.5 2006/08/27 08:56:53 netchild Exp $"); #include #include @@ -77,7 +77,6 @@ DUMMY(timer_gettime); DUMMY(timer_getoverrun); DUMMY(timer_delete); -DUMMY(statfs64); DUMMY(fstatfs64); DUMMY(utimes); DUMMY(fadvise64_64); ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.16 2006/08/25 11:59:56 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); #include #include @@ -570,24 +570,24 @@ } } - if (args->flags & CLONE_PARENT) { -#ifdef DEBUG - printf("linux_clone: CLONE_PARENT\n"); -#endif + if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { + sx_xlock(&proctree_lock); + PROC_LOCK(p2); + proc_reparent(p2, td->td_proc->p_pptr); + PROC_UNLOCK(p2); + sx_xunlock(&proctree_lock); } - + if (args->flags & CLONE_THREAD) { /* XXX: linux mangles pgrp and pptr somehow * I think it might be this but I am not sure. */ #ifdef notyet + PROC_LOCK(p2); p2->p_pgrp = td->td_proc->p_pgrp; - p2->p_pptr = td->td_proc->p_pptr; + PROC_UNLOCK(p2); #endif exit_signal = 0; -#ifdef DEBUG - printf("linux_clone: CLONE_THREADS\n"); -#endif } if (args->flags & CLONE_CHILD_SETTID) @@ -599,6 +599,7 @@ em->child_clear_tid = args->child_tidptr; else em->child_clear_tid = NULL; + EMUL_UNLOCK(&emul_lock); PROC_LOCK(p2); ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.22 2006/08/27 08:58:00 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -782,7 +782,8 @@ char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; }; struct linux_statfs64_args { - register_t dummy; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)]; }; struct linux_fstatfs64_args { register_t dummy; ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.22 2006/08/27 08:58:00 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.21 2006/08/15 17:36:58 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.22 2006/08/27 08:58:00 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp */ #include @@ -288,7 +288,7 @@ { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */ ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.20 2006/08/27 08:56:53 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -430,7 +430,7 @@ 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ struct l_timespec *rqtp, struct l_timespec *rmtp); } -268 AUE_NULL STD { int linux_statfs64(void); } +268 AUE_NULL STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } 269 AUE_NULL STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_NULL STD { int linux_utimes(void); } ==== //depot/projects/trustedbsd/priv/sys/arm/arm/fusu.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.7 2005/04/23 16:45:04 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.10 2006/08/30 11:44:37 cognet Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -52,6 +52,7 @@ * Fetch an int from the user's address space. */ +ENTRY_NP(casuword32) ENTRY(casuptr) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ @@ -98,7 +99,7 @@ * Fetch an int from the user's address space. */ -ENTRY(fuword32) +ENTRY_NP(fuword32) ENTRY(fuword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ @@ -300,7 +301,7 @@ * Store an int in the user's address space. */ -ENTRY(suword32) +ENTRY_NP(suword32) ENTRY(suword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ ==== //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.68 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); #include #include #include @@ -4469,11 +4469,8 @@ pmap_remove_write(vm_page_t m) { - if (m->md.pvh_attrs & PVF_WRITE) + if (m->flags & PG_WRITEABLE) pmap_clearbit(m, PVF_WRITE); - else - KASSERT((m->flags & PG_WRITEABLE) == 0, - ("pmap_clear_write: page %p has PG_WRITEABLE set", m)); } ==== //depot/projects/trustedbsd/priv/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.7 2006/05/19 11:27:02 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.8 2006/08/28 20:05:00 cognet Exp $"); #include #include @@ -54,7 +54,11 @@ vm_paddr_t pa, endpa; pa = trunc_page(bpa); - if (pa >= 0xfff00000) + if (pa >= 0xfff00000) { + *bshp = pa - 0xf0000000 + 0xd0000000; + return (0); + } + if (pa >= 0xdff00000) return (0); endpa = round_page(bpa + size); @@ -417,8 +421,8 @@ rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); if (rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, - 0xfffffffful) != 0) + rman_manage_region(&sc->sc_mem_rman, 0xdff00000ul, + 0xdffffffful) != 0) panic("at91_attach: failed to set up memory rman"); if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) @@ -543,7 +547,7 @@ void **cookiep) { struct at91_softc *sc = device_get_softc(dev); - + if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, ==== //depot/projects/trustedbsd/priv/sys/arm/at91/at91rm92reg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.3 2006/06/20 20:13:40 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.4 2006/08/28 20:05:00 cognet Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -41,7 +41,7 @@ * 0xf0000000 - 0xfffffffff : Peripherals */ -#define AT91RM92_BASE 0xf0000000 +#define AT91RM92_BASE 0xd0000000 /* Usart */ #define AT91RM92_USART0_BASE 0xffc0000 ==== //depot/projects/trustedbsd/priv/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.15 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.16 2006/08/28 20:05:00 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -153,8 +153,8 @@ * and the timer. Other devices should use newbus to * map their memory anyway. */ + 0xdff00000, 0xfff00000, - 0xfff00000, 0x100000, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, @@ -364,7 +364,7 @@ l1pagetable = kernel_l1pt.pv_va; /* Map the L2 pages tables in the L1 page table */ - pmap_link_l2pt(l1pagetable, ARM_VECTORS_LOW, + pmap_link_l2pt(l1pagetable, ARM_VECTORS_HIGH, &kernel_pt_table[KERNEL_PT_SYS]); for (i = 0; i < KERNEL_PT_KERN_NUM; i++) pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x100000, @@ -383,7 +383,7 @@ /* Map the vector page. */ - pmap_map_entry(l1pagetable, ARM_VECTORS_LOW, systempage.pv_pa, + pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, @@ -462,7 +462,7 @@ thread0.td_frame = &proc0_tf; pcpup->pc_curpcb = thread0.td_pcb; - arm_vector_init(ARM_VECTORS_LOW, ARM_VEC_ALL); + arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); pmap_curmaxkvaddr = afterkern + 0x100000 * (KERNEL_PT_KERN_NUM - 1); /* ==== //depot/projects/trustedbsd/priv/sys/arm/include/asm.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.4 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -55,15 +55,6 @@ #define _JB_MAGIC__SETJMP 0x4278f500 #define _JB_MAGIC_SETJMP 0x4278f501 #endif -#if 0 -#ifdef __STDC__ -# define __CONCAT(x,y) x ## y -# define __STRING(x) #x -#else -# define __CONCAT(x,y) x/**/y -# define __STRING(x) "x" -#endif -#endif #define I32_bit (1 << 7) /* IRQ disable */ #define F32_bit (1 << 6) /* FIQ disable */ ==== //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/ep80219_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.1 2006/08/24 23:51:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.2 2006/08/27 13:23:51 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -444,6 +444,10 @@ pmap_curmaxkvaddr = afterkern + PAGE_SIZE; + dump_avail[0] = 0xa0000000; + dump_avail[1] = 0xa0000000 + memsize; + dump_avail[2] = 0; + dump_avail[3] = 0; pmap_bootstrap(pmap_curmaxkvaddr, 0xd0000000, &kernel_l1pt); msgbufp = (void*)msgbufpv.pv_va; @@ -462,10 +466,6 @@ phys_avail[i++] = trunc_page(0xa0000000 + memsize - 1); phys_avail[i++] = 0; phys_avail[i] = 0; - dump_avail[0] = 0xa0000000; - dump_avail[1] = 0xa0000000 + memsize; - dump_avail[2] = 0; - dump_avail[3] = 0; /* Do basic tuning, hz etc */ init_param1(); ==== //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#2 (text) ==== @@ -35,7 +35,7 @@ * @APPLE_BSD_LICENSE_HEADER_END@ * * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.3 2006/08/26 08:17:58 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H @@ -71,9 +71,9 @@ /* * We could determined the header and trailer sizes by defining appropriate - * structures. We hold off that approach until we have a consistant way of + * structures. We hold off that approach until we have a consistent way of * using structures for all tokens. This is not straightforward since these - * token structures may contain pointers of whose contents we dont know the + * token structures may contain pointers of whose contents we do not know the * size (e.g text tokens). */ #define AUDIT_HEADER_SIZE 18 ==== //depot/projects/trustedbsd/priv/sys/bsm/audit_record.h#2 (text) ==== @@ -31,7 +31,7 @@ * @APPLE_BSD_LICENSE_HEADER_END@ * * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.4 2006/08/26 08:17:58 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.5 2006/09/01 11:45:39 wsalamon Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -319,8 +319,13 @@ gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); +#if defined(_KERNEL) || defined(KERNEL) +token_t *au_to_exec_args(char *args, int argc); +token_t *au_to_exec_env(char *envs, int envc); +#else +token_t *au_to_exec_args(char **argv); +token_t *au_to_exec_env(char **envp); +#endif token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#2 (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.58 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.60 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -455,7 +455,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL -#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE #define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION #define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN #define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#2 (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.56 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.58 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 @@ -311,4 +311,4 @@ #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 #define FREEBSD32_SYS_abort2 463 -#define FREEBSD32_SYS_MAXSYSCALL 469 +#define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#2 (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.47 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.49 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ const char *freebsd32_syscallnames[] = { @@ -167,7 +167,7 @@ "old.freebsd32_statfs", /* 157 = old freebsd32_statfs */ "old.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */ "#159", /* 159 = nosys */ - "#160", /* 160 = nosys */ + "#160", /* 160 = lgetfh */ "getfh", /* 161 = getfh */ "getdomainname", /* 162 = getdomainname */ "setdomainname", /* 163 = setdomainname */ @@ -476,4 +476,6 @@ "#466", /* 466 = thr_setscheduler */ "#467", /* 467 = thr_getscheduler */ "#468", /* 468 = thr_setschedparam */ + "#469", /* 469 = __getpath_fromfd */ + "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#2 (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.57 2006/08/15 17:36:59 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.59 2006/09/03 16:24:36 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ #include "opt_compat.h" @@ -192,13 +192,13 @@ { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0 }, /* 157 = old freebsd32_statfs */ { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0 }, /* 158 = old freebsd32_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 159 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = lgetfh */ { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 }, /* 161 = getfh */ - { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_O_GETDOMAINNAME, NULL, 0, 0 }, /* 162 = getdomainname */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_SETDOMAINNAME, NULL, 0, 0 }, /* 163 = setdomainname */ + { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 162 = getdomainname */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 163 = setdomainname */ { AS(uname_args), (sy_call_t *)uname, AUE_NULL, NULL, 0, 0 }, /* 164 = uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL, NULL, 0, 0 }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL, NULL, 0, 0 }, /* 166 = rtprio */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0 }, /* 165 = sysarch */ + { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0 }, /* 166 = rtprio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 167 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 168 = nosys */ { AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys, AUE_SEMSYS, NULL, 0, 0 }, /* 169 = freebsd32_semsys */ @@ -208,7 +208,7 @@ { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = freebsd32_pread */ { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = freebsd32_pwrite */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */ - { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ + { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 178 = getdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 179 = setdescriptor */ @@ -358,7 +358,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 324 = mlockall */ { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 325 = munlockall */ - { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL, NULL, 0, 0 }, /* 326 = __getcwd */ + { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 326 = __getcwd */ { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0 }, /* 327 = sched_setparam */ { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0 }, /* 328 = sched_getparam */ { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 329 = sched_setscheduler */ @@ -370,7 +370,7 @@ { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */ { compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */ - { AS(jail_args), (sy_call_t *)jail, AUE_NULL, NULL, 0, 0 }, /* 338 = jail */ + { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */ { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */ { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */ @@ -379,7 +379,7 @@ { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old freebsd32_sigreturn */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 345 = sigtimedwait */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */ - { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_JAIL, NULL, 0, 0 }, /* 347 = __acl_get_file */ + { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */ { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */ { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */ { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0 }, /* 350 = __acl_set_fd */ @@ -387,14 +387,14 @@ { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 352 = __acl_delete_fd */ { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0 }, /* 353 = __acl_aclcheck_file */ { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0 }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL, NULL, 0, 0 }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL, NULL, 0, 0 }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL, NULL, 0, 0 }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL, NULL, 0, 0 }, /* 358 = extattr_delete_file */ + { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0 }, /* 355 = extattrctl */ + { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ + { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ + { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL, NULL, 0, 0 }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL, NULL, 0, 0 }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_NULL, NULL, 0, 0 }, /* 362 = kqueue */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ + { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_NULL, NULL, 0, 0 }, /* 363 = freebsd32_kevent */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 364 = __cap_get_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 365 = __cap_set_proc */ @@ -403,14 +403,14 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL, NULL, 0, 0 }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL, NULL, 0, 0 }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ + { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ + { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ + { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0 }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL, NULL, 0, 0 }, /* 376 = eaccess */ + { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL, NULL, 0, 0 }, /* 378 = nmount */ + { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ { 0, (sy_call_t *)kse_exit, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ { AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ { AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ @@ -425,12 +425,12 @@ { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0 }, /* 390 = kenv */ { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0 }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0 }, /* 392 = uuidgen */ - { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_NULL, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */ + { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 394 = mac_syscall */ { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0 }, /* 395 = getfsstat */ { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0 }, /* 396 = statfs */ { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL, NULL, 0, 0 }, /* 398 = fhstatfs */ + { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0 }, /* 398 = fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 399 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 400 = ksem_close */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 401 = ksem_post */ @@ -476,7 +476,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ - { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL, NULL, 0, 0 }, /* 444 = kldunloadf */ + { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 445 = audit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 446 = auditon */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 447 = getauid */ @@ -501,4 +501,6 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.71 2006/08/16 22:32:50 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -238,8 +238,8 @@ 126 AUE_SETREUID NOPROTO { int setreuid(int ruid, int euid); } 127 AUE_SETREGID NOPROTO { int setregid(int rgid, int egid); } 128 AUE_RENAME NOPROTO { int rename(char *from, char *to); } -129 AUE_NULL OBSOL otruncate -130 AUE_NULL OBSOL ftruncate +129 AUE_TRUNCATE OBSOL otruncate +130 AUE_FTRUNCATE OBSOL ftruncate 131 AUE_FLOCK NOPROTO { int flock(int fd, int how); } 132 AUE_MKFIFO NOPROTO { int mkfifo(char *path, int mode); } 133 AUE_SENDTO NOPROTO { int sendto(int s, caddr_t buf, \ @@ -256,17 +256,17 @@ 140 AUE_ADJTIME STD { int freebsd32_adjtime( \ struct timeval32 *delta, \ struct timeval32 *olddelta); } -141 AUE_NULL OBSOL ogetpeername -142 AUE_NULL OBSOL ogethostid -143 AUE_NULL OBSOL sethostid -144 AUE_NULL OBSOL getrlimit -145 AUE_NULL OBSOL setrlimit -146 AUE_NULL OBSOL killpg +141 AUE_GETPEERNAME OBSOL ogetpeername +142 AUE_SYSCTL OBSOL ogethostid +143 AUE_SYSCTL OBSOL sethostid +144 AUE_GETRLIMIT OBSOL getrlimit +145 AUE_SETRLIMIT OBSOL setrlimit +146 AUE_KILLPG OBSOL killpg 147 AUE_SETSID NOPROTO { int setsid(void); } 148 AUE_QUOTACTL NOPROTO { int quotactl(char *path, int cmd, int uid, \ caddr_t arg); } -149 AUE_NULL OBSOL oquota -150 AUE_NULL OBSOL ogetsockname +149 AUE_O_QUOTA OBSOL oquota +150 AUE_GETSOCKNAME OBSOL ogetsockname ; Syscalls 151-180 inclusive are reserved for vendor-specific ; system calls. (This includes various calls added for compatibity @@ -278,23 +278,23 @@ 154 AUE_NULL UNIMPL nosys ; 155 is initialized by the NFS code, if present. ; XXX this is a problem!!! -155 AUE_NFSSVC UNIMPL nfssvc -156 AUE_NULL OBSOL ogetdirentries +155 AUE_NFS_SVC UNIMPL nfssvc +156 AUE_GETDIRENTRIES OBSOL ogetdirentries 157 AUE_STATFS COMPAT4 { int freebsd32_statfs(char *path, \ struct statfs32 *buf); } 158 AUE_FSTATFS COMPAT4 { int freebsd32_fstatfs(int fd, \ struct statfs32 *buf); } 159 AUE_NULL UNIMPL nosys -160 AUE_NULL UNIMPL nosys +160 AUE_LGETFH UNIMPL lgetfh 161 AUE_NFS_GETFH NOPROTO { int getfh(char *fname, \ struct fhandle *fhp); } -162 AUE_O_GETDOMAINNAME NOPROTO { int getdomainname(char *domainname, \ +162 AUE_SYSCTL NOPROTO { int getdomainname(char *domainname, \ int len); } -163 AUE_O_SETDOMAINNAME NOPROTO { int setdomainname(char *domainname, \ +163 AUE_SYSCTL NOPROTO { int setdomainname(char *domainname, \ int len); } 164 AUE_NULL NOPROTO { int uname(struct utsname *name); } -165 AUE_NULL NOPROTO { int sysarch(int op, char *parms); } -166 AUE_NULL NOPROTO { int rtprio(int function, pid_t pid, \ +165 AUE_SYSARCH NOPROTO { int sysarch(int op, char *parms); } +166 AUE_RTPRIO NOPROTO { int rtprio(int function, pid_t pid, \ struct rtprio *rtp); } 167 AUE_NULL UNIMPL nosys 168 AUE_NULL UNIMPL nosys @@ -314,7 +314,7 @@ u_int32_t offsetlo, u_int32_t offsethi); } ; XXX note - bigendian is different 175 AUE_NULL UNIMPL nosys -176 AUE_ADJTIME NOPROTO { int ntp_adjtime(struct timex *tp); } +176 AUE_NTP_ADJTIME NOPROTO { int ntp_adjtime(struct timex *tp); } 177 AUE_NULL UNIMPL sfork (BSD/OS 2.x) 178 AUE_NULL UNIMPL getdescriptor (BSD/OS 2.x) 179 AUE_NULL UNIMPL setdescriptor (BSD/OS 2.x) @@ -542,7 +542,7 @@ 323 AUE_NULL OBSOL thr_wakeup 324 AUE_MLOCKALL NOPROTO { int mlockall(int how); } 325 AUE_MUNLOCKALL NOPROTO { int munlockall(void); } -326 AUE_NULL NOPROTO { int __getcwd(u_char *buf, u_int buflen); } +326 AUE_GETCWD NOPROTO { int __getcwd(u_char *buf, u_int buflen); } 327 AUE_NULL NOPROTO { int sched_setparam (pid_t pid, \ const struct sched_param *param); } @@ -567,7 +567,7 @@ off_t *sbytes, int flags); } 337 AUE_NULL NOPROTO { int kldsym(int fileid, int cmd, \ void *data); } -338 AUE_NULL NOPROTO { int jail(struct jail *jail); } +338 AUE_JAIL NOPROTO { int jail(struct jail *jail); } 339 AUE_NULL UNIMPL pioctl 340 AUE_SIGPROCMASK NOPROTO { int sigprocmask(int how, \ const sigset_t *set, sigset_t *oset); } @@ -579,10 +579,10 @@ 344 AUE_SIGRETURN COMPAT4 { int freebsd32_sigreturn( \ const struct freebsd4_freebsd32_ucontext *sigcntxp); } ; XXX implement -345 AUE_NULL UNIMPL sigtimedwait +345 AUE_SIGWAIT UNIMPL sigtimedwait ; XXX implement 346 AUE_NULL UNIMPL sigwaitinfo -347 AUE_JAIL NOPROTO { int __acl_get_file(const char *path, \ +347 AUE_NULL NOPROTO { int __acl_get_file(const char *path, \ acl_type_t type, struct acl *aclp); } 348 AUE_NULL NOPROTO { int __acl_set_file(const char *path, \ acl_type_t type, struct acl *aclp); } @@ -598,24 +598,26 @@ acl_type_t type, struct acl *aclp); } 354 AUE_NULL NOPROTO { int __acl_aclcheck_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -355 AUE_NULL NOPROTO { int extattrctl(const char *path, int cmd, \ +355 AUE_EXTATTRCTL NOPROTO { int extattrctl(const char *path, int cmd, \ const char *filename, int attrnamespace, \ const char *attrname); } -356 AUE_NULL NOPROTO { int extattr_set_file(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -357 AUE_NULL NOPROTO { ssize_t extattr_get_file(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -358 AUE_NULL NOPROTO { int extattr_delete_file(const char *path, \ - int attrnamespace, \ +356 AUE_EXTATTR_SET_FILE NOPROTO { int extattr_set_file( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +357 AUE_EXTATTR_GET_FILE NOPROTO { ssize_t extattr_get_file( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +358 AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \ + const char *path, int attrnamespace, \ const char *attrname); } 359 AUE_NULL UNIMPL aio_waitcomplete -360 AUE_NULL NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ +360 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } -361 AUE_NULL NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ +361 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ gid_t *sgid); } -362 AUE_NULL NOPROTO { int kqueue(void); } +362 AUE_KQUEUE NOPROTO { int kqueue(void); } 363 AUE_NULL STD { int freebsd32_kevent(int fd, \ const struct kevent32 *changelist, \ int nchanges, \ @@ -628,20 +630,20 @@ 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file 370 AUE_NULL UNIMPL lkmressys -371 AUE_NULL NOPROTO { int extattr_set_fd(int fd, \ +371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -372 AUE_NULL NOPROTO { ssize_t extattr_get_fd(int fd, \ +372 AUE_EXTATTR_GET_FD NOPROTO { ssize_t extattr_get_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -373 AUE_NULL NOPROTO { int extattr_delete_fd(int fd, \ +373 AUE_EXTATTR_DELETE_FD NOPROTO { int extattr_delete_fd(int fd, \ int attrnamespace, \ const char *attrname); } 374 AUE_NULL NOPROTO { int __setugid(int flag); } 375 AUE_NULL UNIMPL nfsclnt -376 AUE_NULL NOPROTO { int eaccess(char *path, int flags); } +376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); } 377 AUE_NULL UNIMPL afs_syscall -378 AUE_NULL NOPROTO { int nmount(struct iovec *iovp, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 4 05:41:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E42E16A4E0; Mon, 4 Sep 2006 05:41:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C132416A4DD for ; Mon, 4 Sep 2006 05:41:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5279843D46 for ; Mon, 4 Sep 2006 05:41:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k845fAh4016944 for ; Mon, 4 Sep 2006 05:41:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k845f3LY016934 for perforce@freebsd.org; Mon, 4 Sep 2006 05:41:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 4 Sep 2006 05:41:03 GMT Message-Id: <200609040541.k845f3LY016934@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 105634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 05:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=105634 Change 105634 by rwatson@rwatson_zoo on 2006/09/04 05:40:49 Integrate TrustedBSD audit3 branch from TrustedBSD bsae branch. See @105632 for a description of changes. When merging the su(1) audit support, prefer the CVS commit version using the auid instead of the ruid/euid. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#12 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ansidecl.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/builtins.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-common.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-decl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-objc-common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-typeck.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgcleanup.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/combine.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.gcc#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.host#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/hpux.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linux64.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000-protos.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sysv4.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/gmon-sol2.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/x-linux#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/configure.ac#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/coverage.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/class.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-tree.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-tree.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cvt.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/decl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/decl2.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/error.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/init.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/lex.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/method.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/pt.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/search.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/semantics.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/typeck.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppfiles.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpphash.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppinit.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cse.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/contrib.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/include/gcc-common.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/expmed.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/f/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/f/g77.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/f/g77spec.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/flow.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/fold-const.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/gcc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/gcov.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/gcse.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ggc-common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/global.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/hooks.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/hooks.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/local-alloc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/longlong.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/loop.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/mips-tdump.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/mips-tfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/mklibgcc.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/optabs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/reg-stack.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/regrename.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/regs.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/rtl.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/sched-rgn.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/simplify-rtx.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/stmt.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/toplev.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/tree.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/unroll.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/version.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libf2c/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libobjc/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libobjc/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libstdc++/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libstdc++/include/bits/c++config#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libstdc++/include/bits/fstream.tcc#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libstdc++/include/c_std/std_cmath.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/conf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/ftpd.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/ftpd.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/logutmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/logwtmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/pathnames.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#16 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#11 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#26 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#16 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#22 integrate .. //depot/projects/trustedbsd/audit3/etc/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#9 integrate .. //depot/projects/trustedbsd/audit3/etc/freebsd-update.conf#1 branch .. //depot/projects/trustedbsd/audit3/etc/hosts.allow#6 integrate .. //depot/projects/trustedbsd/audit3/etc/inetd.conf#5 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.var.dist#6 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/weekly/120.clean-kvmdb#2 delete .. //depot/projects/trustedbsd/audit3/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/etc/phones#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/powerd#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.initdiskless#5 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#19 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/tls.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/ia64/ia64/pthread_md.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libsdp/sdp.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libsdp/util.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_create.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex_prioceiling.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex_protocol.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#12 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_seterrno.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_sigmask.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/lukemftpd/nbsd_pidfile.h#1 branch .. //depot/projects/trustedbsd/audit3/libexec/lukemftpd/pamize.h#2 delete .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/ia64/reloc.c#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/ia64/rtld_machdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/powerpc/reloc.c#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/trustedbsd/audit3/libexec/save-entropy/save-entropy.sh#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/kernels-install.sh#2 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/lib32-install.sh#1 branch .. //depot/projects/trustedbsd/audit3/release/scripts/proflibs-install.sh#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/dummynet.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/gem.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipfirewall.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ixgb.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/sbus.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sio.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/freebsd-update.conf.5#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man5/periodic.conf.5#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/nanobsd.8#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man8/picobsd.8#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/bus_dma.9#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/asm.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#21 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#16 integrate .. //depot/projects/trustedbsd/audit3/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/miidevs#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/openfirmio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci_pci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/support.s#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#19 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/support.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/bus_if.m#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#34 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_bus.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#25 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#40 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/systrace_args.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_ati.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#35 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#25 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#30 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#31 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/_bus_dma.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sys/bus.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/bus_dma.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/msgbuf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#25 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#28 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/umtx.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.h#9 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ministat/ministat.c#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/http/http.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/less/lesspipe.sh#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#18 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/NEWS#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/biz22.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/biz31.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/courier.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/df.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/dn11.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/hayes.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/t3000.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/v3451.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/v831.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/libacu/ventel.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/acu.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/acutab.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/cmds.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/cmdtab.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/cu.1#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/cu.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/hunt.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/log.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/partab.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/pathnames.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/remote.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/tip.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/tip.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/tip.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/tipout.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/uucplock.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/value.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tip/tip/vars.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/vgrind/vgrind.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#20 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/crontab/crontab.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/eeprom/eeprom.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/eeprom/ofw_options.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/freebsd-update/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/freebsd-update/freebsd-update.8#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/freebsd-update/freebsd-update.sh#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/config.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/devices.c#11 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/watchdogd/watchdog.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/watchdogd/watchdogd.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.139 2006/07/11 06:09:54 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.140 2006/08/31 09:51:33 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -118,6 +118,7 @@ linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. +freebsd-update cperciva Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. ==== //depot/projects/trustedbsd/audit3/UPDATING#14 (text+ko) ==== @@ -44,6 +44,13 @@ the nve(4) driver. Please update your configuration accordingly. +20060514: + The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx + PCnet family of NICs has been removed. The new le(4) driver serves + as an equivalent but cross-platform replacement with the pcn(4) + driver still providing performance-optimized support for the subset + of AMD Am79C971 PCnet-FAST and greater chips as before. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -603,4 +610,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ +$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $ ==== //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,822 @@ +2006-04-25 Nick Clifton + + * config/m32r/m32r.c (gen_compare): Fix reg/smallconst equal code, + the patch for which was accidentally omitted from the previous + commit. + +2006-04-04 Kazuhiro Inaoka + + PR target/26775 + PR target/26776 + * config/m32r/m32r.c (m32r_output_function_epilogue): Case for + a large stack frame at epilogue. Use fp to recover a stack + pointer for alloca function at epilogue. + + PR target/36276 + * config/m32r/m32r.c (gen_compare): Removed a rule addsi3 codes + to avoid a miss optimizing at simplify_relational_operation(). + * config/m32r/m32r.md (seq): Ditto. Changed reg_or_eq_int16_operand + to reg_or_uint16_operand because seq_insn has not used addsi3 already. + (seq_insn): Ditto. Removed operand check mode "P". Changed + reg_or_eq_int16_operand to reg_or_uint16_operand. + +2006-03-05 Release Manager + + * GCC 3.4.6 released. + +2006-03-01 Gabriel Dos Reis + + Backport + 2005-11-03 James E Wilson + + PR preprocessor/24202 + * cppfiles.c (_cpp_pop_file_buffer): Set buffer_valid to false. + +2006-03-01 Alan Modra + + PR target/21616 + Revert most of 2004-03-10 changes, apply mainline 2005-01-07. + * config/rs6000/rs6000.c (invalid_gpr_mem): Delete. + (base_reg_operand): Delete. + (legitimate_offset_address_p): Revert 2004-03-10 changes. + (secondary_reload_class): Likewise. + (rs6000_legitimize_reload_address): Convert non-word aligned + offset address using ld/std into indirect address. + * config/rs6000/rs6000.h (SECONDARY_RELOAD_CLASS): Define. + (SECONDARY_INPUT_RELOAD_CLASS, SECONDARY_OUTPUT_RELOAD_CLASS): Delete. + (PREDICATE_CODES): Delete invalid_gpr_mem and base_reg_operand. + * config/rs6000/rs6000-protos.h (secondary_reload_class): Update. + * config/rs6000/rs6000.md (movdf_hardfloat64): Remove m->b + alternative and split. + (movdi_internal64): Likewise. + (reload_outdf, reload_indf, reload_outdi, reload_indi): Delete. + +2006-02-28 Gabriel Dos Reis + + Backport + 2004-04-28 Serge Belyshev <1319@bot.ru> + + PR 14944 + * coverage.c (read_counts_file): Fix usage of warning () call. + * pretty-print.c (pp_base_format_text): Fix typo in the comment. + +2006-02-18 Olivier Hainque + + PR ada/13408 + * pa.h (WIDEST_HARDWARE_FP_SIZE): Define. + +2006-02-13 Kaveh R. Ghazi + + Backport: + 2006-02-01 Steve Ellcey + + PR middle-end/24901 + * fold-const.c (fold_checksum_tree): Change type of buf. + +2006-02-11 Kaveh R. Ghazi + + * doc/contrib.texi: Update my entry. + +2006-02-09 Eric Botcazou + + * config/sparc/sparc.c (tls_call_delay): Fix oversight. + +2006-02-07 John David Anglin + + PR target/26109 + * pa.c (attr_length_indirect_call): Don't return length 8 for distances + >= 240000 when generating code for SOM runtime. + (output_indirect_call): Don't use "b,l" instruction for indirect calls + to $$dyncall when generating code for SOM runtime.. + +2006-02-02 Nick Clifton + + PR 24376 + * sched-rgn.c (add_branch_dependences): For cc0 targets extend + the dependencies inside a block back to the very first cc0 setter + in the block. + +2006-01-21 Joseph S. Myers + + * gcc.c (process_command), gcov.c (print_version), gcov-dump.c + (print_version), mips-tdump.c (main), mips-tfile.c (main): Update + copyright notice dates. + +2006-01-12 Kaz Kojima + + PR target/25613 + * config/sh/sh.h (CONSTRAINT_LEN): Use unchecking version. + +2005-12-30 Roger Sayle + + PR target/25213 + Backport from mainline + 2005-09-06 Jakub Jelinek + + PR rtl-optimization/23098 + * cse.c (fold_rtx_mem): Call delegitimize_address target hook. + * simplify-rtx.c (constant_pool_reference_p): New function. + * rtl.h (constant_pool_reference_p): New prototype. + * config/i386/i386.md (pushf split, mov[sdx]f split): Use + constant_pool_reference_p in condition and + avoid_constant_pool_reference in preparation statements. + +2005-12-30 John David Anglin + + PR fortran/25586 + * pa.md: Remove REG_POINTER check from REG+REG peephole2 floating-point + store patterns. + +2005-12-29 Alan Modra + + PR target/25572 + * config/rs6000/rs6000.c (create_TOC_reference): Set regs_ever_live. + +2005-12-17 Steven Bosscher + + PR rtl-optimization/23837 + * optabs.c (expand_binop): For a multi-word rotate, never emit + a REG_NO_CONFLICT block. + +2005-12-16 John David Anglin + + Backport from mainline: + 2004-11-01 Mike Stump + + * inclhack.def (stdio_va_list): Break out clients from here... + (stdio_va_list_clients): ...to here. Also, don't fix if stdarg.h is + included or ifdef va_start. + * fixincl.x: Regenerate. + +2005-12-13 Alan Modra + + * config/rs6000/linux64.h (TARGET_ALIGN_NATURAL): Define. + +2005-12-10 John David Anglin + + PR target/25258 + * pa.c (som_text_section_asm_op): Use .NSUBSPA directive when changing + to the text subspace to output debugging information. + +2005-12-06 Alan Modra + + PR other/13873 + * longlong.h: Merge PPC tests from upstream. + +2005-12-03 Kaveh R. Ghazi + + PR middle-end/25022 + * builtins.c (expand_builtin_fputs, expand_builtin_printf, + expand_builtin_fprintf): Lookup the explicit replacement functions + for any unlocked stdio builtin transformations. + + * builtins.c (expand_builtin_fputs): Defer check for missing + replacement functions. + +2005-12-02 Volker Reichelt + + PR c++/24103 + Backport: + 2002-08-22 Diego Novillo + + * tree.c (simple_cst_equal): Call simple_cst_list_equal to compare + CONSTRUCTOR_ELTS pointers. + +2005-12-01 Gabriel Dos Reis + + * version.c: Bump version number. + * doc/include/gcc-common.texi: Likewise. + +2005-11-30 Release Manager + + * GCC 3.4.5 released. + +2005-11-23 Alan Modra + + PR middle-end/24950 + * expmed.c (store_bit_field): Don't attempt to insv a field + larger than the reg. + + Merge from trunk + 2005-11-14 Dale Johannesen + * expmed.c (store_bit_field): Add offset unconditionally for + memory targets. + (extract_bit_field): Don't force extzv or extv operand into + a register if field is too big. + 2004-12-01 Richard Henderson + * expmed.c (store_bit_field): Use simplify_gen_subreg instead + of gen_rtx_SUBREG directly. + +2005-11-16 Steve Ellcey + + PR target/24718 + * mklibgcc.in: Create dummy object for libgcc_eh.a + * config/ia64/hpux.h (LIBGCC_SPEC): Remove. + +2005-11-13 Andreas Jaeger + + * fixinc/check.tpl: Handle CVS additionally. + +2005-11-10 Uros Bizjak + + PR target/24315 + * config/i386/i386.md (*pushdi2_rex64 splitter) + (*movdi_1_rex64 splitter): Delay splitting after + flow2 pass only when (optimize > 0 && flag_peephole2). + +2005-11-10 Uros Bizjak + + PR target/19340 + * reg-stack.c (reg_to_stack): Update register liveness also + for flag_sched2_use_traces. + +2005-11-09 Per Bothner + Uros Bizjak + + PR c/24101 + * toplev.c (process_options): Initialize debug_hooks early + in case lang_hooks.post_options ends up calling a debug_hook. + * cppinit.c (read_original_filename): Temporarily set + state.in_directive before calling _cpp_lex_direct for + CPP_HASH tokens. + +2005-11-07 Steve Ellcey + + PR bootstrap/24688 + * fixinc/inclhack.def (sco_math): Add bypass. + * fixinc/fixincl.x: Regenerate. + +2005-11-07 James E Wilson + + PR preprocessor/15220 + * cppfiles.c (_cpp_find_file): New parameter angle_brackets. Fix all + callers. Pass to open_file_failed. + (open_file_failed): New parameter angle_brackets. Fix + all callers. use in print_dep assignment. + * cpphash.h (_cpp_find_file): Add new parm to declaration. + * cppinit.c (cpp_read_main_file): Pass another arg to _cpp_find_file. + +2005-11-05 Andreas Jaeger + + * fixinc/check.tpl: Adopt for move to subversion. + +2005-11-03 Richard Guenther + + PR middle-end/24470 + * fold-const.c (fold): Avoid running in circles if we + got some un-folded subtree. + +2005-10-30 Alan Modra + + PR target/23070 + * config/rs6000/rs6000.c (function_arg): For ABI_V4 calls to + stdarg functions, set/clear the fp marker even when no variable + args are passed. + * config/rs6000/sysv4.h (SUBTARGET_SWITCHES): Describe + -mprototype and -mno-prototype. + +2005-10-21 Alan Modra + + PR target/24465 + * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Always + use r2 for 64-bit tls .got access. + +2005-10-19 Paolo Bonzini + + * dojump.c (do_jump): Revert the last patch as it breaks Ada. + +2005-10-19 Paolo Bonzini + + PR #19672 + * dojump.c (do_jump): Handle TRUTH_AND_EXPR and TRUTH_OR_EXPR + like TRUTH_ANDIF_EXPR and TRUTH_ORIF_EXPR, if the branch cost + is low enough. + +2005-10-09 Eric Botcazou + + * config/sparc/gmon-sol2.c (internal_mcount): Mark as used. + +2005-10-08 Janis Johnson + + PR debug/24267 + Partial backport from mainline + 2004-05-04 Paolo Bonzini + Richard Henderson + * tree.c (make_or_reuse_type): New. + (build_common_tree_nodes): Use it. + + PR target/18583 + Partial backport from mainline + 2004-05-04 Paolo Bonzini + Richard Henderson + * c-common.c (vector_types_convertible_p): New function. + * c-common.h: Declare it. + * c-typeck.c (digest_init): Use it. + +2005-10-07 James E Wilson + + PR target/23644 + * doc/invoke.texi (IA-64 Options, item -mtune): Renamed from + -mtune-arch. + +2005-10-01 Richard Earnshaw + + PR target/23985 + Back-port 2004-08-19 Richard Henderson + * config/arm/arm.c (arm_gen_load_multiple): Use + adjust_automodify_address. Take base memory and offset instead + of unchanging/struct/scalar bits. + (arm_gen_store_multiple): Likewise. + (arm_gen_movstrqi): Use adjust_automodify_address. + * config/arm/arm-protos.h: Update decls. + * config/arm/arm.md (load_multiple): Update arm_gen_load_multiple call. + (store_multiple): Similarly. + +2005-09-29 Alan Modra + + PR target/24102 + * config/rs6000/rs6000.md (floatdisf2_internal2): Correct range + check for numbers that need no bit twiddle. + +2005-09-09 Richard Guenther + + PR c/20239 + * cppinit.c (cpp_read_main_file): Avoid segfaulting on + NULL pfile->map. + +2005-09-09 Richard Guenther + + PR c++/23624 + * fold-const.c (fold): Check truth_value_p before calling + invert_truthvalue. + +2005-09-08 Craig Rodrigues + + Backport from mainline + 2005-09-01 Craig Rodrigues + + * c-decl.c (diagnose_mismatched_decls): With -Wredundant-decls, + do not issue warning for a variable definition following + a declaration. + +2005-09-02 Richard Sandiford + + PR c/22061 + * c-decl.c (push_parm_decl): Push and pop x_dont_save_pending_sizes_p + around the call to grokdeclarator. Call grokdeclarator with the + field set to 0. + (store_parm_decls): Always store the pending_sizes in cfun. + (c_expand_body_1): Call put_pending_sizes. + * c-objc-common.c (c_cannot_inline_tree_fn): Always check + pending_sizes. + +2005-09-01 Jakub Jelinek + + PR rtl-optimization/23478 + * regs.h (reg_info): Add throw_calls_crossed. + (REG_N_THROWING_CALLS_CROSSED): Define. + * flow.c (allocate_reg_life_data): Initialize + REG_N_THROWING_CALLS_CROSSED. + (propagate_one_insn, attempt_auto_inc): Update + REG_N_THROWING_CALLS_CROSSED. + * local-alloc.c (struct qty): Add n_throwing_calls_crossed field. + (alloc_qty): Initialize it. + (update_equiv_regs): Clear REG_N_THROWING_CALLS_CROSSED. + (combine_regs): Combine also n_throwing_calls_crossed fields. + (find_free_reg): Don't attempt to caller-save pseudos crossing + calls that might throw. + * global.c (struct allocno): Add throwing_calls_crossed field. + (global_alloc): Initialize throwing_calls_crossed. + (find_reg): Don't attempt to caller-save pseudos crossing calls that + might throw. + +2005-09-01 Richard Earnshaw + + PR rtl-optimization/17810 target/15342 + * regrename.c: Fix polluted patch in previous change. + +2005-09-01 Richard Earnshaw + + PR rtl-optimization/17810 + Backport + 2004-11-04 Richard Sandiford + PR target/15342 + * regrename.c (scan_rtx): Treat the destinations of SETs and CLOBBERs + as OP_INOUT if the instruction is predicated. + +2005-08-31 David Edelsohn + + PR target/23539 + Backport from mainline: + + 2005-08-27 David Edelsohn + * config/rs6000/rs6000.c (expand_block_move): Use HImode when + bytes >= 2 not bytes == 2. + +2005-08-21 Jakub Jelinek + + * simplify-rtx.c (simplify_immed_subreg) : Only + clear up to elem_bitsize bits, not max_bitsize. + +2005-07-20 Steve Ellcey + + PR target/21841 + * doc/invoke.texi (-mgnu-ld): Update description. + (-mhp-ld): Ditto. + +2005-08-09 Paolo Bonzini + + PR rtl-optimization/17860 + * loop.c (check_dbra_loop): Do not try to use an end condition + like "i != 0" in the reversed loop. + +2005-08-08 Josh Conner + + PR rtl-optimization/23241 + * combine.c (simplify_comparison): Fix error in determining + whether to lift a subreg from comparison. + +2005-08-08 Richard Sandiford + + PR middle-end/21964 + * stmt.c (tail_recursion_args): Insert a call to emit_queue. + +2005-08-08 Richard Sandiford + + PR c/22458 + * c-decl.c (c_begin_compound_stmt): Set the initial body to + error_mark_node, not NULL. + +2005-08-07 John David Anglin + + * pa64-regs.h (CONDITIONAL_REGISTER_USAGE): Fix loop upper bound. + +2005-08-06 John David Anglin + + PR pch/14940 + Backport from mainline: + + * config.host (hppa*-*-hpux*, hppa*-*-linux): Define out_host_hook_obj + and host_xmake_file using new host configuration files. + * config/pa/pa-host.c, config/pa/x-hpux, config/pa/x-linux: New files. + +2005-08-06 Christian Joensson + + PR target/20673 + Backport from mainline: + + 2005-04-15 David S. Miller + + * config/sparc/sparc.h (sparc_hard_reg_printed): Mark as GTY(()). + +2005-08-05 John David Anglin + + * pa.c (function_arg): Fix typo in last change. + + * pa.c (function_value): Handle small aggregates on 32-bit targets. + (function_arg): Pass small aggregates in general registers on 32-bit + targets. + * som.h (MEMBER_TYPE_FORCES_BLK): Delete define. + +2005-08-04 Gerald Pfeifer + + * doc/install.texi (Specific): Adjust link to openavr.org. + (Specific): Remove broken reference to GCC 2.8.1 for OS/2. + (Binaries): Adjust HP-UX Porting Center link. + (Binaries): Adjust Free Software Foundation ordering link. + (Binaries): Remove broken link to Sinix/Reliant Unix binaries. + +2005-08-04 Eric Botcazou + + * doc/invoke.texi (Optimize Options): Document that -funswitch-loops + is enabled at -O3. + +2005-08-03 John David Anglin + + PR target/21723 + * pa.md: Remove fcpy alternative from movhi and movqi patterns. + * pa32-regs.h (HARD_REGNO_NREGS): Return two floating point registers + for complex modes when generating code for PA 1.0. + (VALID_FP_MODE_P): New macro. + (HARD_REGNO_MODE_OK): Use VALID_FP_MODE_P. Use non-overlapping register + sets for all general and floating point modes. Align wide floating + point modes to even register boundaries to comply with architectural + requirements. + (CLASS_MAX_NREGS): Update to align with change to HARD_REGNO_NREGS. + * pa64-regs.h (HARD_REGNO_NREGS): Update comment and formatting. + (VALID_FP_MODE_P): New macro. + (HARD_REGNO_MODE_OK): Use VALID_FP_MODE_P. Use non-overlapping register + sets for all general and floating point modes. Align wide floating + point modes to even register boundaries to comply with architectural + requirements. + +2005-08-03 Richard Sandiford + + PR target/18582 + * config/i386/i386.c (ix86_expand_unop_builtin): Force the target + to be a register if do_load is true. + +2005-08-02 Ian Lance Taylor + + PR pch/14400 + Backport from mainline: + + 2005-08-01 Ian Lance Taylor + + * config/host-linux.c (linux_gt_pch_get_address): Add new name + randomize_va_space for virtual address randomization control. + + 2005-02-15 James A. Morrison + + PR pch/14940 + PR target/19300 + * config/host-linux.c (linux_gt_pch_use_address): Copy from + config/pa/pa-host.c:pa_gt_pch_use_address. + + 2004-11-09 James A. Morrison + + PR pch/14940 + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Add __sparc__ + definitions. + + 2004-10-15 Jon Grimm + + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Add __powerpc__ + definition. + + 2004-04-24 Ulrich Weigand + + * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __s390__ + and __s390x__ hosts. + + 2004-04-08 Ian Lance Taylor + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Return 1 if file was successfully mapped. + + 2004-03-15 Ian Lance Taylor + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Fix the check for abort and only do the mmap if we can. + + 2004-03-12 Andrew Pinski + + * config/rs6000/host-darwin.c (darwin_rs6000_gt_pch_use_address): + Use ret instead of result. Use addr instead of base. + + 2004-03-10 Richard Henderson + + * c-pch.c (c_common_no_more_pch): Update for gt_pch_use_address + extra arguments. + * config.host (*-*-solaris2*, *-*-linux*): Add out_host_hook_obj + and host_xmake_file fragments. + * ggc-common.c (gt_pch_save): Update for gt_pch_get_address change. + (gt_pch_restore): Similarly for gt_pch_use_address. + (default_gt_pch_get_address): New. + (mmap_gt_pch_get_address): Split out of gt_pch_save. + (default_gt_pch_use_address): Split out of gt_pch_restore. + (mmap_gt_pch_use_address): Likewise. + * hooks.c (hook_voidp_size_t_null): Remove. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 4 05:50:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9631F16A4DE; Mon, 4 Sep 2006 05:50:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CCEC16A4DA for ; Mon, 4 Sep 2006 05:50:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 203C943D49 for ; Mon, 4 Sep 2006 05:50:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k845oMh7020187 for ; Mon, 4 Sep 2006 05:50:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k845oLox020183 for perforce@freebsd.org; Mon, 4 Sep 2006 05:50:21 GMT (envelope-from imp@freebsd.org) Date: Mon, 4 Sep 2006 05:50:21 GMT Message-Id: <200609040550.k845oLox020183@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 105635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 05:50:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=105635 Change 105635 by imp@imp_lighthouse on 2006/09/04 05:50:04 define configuration goo. Not sure what to return to userland in info ioctl, so leave blank for now. Affected files ... .. //depot/projects/arm/src/sys/sys/gpio.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/sys/gpio.h#2 (text+ko) ==== @@ -40,7 +40,10 @@ struct gpio_cfg { - int dummy; + uint32_t mask; /* Mask of bits to change */ + uint32_t input; /* or output */ + uint32_t hi_z; /* Disable output */ + uint32_t pullup; /* Enable pullup resistor */ }; #define GPIO_SET _IOW('g', 0, uint32_t) /* Turn bits on */ From owner-p4-projects@FreeBSD.ORG Mon Sep 4 05:54:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18EEA16A4E7; Mon, 4 Sep 2006 05:54:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E937416A4E2 for ; Mon, 4 Sep 2006 05:54:29 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C516D43D55 for ; Mon, 4 Sep 2006 05:54:28 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k845sS3E020402 for ; Mon, 4 Sep 2006 05:54:28 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k845sSOd020399 for perforce@freebsd.org; Mon, 4 Sep 2006 05:54:28 GMT (envelope-from als@FreeBSD.org) Date: Mon, 4 Sep 2006 05:54:28 GMT Message-Id: <200609040554.k845sSOd020399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 105636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 05:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=105636 Change 105636 by als@als_head on 2006/09/04 05:54:17 unbreak build world Affected files ... .. //depot/projects/jail2/sys/sys/jail.h#5 edit Differences ... ==== //depot/projects/jail2/sys/sys/jail.h#5 (text+ko) ==== @@ -29,6 +29,8 @@ }; #define XPRISON_VERSION 1 +#define JMODULE_COUNT 3 + #ifndef _KERNEL int jail(void *); @@ -47,8 +49,6 @@ #define JAIL_MAX 999999 #define JAIL_MIN 1 -#define JMODULE_COUNT 3 - #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_PRISON); #endif From owner-p4-projects@FreeBSD.ORG Mon Sep 4 06:08:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A89816A4E0; Mon, 4 Sep 2006 06:08:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3042216A4DD for ; Mon, 4 Sep 2006 06:08:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C452B43D62 for ; Mon, 4 Sep 2006 06:08:46 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8468kRi023348 for ; Mon, 4 Sep 2006 06:08:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8468kaj023345 for perforce@freebsd.org; Mon, 4 Sep 2006 06:08:46 GMT (envelope-from imp@freebsd.org) Date: Mon, 4 Sep 2006 06:08:46 GMT Message-Id: <200609040608.k8468kaj023345@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 105637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 06:08:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=105637 Change 105637 by imp@imp_lighthouse on 2006/09/04 06:07:47 implement GPIO_CFG, and expand it to allow for selective setting of configuration things as well as which bits to set. # This gives TSC all the control it needs from userland. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#17 edit .. //depot/projects/arm/src/sys/sys/gpio.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#17 (text+ko) ==== @@ -287,8 +287,21 @@ case GPIO_READ: /* Get the status of input bits */ *(uint32_t *)data = RD4(sc, PIO_PDSR); return (0); + case GPIO_CFG: /* Configure GPIO pins */ + if (sc->cfgmask & GPIO_CFG_INPUT) { + WR4(sc, PIO_OER, sc->iomask & ~sc->input); + WR4(sc, PIO_ODR, sc->iomask & sc->input); + } + if (sc->cfgmask & GPIO_CFG_HI_Z) { + WR4(sc, PIO_MDER, sc->iomask & ~sc->hi_z); + WR4(sc, PIO_MDDR, sc->iomask & sc->hi_z); + } + if (ac->cfgmask & GPIO_CFG_PULLUP) { + WR4(sc, PIO_PUER, sc->iomask & ~sc->pullup); + WR4(sc, PIO_PUDR, sc->iomask & sc->pullup); + } + return (0); case GPIO_INFO: /* Learn about this device's GPIO bits */ - case GPIO_CFG: /* Configure GPIO pins */ break; } return (ENOTTY); ==== //depot/projects/arm/src/sys/sys/gpio.h#3 (text+ko) ==== @@ -40,7 +40,11 @@ struct gpio_cfg { - uint32_t mask; /* Mask of bits to change */ + uint32_t cfgmask; /* which things change */ +#define GPIO_CFG_INPUT 1 +#define GPIO_CFG_HI_Z 2 +#define GPIO_CFG_PULLUP 4 + uint32_t iomask; /* Mask of bits to change */ uint32_t input; /* or output */ uint32_t hi_z; /* Disable output */ uint32_t pullup; /* Enable pullup resistor */ From owner-p4-projects@FreeBSD.ORG Mon Sep 4 20:10:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E38A216A4FB; Mon, 4 Sep 2006 20:10:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A499E16A4EE for ; Mon, 4 Sep 2006 20:10:24 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D46643D6B for ; Mon, 4 Sep 2006 20:10:15 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k84KAFnP014489 for ; Mon, 4 Sep 2006 20:10:15 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k84KADwO014486 for perforce@freebsd.org; Mon, 4 Sep 2006 20:10:13 GMT (envelope-from piso@freebsd.org) Date: Mon, 4 Sep 2006 20:10:13 GMT Message-Id: <200609042010.k84KADwO014486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 105655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 20:10:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=105655 Change 105655 by piso@piso_newluxor on 2006/09/04 20:09:45 IFC Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#5 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.initdiskless#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/powerpc/gen/_set_tp.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/ia64/ia64/pthread_md.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/arch/powerpc/powerpc/pthread_md.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libutil/pw_util.c#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ata.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/audit.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/gem.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipfirewall.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/le.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/soc2005/libalias/share/man/man8/picobsd.8#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/soc2005/libalias/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/bus_if.m#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/_bus_dma.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/bus.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/bus_dma.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/msgbuf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#6 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_contig.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.h#4 integrate .. //depot/projects/soc2005/libalias/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/su/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/su/su.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tip/tip/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/eeprom/ofw_options.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/freebsd-update/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/portsnap/portsnap/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/watchdogd/watchdog.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/watchdogd/watchdogd.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#5 (text+ko) ==== @@ -44,6 +44,13 @@ the nve(4) driver. Please update your configuration accordingly. +20060514: + The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx + PCnet family of NICs has been removed. The new le(4) driver serves + as an equivalent but cross-platform replacement with the pcn(4) + driver still providing performance-optimized support for the subset + of AMD Am79C971 PCnet-FAST and greater chips as before. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -603,4 +610,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ +$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $ ==== //depot/projects/soc2005/libalias/contrib/openbsm/FREEBSD-upgrade#4 (text) ==== @@ -27,7 +27,15 @@ - Update any library, tool, or etc BSD Makefiles to add new files, defines, or other generally useful or necessary things. -Normally, the CVS vendor import goes along the following lines: +Certain files are present only in the vendor branch, and not in FreeBSD +development branches: + + contrib/openbsm/bsm audit.h audit_internal.h audit_kevents.h + audit_record.h + +This prevents confusion regarding whether the src/sys/bsm or contrib +versions of the include files should be used in the build. Normally, the +CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \ @@ -45,4 +53,4 @@ are necessary, and the commits to various parts of the system must be made in close succession. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.6 2006/08/26 10:35:54 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.7 2006/09/02 09:56:28 rwatson Exp $ ==== //depot/projects/soc2005/libalias/contrib/openbsm/HISTORY#4 (text) ==== @@ -1,3 +1,9 @@ +OpenBSM 1.0 alpha 10 + +- auditd now generates complete audit records for its events, as required for + application-submitted audit records in the the FreeBSD kernel audit + implementation. + OpenBSM 1.0 alpha 9 - Rename many OpenBSM-specific constants and API elements containing the @@ -203,4 +209,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#25 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#26 $ ==== //depot/projects/soc2005/libalias/contrib/openbsm/bin/auditd/auditd.c#3 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#18 $ */ #include @@ -366,6 +366,7 @@ static int close_all(void) { + struct auditinfo ai; int err_ret = 0; char TS[POSTFIX_LEN]; int aufd; @@ -378,6 +379,17 @@ else { if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) au_write(aufd, tok); + /* + * XXX we need to implement extended subject tokens so we can + * effectively represent terminal lines with this token type. + */ + bzero(&ai, sizeof(ai)); + if ((tok = au_to_subject32(getuid(), geteuid(), getegid(), + getuid(), getgid(), getpid(), getpid(), &ai.ai_termid)) + != NULL) + au_write(aufd, tok); + if ((tok = au_to_return32(0, 0)) != NULL) + au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_shutdown) == -1) syslog(LOG_ERR, "Could not close audit shutdown event."); @@ -745,6 +757,7 @@ static void setup(void) { + struct auditinfo ai; auditinfo_t auinfo; int aufd; token_t *tok; @@ -781,8 +794,20 @@ if ((aufd = au_open()) == -1) syslog(LOG_ERR, "Could not create audit startup event."); else { + /* + * XXXCSJP Perhaps we wan't more robust audit records for + * audit start up and shutdown. This might include capturing + * failures to initialize the audit subsystem? + */ + bzero(&ai, sizeof(ai)); + if ((tok = au_to_subject32(getuid(), geteuid(), getegid(), + getuid(), getgid(), getpid(), getpid(), &ai.ai_termid)) + != NULL) + au_write(aufd, tok); if ((tok = au_to_text("auditd::Audit startup")) != NULL) au_write(aufd, tok); + if ((tok = au_to_return32(0, 0)) != NULL) + au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_startup) == -1) syslog(LOG_ERR, "Could not close audit startup event."); ==== //depot/projects/soc2005/libalias/contrib/openbsm/configure#4 (text) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#27 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#28 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a9. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a10. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a9' -PACKAGE_STRING='OpenBSM 1.0a9' +PACKAGE_VERSION='1.0a10' +PACKAGE_STRING='OpenBSM 1.0a10' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a9 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a9:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a10:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a9 +OpenBSM configure 1.0a10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a9, which was +It was created by OpenBSM $as_me 1.0a10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a9 + VERSION=1.0a10 cat >>confdefs.h <<_ACEOF @@ -23478,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a9, which was +This file was extended by OpenBSM $as_me 1.0a10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23541,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a9 +OpenBSM config.status 1.0a10 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/soc2005/libalias/contrib/openbsm/configure.ac#4 (text) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a9], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#28 $]) +AC_INIT([OpenBSM], [1.0a10], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#29 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/soc2005/libalias/contrib/openbsm/libbsm/bsm_token.c#5 (text) ==== @@ -1055,7 +1055,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_args(const char **argv) +au_to_exec_args(char **argv) { token_t *t; u_char *dptr = NULL; @@ -1096,7 +1096,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_env(const char **envp) +au_to_exec_env(char **envp) { token_t *t; u_char *dptr = NULL; ==== //depot/projects/soc2005/libalias/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.320 2006/09/02 20:58:37 marcel Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -661,6 +661,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -694,6 +696,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -766,6 +770,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. ==== //depot/projects/soc2005/libalias/etc/rc.initdiskless#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.initdiskless,v 1.50 2006/08/22 16:21:16 ru Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.51 2006/09/01 16:33:15 brooks Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -76,6 +76,9 @@ # If the file contains a pathname starting with "/", then # the root path is prepended to it; this allows relocation of # the root filesystem without changing configuration files. +# Because mount_nfs understands ".." in paths, it is +# possible to mount from locations above the NFS root with +# paths such as "/../../etc". # # /conf/T/M/md_size # The contents of the file specifies the size of the memory @@ -97,6 +100,12 @@ # The list of paths contained in the file are rm -rf'd # relative to /SUBDIR. # +# /conf/diskless_remount +# Similar to /conf/T/M/diskless_remount above, but allows +# all of /conf to be remounted. This can be used to allow +# multiple roots to share the same /conf. +# +# # You will almost universally want to create the following files under /conf # # File Content @@ -222,8 +231,7 @@ # The list of filesystems to umount after the copy to_umount="" -# If /conf/diskless_remount exists, remount all of /conf. This allows -# multiple roots to share the same conf files. +# If /conf/diskless_remount exists, remount all of /conf. if [ -d /conf -a -f /conf/diskless_remount ]; then nfspt=`/bin/cat /conf/diskless_remount` if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then @@ -300,7 +308,7 @@ subdir=${j##*/} if [ -d $j -a ! -f $j.cpio.gz ]; then create_md $subdir - cp -Rp $j/* /$subdir + cp -Rp $j/ /$subdir fi done for j in /conf/$i/*.cpio.gz ; do ==== //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.10 2006/07/26 16:56:56 imp Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.12 2006/09/01 17:35:48 marcel Exp $ */ /* @@ -58,7 +58,7 @@ void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign); void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign); -#if defined(__ia64__) || defined(__alpha__) || defined(__powerpc__) +#if defined(__ia64__) || defined(__powerpc__) #define TLS_VARIANT_I #endif #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ @@ -73,9 +73,6 @@ static size_t tls_static_space; static size_t tls_init_size; -#ifdef TLS_VARIANT_I -static size_t tls_init_offset; -#endif static void *tls_init; #endif @@ -102,67 +99,69 @@ #ifdef TLS_VARIANT_I +#define TLS_TCB_SIZE (2 * sizeof(void *)) + /* * Free Static TLS using the Variant I method. */ void -__libc_free_tls(void *tls, size_t tcbsize __unused, size_t tcbalign __unused) +__libc_free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused) { - Elf_Addr* dtv; + Elf_Addr *dtv; + Elf_Addr **tls; - dtv = ((Elf_Addr**)tls)[0]; - free(tls); + tls = (Elf_Addr **)((Elf_Addr)tcb + tcbsize - TLS_TCB_SIZE); + dtv = tls[0]; free(dtv); + free(tcb); } /* * Allocate Static TLS using the Variant I method. */ void * -__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign __unused) +__libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign __unused) { - size_t size; - char *tls; Elf_Addr *dtv; + Elf_Addr **tls; + char *tcb; - size = tls_static_space; - if (size < tcbsize) - size = tcbsize; + if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE) + return (oldtcb); - tls = calloc(1, size); - dtv = malloc(3 * sizeof(Elf_Addr)); + tcb = calloc(1, tls_static_space + tcbsize); + tls = (Elf_Addr **)(tcb + tcbsize - TLS_TCB_SIZE); - *(Elf_Addr **) tls = dtv; + if (oldtcb != NULL) { + memcpy(tls, oldtcb, tls_static_space + TLS_TCB_SIZE); + free(oldtcb); - dtv[0] = 1; - dtv[1] = 1; - dtv[2] = (Elf_Addr)(tls + tls_init_offset); - if (oldtls) { - /* - * Copy the static TLS block over whole. - */ - memcpy(tls + tls_init_offset, - (char *)oldtls + tls_init_offset, - tls_static_space - tls_init_offset); + /* Adjust the DTV. */ + dtv = tls[0]; + dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE; + } else { + dtv = malloc(3 * sizeof(Elf_Addr)); + tls[0] = dtv; + dtv[0] = 1; + dtv[1] = 1; + dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE; - /* - * We assume that this block was the one we created with - * allocate_initial_tls(). - */ - _rtld_free_tls(oldtls, 2 * sizeof(Elf_Addr), sizeof(Elf_Addr)); - } else { - memcpy(tls + tls_init_offset, tls_init, tls_init_size); - memset(tls + tls_init_offset + tls_init_size, - 0, tls_static_space - tls_init_size); + if (tls_init_size > 0) + memcpy((void*)dtv[2], tls_init, tls_init_size); + if (tls_static_space > tls_init_size) + memset((void*)(dtv[2] + tls_init_size), 0, + tls_static_space - tls_init_size); } - return tls; + return(tcb); } #endif #ifdef TLS_VARIANT_II +#define TLS_TCB_SIZE (3 * sizeof(Elf_Addr)) + /* * Free Static TLS using the Variant II method. */ @@ -293,22 +292,14 @@ for (i = 0; (unsigned) i < phnum; i++) { if (phdr[i].p_type == PT_TLS) { -#ifdef TLS_VARIANT_I - tls_static_space = round(2*sizeof(Elf_Addr), - phdr[i].p_align) + phdr[i].p_memsz; - tls_init_offset = round(2*sizeof(Elf_Addr), - phdr[i].p_align); -#else tls_static_space = round(phdr[i].p_memsz, phdr[i].p_align); -#endif tls_init_size = phdr[i].p_filesz; tls_init = (void*) phdr[i].p_vaddr; } } - tls = _rtld_allocate_tls(NULL, 3*sizeof(Elf_Addr), - sizeof(Elf_Addr)); + tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, 1); _set_tp(tls); #endif ==== //depot/projects/soc2005/libalias/lib/libc/powerpc/gen/_set_tp.c#3 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/powerpc/gen/_set_tp.c,v 1.2 2006/08/30 00:57:35 marcel Exp $ + * $FreeBSD: src/lib/libc/powerpc/gen/_set_tp.c,v 1.3 2006/09/02 01:07:21 marcel Exp $ */ void _set_tp(void *tpval) { - register void *tp __asm__("r2"); + register void *tp __asm__("r2"); __asm __volatile("mr %0,%1" : "=r"(tp) : "r"((char*)tpval + 0x7008)); } ==== //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.134 2006/08/13 21:54:47 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.136 2006/09/01 19:14:14 marcel Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -253,7 +253,6 @@ #ifdef __ia64__ # define QUANTUM_2POW_MIN 4 # define SIZEOF_PTR 8 -# define NO_TLS #endif #ifdef __alpha__ # define QUANTUM_2POW_MIN 4 @@ -279,7 +278,6 @@ # define QUANTUM_2POW_MIN 4 # define SIZEOF_PTR 4 # define USE_BRK -# define NO_TLS #endif /* sizeof(int) == (1 << SIZEOF_INT_2POW). */ ==== //depot/projects/soc2005/libalias/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2003 Daniel Eischen + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,11 +24,13 @@ * (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/lib/libpthread/arch/ia64/ia64/pthread_md.c,v 1.3 2004/08/15 16:28:05 dfr Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/ia64/pthread_md.c,v 1.5 2006/09/01 21:25:22 marcel Exp $ */ #include #include + +#include "rtld_tls.h" #include "pthread_md.h" /* @@ -36,21 +39,22 @@ struct tcb * _tcb_ctor(struct pthread *thread, int initial) { + register char *tp __asm("%r13"); struct tcb *tcb; - if ((tcb = malloc(sizeof(struct tcb))) != NULL) { - bzero(tcb, sizeof(struct tcb)); - tcb->tcb_thread = thread; - /* Allocate TDV */ - } + tcb = _rtld_allocate_tls((initial) ? tp : NULL, + sizeof(struct tcb), 16); + if (tcb == NULL) + return (NULL); + tcb->tcb_thread = thread; return (tcb); } void _tcb_dtor(struct tcb *tcb) { - /* Free TDV */ - free(tcb); + + _rtld_free_tls(tcb, sizeof(struct tcb), 16); } struct kcb * @@ -58,13 +62,14 @@ { struct kcb *kcb; - if ((kcb = malloc(sizeof(struct kcb))) != NULL) { - bzero(kcb, sizeof(struct kcb)); - kcb->kcb_faketcb.tcb_isfake = 1; - kcb->kcb_faketcb.tcb_tmbx.tm_flags = TMF_NOUPCALL; - kcb->kcb_curtcb = &kcb->kcb_faketcb; - kcb->kcb_kse = kse; - } + kcb = malloc(sizeof(struct kcb)); + if (kcb == NULL) + return (NULL); + bzero(kcb, sizeof(struct kcb)); + kcb->kcb_kse = kse; + kcb->kcb_faketcb.tcb_isfake = 1; + kcb->kcb_faketcb.tcb_tmbx.tm_flags = TMF_NOUPCALL; + kcb->kcb_curtcb = &kcb->kcb_faketcb; return (kcb); } ==== //depot/projects/soc2005/libalias/lib/libpthread/arch/ia64/include/pthread_md.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 Marcel Moolenaar + * Copyright (c) 2003-2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -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/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.16 2004/08/16 14:07:38 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.18 2006/09/01 21:25:22 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -34,7 +34,7 @@ #include #define KSE_STACKSIZE 16384 -#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_tdv) +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) #define THR_GETCONTEXT(ucp) _ia64_save_context(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) PANIC("THR_SETCONTEXT() now in use!\n") @@ -45,19 +45,16 @@ struct kse; struct pthread; struct tcb; -struct tdv; /* We don't know what this is yet? */ /* - * tp points to one of these. We define the static TLS as an array - * of long double to enforce 16-byte alignment of the TLS memory, - * struct ia64_tp, struct tcb and also struct kcb. Both static and - * dynamic allocation of any of these structures will result in a - * valid, well-aligned thread pointer. + * tp points to one of these. We define the TLS structure as a union + * containing a long double to enforce 16-byte alignment. This makes + * sure that there will not be any padding in struct tcb after the + * TLS structure. */ -struct ia64_tp { - struct tdv *tp_tdv; /* dynamic TLS */ - uint64_t _reserved_; - long double tp_tls[0]; /* static TLS */ +union ia64_tp { + void *tp_dtv; + long double _align_; }; struct tcb { @@ -65,19 +62,31 @@ struct pthread *tcb_thread; struct kcb *tcb_curkcb; long tcb_isfake; - struct ia64_tp tcb_tp; + union ia64_tp tcb_tp; }; struct kcb { struct kse_mailbox kcb_kmbx; + struct kse *kcb_kse; + struct tcb *kcb_curtcb; struct tcb kcb_faketcb; - struct tcb *kcb_curtcb; - struct kse *kcb_kse; }; -register struct ia64_tp *_tp __asm("%r13"); +static __inline struct tcb * +ia64_get_tcb() +{ + register char *tp __asm("%r13"); + + return ((struct tcb *)(tp - offsetof(struct tcb, tcb_tp))); +} + +static __inline void +ia64_set_tcb(struct tcb *tcb) +{ + register char *tp __asm("%r13"); -#define _tcb ((struct tcb*)((char*)(_tp) - offsetof(struct tcb, tcb_tp))) + __asm __volatile("mov %0 = %1;;" : "=r"(tp) : "r"(&tcb->tcb_tp)); +} /* * The kcb and tcb constructors. @@ -92,7 +101,7 @@ _kcb_set(struct kcb *kcb) { /* There is no thread yet; use the fake tcb. */ - _tp = &kcb->kcb_faketcb.tcb_tp; + ia64_set_tcb(&kcb->kcb_faketcb); } /* @@ -104,7 +113,7 @@ static __inline struct kcb * _kcb_get(void) { - return (_tcb->tcb_curkcb); + return (ia64_get_tcb()->tcb_curkcb); } /* @@ -115,21 +124,23 @@ static __inline struct kse_thr_mailbox * _kcb_critical_enter(void) { + struct tcb *tcb; struct kse_thr_mailbox *crit; uint32_t flags; - if (_tcb->tcb_isfake != 0) { + tcb = ia64_get_tcb(); + if (tcb->tcb_isfake != 0) { /* * We already are in a critical region since * there is no current thread. */ crit = NULL; } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - crit = _tcb->tcb_curkcb->kcb_kmbx.km_curthread; - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = NULL; - _tcb->tcb_tmbx.tm_flags = flags; + flags = tcb->tcb_tmbx.tm_flags; + tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; + crit = tcb->tcb_curkcb->kcb_kmbx.km_curthread; + tcb->tcb_curkcb->kcb_kmbx.km_curthread = NULL; + tcb->tcb_tmbx.tm_flags = flags; } return (crit); } @@ -137,28 +148,33 @@ static __inline void _kcb_critical_leave(struct kse_thr_mailbox *crit) { + struct tcb *tcb; + + tcb = ia64_get_tcb(); /* No need to do anything if this is a fake tcb. */ - if (_tcb->tcb_isfake == 0) - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = crit; + if (tcb->tcb_isfake == 0) + tcb->tcb_curkcb->kcb_kmbx.km_curthread = crit; } static __inline int _kcb_in_critical(void) { + struct tcb *tcb; uint32_t flags; int ret; - if (_tcb->tcb_isfake != 0) { + tcb = ia64_get_tcb(); + if (tcb->tcb_isfake != 0) { /* * We are in a critical region since there is no * current thread. */ ret = 1; } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - ret = (_tcb->tcb_curkcb->kcb_kmbx.km_curthread == NULL); - _tcb->tcb_tmbx.tm_flags = flags; + flags = tcb->tcb_tmbx.tm_flags; + tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; + ret = (tcb->tcb_curkcb->kcb_kmbx.km_curthread == NULL); + tcb->tcb_tmbx.tm_flags = flags; } return (ret); } @@ -170,19 +186,19 @@ tcb = &kcb->kcb_faketcb; kcb->kcb_curtcb = tcb; tcb->tcb_curkcb = kcb; - _tp = &tcb->tcb_tp; + ia64_set_tcb(tcb); } static __inline struct tcb * _tcb_get(void) { - return (_tcb); + return (ia64_get_tcb()); } static __inline struct pthread * _get_curthread(void) { - return (_tcb->tcb_thread); + return (ia64_get_tcb()->tcb_thread); } /* @@ -193,7 +209,7 @@ static __inline struct kse * _get_curkse(void) { - return (_tcb->tcb_curkcb->kcb_kse); + return (ia64_get_tcb()->tcb_curkcb->kcb_kse); } void _ia64_break_setcontext(mcontext_t *mc); @@ -208,7 +224,7 @@ if (_ia64_save_context(&tcb->tcb_tmbx.tm_context.uc_mcontext) == 0) { /* Make the fake tcb the current thread. */ kcb->kcb_curtcb = &kcb->kcb_faketcb; - _tp = &kcb->kcb_faketcb.tcb_tp; + ia64_set_tcb(&kcb->kcb_faketcb); _ia64_enter_uts(kcb->kcb_kmbx.km_func, &kcb->kcb_kmbx, kcb->kcb_kmbx.km_stack.ss_sp, kcb->kcb_kmbx.km_stack.ss_size); ==== //depot/projects/soc2005/libalias/lib/libpthread/arch/powerpc/include/pthread_md.h#2 (text+ko) ==== @@ -1,5 +1,7 @@ /* - * Copyright 2004 by Peter Grehan. All rights reserved. + * Copyright 2004 by Peter Grehan. + * Copyright 2006 Marcel Moolenaar + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/powerpc/include/pthread_md.h,v 1.3 2004/08/16 05:41:38 grehan Exp $ + * $FreeBSD: src/lib/libpthread/arch/powerpc/include/pthread_md.h,v 1.6 2006/09/01 19:13:36 marcel Exp $ */ /* @@ -42,7 +44,7 @@ extern int _ppc32_getcontext(mcontext_t *); #define KSE_STACKSIZE 16384 -#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_tdv) +#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_dtv) #define THR_GETCONTEXT(ucp) _ppc32_getcontext(&(ucp)->uc_mcontext) #define THR_SETCONTEXT(ucp) _ppc32_setcontext(&(ucp)->uc_mcontext, 0, NULL) @@ -53,15 +55,14 @@ struct kse; struct pthread; struct tcb; -struct tdv; /* - * %r2 points to a struct kcb. + * %r2 points to the following. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 4 21:34:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8691116A4E2; Mon, 4 Sep 2006 21:34:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43F0216A4DF for ; Mon, 4 Sep 2006 21:34:02 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC2AC43D5F for ; Mon, 4 Sep 2006 21:33:58 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k84LXwco030800 for ; Mon, 4 Sep 2006 21:33:58 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k84LXwRI030797 for perforce@freebsd.org; Mon, 4 Sep 2006 21:33:58 GMT (envelope-from piso@freebsd.org) Date: Mon, 4 Sep 2006 21:33:58 GMT Message-Id: <200609042133.k84LXwRI030797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 105658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 21:34:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=105658 Change 105658 by piso@piso_newluxor on 2006/09/04 21:33:24 Add files i forgot in previous commits. Affected files ... .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#1 add .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#1 add .. //depot/projects/soc2005/libalias/lib/libalias/modules/modules.inc#1 add .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Sep 4 23:19:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D80316A56F; Mon, 4 Sep 2006 23:19:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BCBB16A4EA for ; Mon, 4 Sep 2006 23:19:17 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3138D43D49 for ; Mon, 4 Sep 2006 23:19:13 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k84NJDfs040410 for ; Mon, 4 Sep 2006 23:19:13 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k84NJC2Y040407 for perforce@freebsd.org; Mon, 4 Sep 2006 23:19:12 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 4 Sep 2006 23:19:12 GMT Message-Id: <200609042319.k84NJC2Y040407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 105664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Sep 2006 23:19:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=105664 Change 105664 by gonzo@gonzo_hideout on 2006/09/04 23:18:59 o Add missing arith.h Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/arith.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 5 05:45:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7B0116A4E2; Tue, 5 Sep 2006 05:45:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50BEB16A4DD for ; Tue, 5 Sep 2006 05:45:30 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E11FC43D60 for ; Tue, 5 Sep 2006 05:45:21 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k855jL9t002392 for ; Tue, 5 Sep 2006 05:45:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k855jHU3002373 for perforce@freebsd.org; Tue, 5 Sep 2006 05:45:17 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Sep 2006 05:45:17 GMT Message-Id: <200609050545.k855jHU3002373@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 105669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 05:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=105669 Change 105669 by imp@imp_paco-paco on 2006/09/05 05:44:39 IFC @105667 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/arm/src/UPDATING#4 integrate .. //depot/projects/arm/src/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/arm/src/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/arm/src/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/arm/src/contrib/libpcap/README.dag#2 integrate .. //depot/projects/arm/src/contrib/libpcap/VERSION#2 integrate .. //depot/projects/arm/src/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/arm/src/contrib/libpcap/configure#2 integrate .. //depot/projects/arm/src/contrib/libpcap/configure.in#2 integrate .. //depot/projects/arm/src/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/arm/src/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/arm/src/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/arm/src/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/arm/src/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/arm/src/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/arm/src/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/arm/src/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/arm/src/contrib/openbsm/bsm/audit.h#3 delete .. //depot/projects/arm/src/contrib/openbsm/bsm/audit_internal.h#3 delete .. //depot/projects/arm/src/contrib/openbsm/bsm/audit_kevents.h#3 delete .. //depot/projects/arm/src/contrib/openbsm/bsm/audit_record.h#3 delete .. //depot/projects/arm/src/contrib/openbsm/configure#3 integrate .. //depot/projects/arm/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/arm/src/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/FILES#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/configure#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/arm/src/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/arm/src/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/arm/src/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/arm/src/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/arm/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/arm/src/etc/rc.initdiskless#3 integrate .. //depot/projects/arm/src/lib/libbsm/Makefile#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tls.c#3 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/_set_tp.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/arm/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libthr/arch/ia64/ia64/pthread_md.c#3 integrate .. //depot/projects/arm/src/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/arm/src/lib/libthr/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/arm/src/lib/libthr/arch/powerpc/powerpc/pthread_md.c#3 integrate .. //depot/projects/arm/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/arm/src/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#5 integrate .. //depot/projects/arm/src/share/man/man4/ata.4#3 integrate .. //depot/projects/arm/src/share/man/man4/audit.4#2 integrate .. //depot/projects/arm/src/share/man/man4/gem.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ipfirewall.4#2 integrate .. //depot/projects/arm/src/share/man/man4/le.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/arm/src/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/arm/src/share/man/man8/picobsd.8#2 integrate .. //depot/projects/arm/src/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/arm/src/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/arm/src/sys/bsm/audit_record.h#6 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#27 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#11 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/arm/src/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/arm/src/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#8 integrate .. //depot/projects/arm/src/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/arm/src/sys/kern/bus_if.m#5 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/arm/src/sys/kern/subr_bus.c#17 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#16 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#19 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#24 integrate .. //depot/projects/arm/src/sys/modules/Makefile#29 integrate .. //depot/projects/arm/src/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/arm/src/sys/net/bpf.h#6 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/arm/src/sys/pci/agp_ati.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/arm/src/sys/security/audit/audit.h#5 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#7 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/arm/src/sys/sys/_bus_dma.h#1 branch .. //depot/projects/arm/src/sys/sys/bus.h#8 integrate .. //depot/projects/arm/src/sys/sys/bus_dma.h#3 integrate .. //depot/projects/arm/src/sys/sys/msgbuf.h#2 integrate .. //depot/projects/arm/src/sys/sys/param.h#16 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#16 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#16 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#17 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#8 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#8 integrate .. //depot/projects/arm/src/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/arm/src/usr.bin/su/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/su/su.c#2 integrate .. //depot/projects/arm/src/usr.bin/tip/tip/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/arm/src/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/arm/src/usr.sbin/eeprom/ofw_options.c#2 integrate .. //depot/projects/arm/src/usr.sbin/freebsd-update/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/arm/src/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate .. //depot/projects/arm/src/usr.sbin/lmcconfig/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/portsnap/portsnap/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/arm/src/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/watchdogd/watchdog.8#2 integrate .. //depot/projects/arm/src/usr.sbin/watchdogd/watchdogd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.50 2006/09/05 01:17:51 matusita Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -97,6 +97,10 @@ OLD_FILES+=etc/rc.d/ppp-user # 20051012: setkey(8) moved to /sbin/ OLD_FILES+=usr/sbin/setkey +# 20050930: pccardd(8) removed +OLD_FILES+=usr/sbin/pccardd +OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz +OLD_FILES+=usr/share/man/man8/pccardd.8.gz # 20050927: bridge(4) replaced by if_bridge(4) OLD_FILES+=usr/include/net/bridge.h # 20050831: not implemented ==== //depot/projects/arm/src/UPDATING#4 (text+ko) ==== @@ -21,6 +21,9 @@ developers choose to disable these features on build machines to maximize performance. +20060903: + libpcap updated to v0.9.4 and tcpdump to v3.9.4 + 20060816: The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour for IP_FIREWALL_FORWARD is now as it was before when it was first @@ -44,6 +47,13 @@ the nve(4) driver. Please update your configuration accordingly. +20060514: + The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx + PCnet family of NICs has been removed. The new le(4) driver serves + as an equivalent but cross-platform replacement with the pcn(4) + driver still providing performance-optimized support for the subset + of AMD Am79C971 PCnet-FAST and greater chips as before. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -603,4 +613,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ +$FreeBSD: src/UPDATING,v 1.455 2006/09/04 21:49:31 sam Exp $ ==== //depot/projects/arm/src/contrib/libpcap/CHANGES#2 (text+ko) ==== @@ -1,6 +1,17 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.1 2005/07/05 21:04:27 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL) + +Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release + + Support for radiotap on Linux (Mike Kershaw) + Fixes for HP-UX + Support for additional Juniper link-layer types + Fixes for filters on MPLS-encapsulated packets + "vlan" filter fixed + "pppoed" and "pppoes" filters added; the latter modifies later + parts of the filter expression to look at the PPP headers and + headers in the PPP payload -Tue. July 5, 2005. ken@xelerance.com. Summary for 3.9.x tcpdump +Tue. July 5, 2005. ken@xelerance.com. Summary for 0.9.3 libpcap release Fixes for compiling on nearly every platform, including improved 64bit support @@ -9,16 +20,12 @@ OpenBSD pf format support IrDA capture (Linux only) -Tue. May 27, 2005. mcr@sandelman.ottawa.on.ca. Summary for 0.9.1 release - - Numerous fixes for - Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release Fixed minor problem in gencode.c that would appear on 64-bit platforms. Version number is now sane. - + Mon. March 29, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.2 release updates for autoconf 2.5 @@ -31,13 +38,13 @@ Win32 patches from NetGroup, Politecnico di Torino (Italy) OpenBSD pf, DLT_PFLOG added Many changes to ATM support. - lookup pcap_lookupnet() + lookup pcap_lookupnet() Added DLT_ARCNET_LINUX, DLT_ENC, DLT_IEEE802_11_RADIO, DLT_SUNATM, DLT_IP_OVER_FC, DLT_FRELAY, others. Sigh. More AIX wonderfulness. - Document updates. + Document updates. Changes to API: pcap_next_ex(), pcap_breakloop(), pcap_dump_flush(), - pcap_list_datalinks(), pcap_set_datalink(), + pcap_list_datalinks(), pcap_set_datalink(), pcap_lib_version(), pcap_datalink_val_to_name(), pcap_datalink_name_to_val(), new error returns. @@ -58,7 +65,7 @@ Added pcap_findalldevs() call to get list of interfaces in a MI way. - pcap_stats() has been documented as to what its counters mean on + pcap_stats() has been documented as to what its counters mean on each platform. Tuesday January 9, 2001. guy@alum.mit.edu. Summary for 0.6 release @@ -131,7 +138,7 @@ - Added a new "pcap_compile_nopcap()", which lets you compile a filter expression into a BPF program without having an open live capture or capture file. - + v0.4 Sat Jul 25 12:40:09 PDT 1998 - Fix endian problem with DLT_NULL devices. From FreeBSD via Bill ==== //depot/projects/arm/src/contrib/libpcap/CREDITS#2 (text+ko) ==== @@ -63,6 +63,7 @@ Mark Pizzolato Martin Husemann Matthew Luckie + Mike Kershaw Mike Wiacek Monroe Williams Nicolas Dade ==== //depot/projects/arm/src/contrib/libpcap/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.5 2002/02/08 19:45:58 obrien Exp $ +$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6 2006/09/04 19:54:49 sam Exp $ This directory contains virgin copies of the original distribution files on a "vendor" branch. Do not, under any circumstances, attempt to upgrade @@ -9,28 +9,27 @@ [Do not make ANY changes to the files.] 2. Use the command: - cvs import -m 'Virgin import of LBL libpcap v' \ - -I SUNOS4 -I linux-include \ - src/contrib/libpcap LBL v + cvs import -m 'Import of libpcap v' \ + -I SUNOS4 -I msdos -I Win32 -I missing \ + -I ChmodBPF -I linux-include \ + src/contrib/libpcap TCPDUMP_ORG v - For example, to do the import of version 0.2.1, I typed: - cvs import -m 'Virgin import of LBL libpcap v0.2.1' \ - -I SUNOS4 -I linux-include \ - src/contrib/libpcap LBL v0_2_1 + For example, to do the import of version 0.9.4, I typed: + cvs import -m 'Import of libpcap v0.9.4 \ + -I SUNOS4 -I msdos -I Win32 -I missing \ + -I ChmodBPF -I linux-include \ + src/contrib/libpcap TCPDUMP_ORG v0_9_4 3. Follow the instructions printed out in step 2 to resolve any conflicts between local FreeBSD changes and the newer version. + 4. Bump __FreeBSD_version in sys/param.h as appropriate - 4. Update the shared library version number in - src/lib/libpcap/Makefile as described in the - handbook section 18. - Do not, under any circumstances, deviate from this procedure. To make local changes to libpcap, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the LBL branch. +branch (aka HEAD). Never make local changes on the TCPDUMP_ORG branch. All local changes should be submitted to "tcpdump-workers@tcpdump.org" for inclusion in the next vendor release of tcpdump and libpcap. -pst@freebsd.org - 19 Aug 1996 +sam@freebsd.org - 4 September 2006 ==== //depot/projects/arm/src/contrib/libpcap/README.dag#2 (text+ko) ==== @@ -37,12 +37,57 @@ ---------------------------------------------------------------------- +Libpcap when built for DAG cards against dag-2.5.1 or later releases: + +Timeouts are supported. pcap_dispatch() will return after to_ms milliseconds +regardless of how many packets are received. If to_ms is zero pcap_dispatch() +will block waiting for data indefinitely. + +pcap_dispatch() will block on and process a minimum of 64kB of data (before +filtering) for efficiency. This can introduce high latencies on quiet +interfaces unless a timeout value is set. The timeout expiring will override +the 64kB minimum causing pcap_dispatch() to process any available data and +return. + +pcap_setnonblock is supported. When nonblock is set, pcap_dispatch() will +check once for available data, process any data available up to count, then +return immediately. + +pcap_findalldevs() is supported, e.g. dag0, dag1... + +Some DAG cards can provide more than one 'stream' of received data. +This can be data from different physical ports, or separated by filtering +or load balancing mechanisms. Receive streams have even numbers, e.g. +dag0:0, dag0:2 etc. Specifying transmit streams for capture is not supported. + +pcap_setfilter() is supported, BPF programs run in userspace. + +pcap_setdirection() is not supported. Only received traffic is captured. +DAG cards normally do not have IP or link layer addresses assigned as +they are used to passively monitor links. + +pcap_breakloop() is supported. + +pcap_datalink() and pcap_list_datalinks() are supported. The DAG card does +not attempt to set the correct datalink type automatically where more than +one type is possible. + +pcap_stats() is supported. ps_drop is the number of packets dropped due to +RX stream buffer overflow, this count is before filters are applied (it will +include packets that would have been dropped by the filter). The RX stream +buffer size is user configurable outside libpcap, typically 16-512MB. + +pcap_get_selectable_fd() is not supported, DAG cards do not support +poll/select methods. + +pcap_inject() and pcap_sendpacket() are not supported. + +---------------------------------------------------------------------- + Please submit bug reports via . -Please also visit our Web pages at: +Please also visit our Web site at: http://www.endace.com/ - http://dag.cs.waikato.ac.nz/ For more information about Endace DAG cards contact . - ==== //depot/projects/arm/src/contrib/libpcap/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -0.9.1 +0.9.4 ==== //depot/projects/arm/src/contrib/libpcap/config.h.in#2 (text+ko) ==== @@ -13,6 +13,9 @@ /* define if you have the DAG API */ #undef HAVE_DAG_API +/* define if you have streams capable DAG API */ +#undef HAVE_DAG_STREAMS_API + /* Define to 1 if you have the declaration of `ether_hostton', and to 0 if you don't. */ #undef HAVE_DECL_ETHER_HOSTTON ==== //depot/projects/arm/src/contrib/libpcap/configure#2 (text+ko) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.120.2.6 . +# From configure.in Revision: 1.120.2.7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -5791,6 +5791,14 @@ LDFLAGS=$saved_ldflags + if test "$dag_version" = 2.5.x; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DAG_STREAMS_API 1 +_ACEOF + + fi + # See if we can find a specific version string. echo "$as_me:$LINENO: checking the DAG API version" >&5 echo $ECHO_N "checking the DAG API version... $ECHO_C" >&6 ==== //depot/projects/arm/src/contrib/libpcap/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.6 2005/06/20 21:37:43 guy Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.7 2005/07/07 06:56:03 guy Exp $ (LBL) dnl dnl Copyright (c) 1994, 1995, 1996, 1997 dnl The Regents of the University of California. All rights reserved. @@ -6,7 +6,7 @@ dnl Process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.120.2.6 $) +AC_REVISION($Revision: 1.120.2.7 $) AC_PREREQ(2.50) AC_INIT(pcap.c) @@ -569,6 +569,10 @@ AC_CHECK_LIB([dag], [dag_attach_stream], [dag_version="2.5.x"], [dag_version="2.4.x"]) LDFLAGS=$saved_ldflags + if test "$dag_version" = 2.5.x; then + AC_DEFINE(HAVE_DAG_STREAMS_API, 1, [define if you have streams capable DAG API]) + fi + # See if we can find a specific version string. AC_MSG_CHECKING([the DAG API version]) if test -r "$dag_root/VERSION"; then ==== //depot/projects/arm/src/contrib/libpcap/ethertype.h#2 (text+ko) ==== @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/libpcap/ethertype.h,v 1.13 2004/06/16 08:20:28 hannes Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/ethertype.h,v 1.13.2.1 2005/09/05 09:08:03 guy Exp $ (LBL) */ /* @@ -108,6 +108,12 @@ #ifndef ETHERTYPE_MPLS_MULTI #define ETHERTYPE_MPLS_MULTI 0x8848 #endif +#ifndef ETHERTYPE_PPPOED +#define ETHERTYPE_PPPOED 0x8863 +#endif +#ifndef ETHERTYPE_PPPOES +#define ETHERTYPE_PPPOES 0x8864 +#endif #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 #endif ==== //depot/projects/arm/src/contrib/libpcap/fad-win32.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/fad-win32.c,v 1.11 2005/01/29 00:52:22 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/fad-win32.c,v 1.11.2.1 2005/09/01 22:07:41 risso Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -224,12 +224,22 @@ ULONG NameLength; char *name; - PacketGetAdapterNames(NULL, &NameLength); + if(!PacketGetAdapterNames(NULL, &NameLength) && NameLength == 0) + { + /* + * If PacketGetAdapterNames *and* sets the lenght of the buffer to zero, + * it means there was an error. + */ + snprintf(errbuf, PCAP_ERRBUF_SIZE, "PacketGetAdapterNames failed: %s", pcap_win32strerror()); + *alldevsp = NULL; + return -1; + } if (NameLength > 0) AdaptersName = (char*) malloc(NameLength); else { + snprintf(errbuf, PCAP_ERRBUF_SIZE, "no adapters found."); *alldevsp = NULL; return 0; } ==== //depot/projects/arm/src/contrib/libpcap/gencode.c#2 (text+ko) ==== @@ -19,11 +19,11 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.15 2005/07/11 03:43:25 sam Exp $ + * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.16 2006/09/04 19:54:21 sam Exp $ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.24 2005/06/20 21:52:53 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.34 2005/09/05 09:08:04 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -86,7 +86,6 @@ #endif /*INET6*/ #include -#undef ETHERMTU #define ETHERMTU 1500 #ifndef IPPROTO_SCTP @@ -103,8 +102,8 @@ static jmp_buf top_ctx; static pcap_t *bpf_pcap; -/* Hack for updating VLAN, MPLS offsets. */ -static u_int orig_linktype = -1U, orig_nl = -1U; +/* Hack for updating VLAN, MPLS, and PPPoE offsets. */ +static u_int orig_linktype = -1U, orig_nl = -1U, label_stack_depth = -1U; /* XXX */ #ifdef PCAP_FDDIPAD @@ -208,6 +207,7 @@ static struct block *gen_wlanhostop(const u_char *, int); static struct block *gen_ipfchostop(const u_char *, int); static struct block *gen_dnhostop(bpf_u_int32, int); +static struct block *gen_mpls_linktype(int); static struct block *gen_host(bpf_u_int32, bpf_u_int32, int, int); #ifdef INET6 static struct block *gen_host6(struct in6_addr *, struct in6_addr *, int, int); @@ -781,6 +781,9 @@ off_proto = -1; off_payload = -1; + /* + * And assume we're not doing SS7. + */ off_sio = -1; off_opc = -1; off_dpc = -1; @@ -793,6 +796,7 @@ orig_linktype = -1; orig_nl = -1; + label_stack_depth = 0; reg_ll_size = -1; @@ -1116,8 +1120,12 @@ off_nl_nosnap = PFLOG_HDRLEN; /* no 802.2 LLC */ return; + case DLT_JUNIPER_MFR: case DLT_JUNIPER_MLFR: case DLT_JUNIPER_MLPPP: + case DLT_JUNIPER_PPP: + case DLT_JUNIPER_CHDLC: + case DLT_JUNIPER_FRELAY: off_linktype = 4; off_nl = 4; off_nl_nosnap = -1; /* no 802.2 LLC */ @@ -1138,6 +1146,7 @@ /* frames captured on a Juniper PPPoE service PIC * contain raw ethernet frames */ case DLT_JUNIPER_PPPOE: + case DLT_JUNIPER_ETHER: off_linktype = 16; off_nl = 18; /* Ethernet II */ off_nl_nosnap = 21; /* 802.3+802.2 */ @@ -1854,6 +1863,25 @@ { struct block *b0, *b1, *b2; + /* are we checking MPLS-encapsulated packets? */ + if (label_stack_depth > 0) { + switch (proto) { + case ETHERTYPE_IP: + case PPP_IP: + /* FIXME add other L3 proto IDs */ + return gen_mpls_linktype(Q_IP); + + case ETHERTYPE_IPV6: + case PPP_IPV6: + /* FIXME add other L3 proto IDs */ + return gen_mpls_linktype(Q_IPV6); + + default: + bpf_error("unsupported protocol over mpls"); + /* NOTREACHED */ + } + } + switch (linktype) { case DLT_EN10MB: @@ -2243,6 +2271,7 @@ /*NOTREACHED*/ break; + case DLT_JUNIPER_MFR: case DLT_JUNIPER_MLFR: case DLT_JUNIPER_MLPPP: case DLT_JUNIPER_ATM1: @@ -2253,6 +2282,10 @@ case DLT_JUNIPER_ES: case DLT_JUNIPER_MONITOR: case DLT_JUNIPER_SERVICES: + case DLT_JUNIPER_ETHER: + case DLT_JUNIPER_PPP: + case DLT_JUNIPER_FRELAY: + case DLT_JUNIPER_CHDLC: /* just lets verify the magic number for now - * on ATM we may have up to 6 different encapsulations on the wire * and need a lot of heuristics to figure out that the payload @@ -3037,7 +3070,41 @@ return b1; } +/* + * Generate a check for IPv4 or IPv6 for MPLS-encapsulated packets; + * test the bottom-of-stack bit, and then check the version number + * field in the IP header. + */ static struct block * +gen_mpls_linktype(proto) + int proto; +{ + struct block *b0, *b1; + + switch (proto) { + + case Q_IP: + /* match the bottom-of-stack bit */ + b0 = gen_mcmp(OR_NET, -2, BPF_B, 0x01, 0x01); + /* match the IPv4 version number */ + b1 = gen_mcmp(OR_NET, 0, BPF_B, 0x40, 0xf0); + gen_and(b0, b1); + return b1; + + case Q_IPV6: + /* match the bottom-of-stack bit */ + b0 = gen_mcmp(OR_NET, -2, BPF_B, 0x01, 0x01); + /* match the IPv4 version number */ + b1 = gen_mcmp(OR_NET, 0, BPF_B, 0x60, 0xf0); + gen_and(b0, b1); + return b1; + + default: + abort(); + } +} + +static struct block * gen_host(addr, mask, proto, dir) bpf_u_int32 addr; bpf_u_int32 mask; @@ -3050,11 +3117,15 @@ case Q_DEFAULT: b0 = gen_host(addr, mask, Q_IP, dir); - if (off_linktype != (u_int)-1) { - b1 = gen_host(addr, mask, Q_ARP, dir); - gen_or(b0, b1); - b0 = gen_host(addr, mask, Q_RARP, dir); - gen_or(b1, b0); + /* + * Only check for non-IPv4 addresses if we're not + * checking MPLS-encapsulated packets. + */ + if (label_stack_depth == 0) { + b1 = gen_host(addr, mask, Q_ARP, dir); + gen_or(b0, b1); + b0 = gen_host(addr, mask, Q_RARP, dir); + gen_or(b1, b0); } return b0; @@ -4396,6 +4467,7 @@ * * So we always check for ETHERTYPE_IP. */ + b0 = gen_linktype(ETHERTYPE_IP); #ifndef CHASE_CHAIN b1 = gen_cmp(OR_NET, 9, BPF_B, (bpf_int32)v); @@ -5986,6 +6058,7 @@ } break; + case DLT_JUNIPER_MFR: case DLT_JUNIPER_MLFR: case DLT_JUNIPER_MLPPP: case DLT_JUNIPER_ATM1: @@ -5996,6 +6069,10 @@ case DLT_JUNIPER_ES: case DLT_JUNIPER_MONITOR: case DLT_JUNIPER_SERVICES: + case DLT_JUNIPER_ETHER: + case DLT_JUNIPER_PPP: + case DLT_JUNIPER_FRELAY: + case DLT_JUNIPER_CHDLC: /* juniper flags (including direction) are stored * the byte after the 3-byte magic number */ if (dir) { @@ -6039,7 +6116,7 @@ return (b0); } -/* PF firewall log matched interface */ +/* PF firewall log ruleset name */ struct block * gen_pf_ruleset(char *ruleset) { @@ -6178,7 +6255,11 @@ gen_vlan(vlan_num) int vlan_num; { - struct block *b0; + struct block *b0, *b1; + + /* can't check for VLAN-encapsulated packets inside MPLS */ + if (label_stack_depth > 0) + bpf_error("no VLAN match after MPLS"); /* * Change the offsets to point to the type and data fields within @@ -6210,30 +6291,28 @@ * be done assuming a VLAN, even though the "or" could be viewed * as meaning "or, if this isn't a VLAN packet...". */ - orig_linktype = off_linktype; /* save original values */ - orig_nl = off_nl; + orig_linktype = off_linktype; /* save original values */ + orig_nl = off_nl; - switch (linktype) { + switch (linktype) { - case DLT_EN10MB: - off_linktype += 4; - off_nl_nosnap += 4; - off_nl += 4; - break; + case DLT_EN10MB: + off_linktype += 4; + off_nl_nosnap += 4; + off_nl += 4; + break; - default: - bpf_error("no VLAN support for data link type %d", - linktype); - /*NOTREACHED*/ - } + default: + bpf_error("no VLAN support for data link type %d", + linktype); + /*NOTREACHED*/ + } /* check for VLAN */ b0 = gen_cmp(OR_LINK, orig_linktype, BPF_H, (bpf_int32)ETHERTYPE_8021Q); /* If a specific VLAN is requested, check VLAN id */ if (vlan_num >= 0) { - struct block *b1; - b1 = gen_mcmp(OR_LINK, orig_nl, BPF_H, (bpf_int32)vlan_num, 0x0fff); gen_and(b0, b1); @@ -6250,7 +6329,7 @@ gen_mpls(label_num) int label_num; { - struct block *b0; + struct block *b0,*b1; /* * Change the offsets to point to the type and data fields within @@ -6261,44 +6340,46 @@ * * XXX - this is a bit of a kludge. See comments in gen_vlan(). */ - orig_linktype = off_linktype; /* save original values */ orig_nl = off_nl; - switch (linktype) { - - case DLT_C_HDLC: /* fall through */ - case DLT_EN10MB: - off_nl_nosnap += 4; - off_nl += 4; - - b0 = gen_cmp(OR_LINK, orig_linktype, BPF_H, - (bpf_int32)ETHERTYPE_MPLS); - break; - - case DLT_PPP: - off_nl_nosnap += 4; - off_nl += 4; - - b0 = gen_cmp(OR_LINK, orig_linktype, BPF_H, - (bpf_int32)PPP_MPLS_UCAST); - break; - - /* FIXME add other DLT_s ... - * for Frame-Relay/and ATM this may get messy due to SNAP headers - * leave it for now */ - - default: - bpf_error("no MPLS support for data link type %d", + if (label_stack_depth > 0) { + /* just match the bottom-of-stack bit clear */ + b0 = gen_mcmp(OR_LINK, orig_nl-2, BPF_B, 0, 0x01); + } else { + /* + * Indicate that we're checking MPLS-encapsulated headers, + * to make sure higher level code generators don't try to >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 5 07:37:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FF3716A4E0; Tue, 5 Sep 2006 07:37:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B99B16A4DE for ; Tue, 5 Sep 2006 07:37:45 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9D2543D45 for ; Tue, 5 Sep 2006 07:37:44 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k857bi4E010952 for ; Tue, 5 Sep 2006 07:37:44 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k857bi0T010949 for perforce@freebsd.org; Tue, 5 Sep 2006 07:37:44 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 5 Sep 2006 07:37:44 GMT Message-Id: <200609050737.k857bi0T010949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 105672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 07:37:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=105672 Change 105672 by gonzo@gonzo_hideout on 2006/09/05 07:36:58 o Arghh.. One more missing file. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/Makefile.inc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 5 07:40:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B157B16A4E2; Tue, 5 Sep 2006 07:40:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F8F516A4DD for ; Tue, 5 Sep 2006 07:40:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A38F43D76 for ; Tue, 5 Sep 2006 07:40:49 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k857enTS011173 for ; Tue, 5 Sep 2006 07:40:49 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k857emR5011168 for perforce@freebsd.org; Tue, 5 Sep 2006 07:40:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 5 Sep 2006 07:40:48 GMT Message-Id: <200609050740.k857emR5011168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 105673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 07:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=105673 Change 105673 by gonzo@gonzo_hideout on 2006/09/05 07:40:18 o This file is required by installworld Pointed by: dwight@ Affected files ... .. //depot/projects/mips2/src/etc/etc.mips/ttys#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 5 14:34:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A08016A4E1; Tue, 5 Sep 2006 14:34:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47C5416A4DA for ; Tue, 5 Sep 2006 14:34:28 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EB1B43D4C for ; Tue, 5 Sep 2006 14:34:28 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85EYRwn056035 for ; Tue, 5 Sep 2006 14:34:27 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85EYR7C056032 for perforce@freebsd.org; Tue, 5 Sep 2006 14:34:27 GMT (envelope-from swhitman@FreeBSD.org) Date: Tue, 5 Sep 2006 14:34:27 GMT Message-Id: <200609051434.k85EYR7C056032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 105679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 14:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=105679 Change 105679 by swhitman@swhitman_joecatmini on 2006/09/05 14:34:17 Created new directory to continue work in. (The original needs to stay as is for SoC). Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/Makefile#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/SocTask1#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/SocTask2#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/TODO#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/cpp.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/expr.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/file.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/flint.lnt#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/gcc.h#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/k-soc.tgz#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/k.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/k.h#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/lexer.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/notes#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/parser.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/string.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/symbol.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/test.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/test.h#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/token.tcl#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/token_data.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/postSoCK/types.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 5 15:47:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 620DF16A549; Tue, 5 Sep 2006 15:47:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1916716A533 for ; Tue, 5 Sep 2006 15:47:03 +0000 (UTC) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B6D943D46 for ; Tue, 5 Sep 2006 15:47:00 +0000 (GMT) (envelope-from ssouhlal@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85FkxPT062359 for ; Tue, 5 Sep 2006 15:47:00 GMT (envelope-from ssouhlal@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85FkxjK062356 for perforce@freebsd.org; Tue, 5 Sep 2006 15:46:59 GMT (envelope-from ssouhlal@freebsd.org) Date: Tue, 5 Sep 2006 15:46:59 GMT Message-Id: <200609051546.k85FkxjK062356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ssouhlal@freebsd.org using -f From: Suleiman Souhlal To: Perforce Change Reviews Cc: Subject: PERFORCE change 105681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 15:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=105681 Change 105681 by ssouhlal@ssouhlal-maho on 2006/09/05 15:46:32 Make struct trapframe 8 byte aligned. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/frame.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/frame.h#3 (text+ko) ==== @@ -69,10 +69,10 @@ #define TF_NREGS 23 +/* Needs to be 8-byte aligned */ struct trapframe { __register_t tf_regs[TF_NREGS]; u_int32_t tf_ppl; /* previous priority level */ - int32_t tf_pad; /* for 8 byte aligned */ }; struct frame { From owner-p4-projects@FreeBSD.ORG Tue Sep 5 18:18:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62C6216A4E2; Tue, 5 Sep 2006 18:18:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C8CA16A4DF for ; Tue, 5 Sep 2006 18:18:13 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9C0743D49 for ; Tue, 5 Sep 2006 18:18:12 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85IICGC092149 for ; Tue, 5 Sep 2006 18:18:12 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85IICWj092146 for perforce@freebsd.org; Tue, 5 Sep 2006 18:18:12 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 5 Sep 2006 18:18:12 GMT Message-Id: <200609051818.k85IICWj092146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 105686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 18:18:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=105686 Change 105686 by gonzo@gonzo_hideout on 2006/09/05 18:17:16 o One more missing file :( Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/Ovfork.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 5 18:57:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D6C516A4ED; Tue, 5 Sep 2006 18:57:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BC2416A4E5 for ; Tue, 5 Sep 2006 18:57:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1903043DA3 for ; Tue, 5 Sep 2006 18:57:09 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85Iv31Q094177 for ; Tue, 5 Sep 2006 18:57:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85Iv3dd094174 for perforce@freebsd.org; Tue, 5 Sep 2006 18:57:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 5 Sep 2006 18:57:03 GMT Message-Id: <200609051857.k85Iv3dd094174@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 105688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 18:57:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=105688 Change 105688 by hselasky@hselasky_mini_itx on 2006/09/05 18:56:24 Finished reworking uscanner. Initial version was written by "Attilio Rao". Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uscanner.c#4 (text+ko) ==== @@ -1,0 +1,669 @@ +/* $NetBSD: uscanner.c,v 1.30 2002/07/11 21:14:36 augustss Exp$ */ + +/* Also already merged from NetBSD: + * $NetBSD: uscanner.c,v 1.33 2002/09/23 05:51:24 simonb Exp $ + */ + +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (lennart@augustsson.net) at + * Carlstedt Research & Technology + * and Nick Hibma (n_hibma@qubesoft.com). + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "usbdevs.h" + +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.70 2006/04/11 10:44:31 flz Exp $"); + +/* + * uscanner debugging statements. + */ +#ifdef USB_DEBUG +static int uscanner_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, uscanner, CTLFLAG_RW, 0, "USB uscanner"); +SYSCTL_INT(_hw_usb_uscanner, OID_AUTO, uscanner, CTLFLAG_RW, &uscanner_debug, + 0, "uscanner debug level"); + +#define DPRINTF(n, fmt, ...) do { \ + if (uscanner_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__ \ + ,## __VA_ARGS__); \ + } \ + } while (0) +#else +#define DPRINTF(...) +#endif + +/* + * uscanner transfers macros definition. + */ +#define USCANNER_BSIZE (1 << 16) +#define USCANNER_IFQ_MAXLEN 2 +#define USCANNER_N_TRANSFER 4 + +/* + * Transfers stallings handling flags definition. + */ +#define USCANNER_FLAG_READ_STALL 0x01 +#define USCANNER_FLAG_WRITE_STALL 0x02 + +/* + * uscanner_info flags definition. + */ +#define USCANNER_FLAG_KEEP_OPEN 0x04 + + /* + * uscanner driver specific structures. + */ +struct uscanner_info { + struct usb_devno devno; + uint8_t flags; +}; + +struct uscanner_softc { + struct usb_cdev sc_cdev; + struct mtx sc_mtx; + struct usbd_memory_wait sc_mem_wait; + + device_t sc_dev; + struct usbd_xfer * sc_xfer[USCANNER_N_TRANSFER]; + + uint8_t sc_flags; /* Used to prevent stalls */ +}; + +/* + * Prototypes for driver handling routines (sorted by use). + */ +static device_probe_t uscanner_probe; +static device_attach_t uscanner_attach; +static device_detach_t uscanner_detach; + +/* + * Prototypes for xfer transfer callbacks. + */ +static void uscanner_read_callback(struct usbd_xfer *xfer); +static void uscanner_read_clear_stall_callback(struct usbd_xfer *xfer); +static void uscanner_write_callback(struct usbd_xfer *xfer); +static void uscanner_write_clear_stall_callback(struct usbd_xfer *xfer); + +/* + * Prototypes for the character device handling routines. + */ +static int32_t uscanner_open(struct usb_cdev *cdev, int32_t fflags, + int32_t devtype, struct thread *td); +static void uscanner_start_read(struct usb_cdev *cdev); +static void uscanner_start_write(struct usb_cdev *cdev); +static void uscanner_stop_read(struct usb_cdev *cdev); +static void uscanner_stop_write(struct usb_cdev *cdev); + +/* + * xfer transfers array. Resolve-stalling callbacks are marked as control + * transfers. + */ +static const struct usbd_config uscanner_config [USCANNER_N_TRANSFER] = { + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = USCANNER_BSIZE, + .flags = 0, + .callback = &uscanner_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = USCANNER_BSIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &uscanner_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &uscanner_write_clear_stall_callback, + .timeout = 1000, + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &uscanner_read_clear_stall_callback, + .timeout = 1000, + }, +}; + +static devclass_t uscanner_devclass; + +static device_method_t uscanner_methods[] = { + DEVMETHOD(device_probe, uscanner_probe), + DEVMETHOD(device_attach, uscanner_attach), + DEVMETHOD(device_detach, uscanner_detach), + { 0, 0 } +}; + +static driver_t uscanner_driver = { + .name = "uscanner", + .methods = uscanner_methods, + .size = sizeof(struct uscanner_softc), +}; + +DRIVER_MODULE(uscanner, uhub, uscanner_driver, uscanner_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uscanner, usb, 1, 1, 1); + +/* + * USB scanners probing array. It determines flags too. + */ +static const struct uscanner_info uscanner_devs[] = { + /* Acer */ + { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U }, 0 }, + { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U }, 0 }, + { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640BT }, 0 }, + { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U }, 0 }, + { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_1240U }, 0 }, + { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U }, 0 }, + /* AGFA */ + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1236U }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2 }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE40 }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE50 }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE20 }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE25 }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE26 }, 0 }, + { { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE52 }, 0 }, + /* Avision */ + { { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U }, 0 }, + /* Canon */ + { { USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 }, + { { USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U }, 0 }, + { { USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U }, 0 }, + { { USB_VENDOR_CANON, USB_PRODUCT_CANON_D660U }, 0 }, + { { USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U }, 0 }, + { { USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE25 }, 0 }, + /* Epson */ + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1250 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1670 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_RX425 }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3200 }, USCANNER_FLAG_KEEP_OPEN }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USCANNER_FLAG_KEEP_OPEN }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 }, + { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 }, + /* HP */ + { { USB_VENDOR_HP, USB_PRODUCT_HP_2200C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_3300C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_4100C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_4200C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_4300C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_4670V }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_S20 }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_5200C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_5300C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_5400C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, 0 }, + { { USB_VENDOR_HP, USB_PRODUCT_HP_82x0C }, 0 }, + /* Kye */ + { { USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO }, 0 }, + /* Microtek */ + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U }, 0 }, + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX }, 0 }, + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2 }, 0 }, + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6 }, 0 }, + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL }, 0 }, + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2 }, 0 }, + { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL }, 0 }, + /* Minolta */ + { { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_5400 }, 0 }, + /* Mustek */ + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200TA }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS }, 0 }, + { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS }, 0 }, + /* National */ + { { USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200 }, 0 }, + { { USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400 }, 0 }, + /* Nikon */ + { { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_LS40 }, 0 }, + /* Primax */ + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_6200 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600 }, 0 }, + { { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600 }, 0 }, + /* Scanlogic */ + { { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX }, 0 }, + /* Ultima */ + { { USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS }, 0 }, + /* UMAX */ + { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, + { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U }, 0 }, + { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U }, 0 }, + { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U }, 0 }, + { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U }, 0 }, + { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400 }, 0 }, + /* Visioneer */ + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_3000 }, 0 }, + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300 }, 0 }, + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600 }, 0 }, + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100 }, 0 }, + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6200 }, 0 }, + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100 }, 0 }, + { { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600 }, 0 } +}; + +/* + * It returns vendor and product ids. + */ +static inline const struct uscanner_info * +uscanner_lookup(uint16_t v, uint16_t p) +{ + return ((const struct uscanner_info *)usb_lookup(uscanner_devs, v, p)); +} + +/* + * uscanner device probing method. + */ +static int +uscanner_probe(device_t dev) +{ + struct usb_attach_arg *uaa; + + DPRINTF(10, "\n"); + + uaa = device_get_ivars(dev); + if (uaa->iface != NULL) { + return (UMATCH_NONE); + } + + return ((uscanner_lookup(uaa->vendor, uaa->product) != NULL) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +/* + * uscanner device attaching method. + */ +static int +uscanner_attach(device_t dev) +{ + struct usb_attach_arg *uaa; + struct uscanner_softc *sc; + struct usbd_device *udev; + const char *p_buf[2]; + char buf[32]; + int32_t unit; + int error; + + uaa = device_get_ivars(dev); + sc = device_get_softc(dev); + unit = device_get_unit(dev); + + /* + * A first path softc structure filling. sc_cdev, sc_mem_wait and + * sc_xfer are filled later with appropriate functions. + */ + sc->sc_dev = dev; + sc->sc_flags = uscanner_lookup(uaa->vendor, uaa->product)->flags; + mtx_init(&(sc->sc_mtx), "uscanner mutex", NULL, MTX_DEF | MTX_RECURSE); + + /* + * Announce the device: + */ + usbd_set_desc(dev, uaa->device); + + /* + * Assume only one interface and check for this. + */ + udev = uaa->device; + if ((error = usbd_set_config_no(udev, 1, 1))) { + device_printf(dev, "could not set config number\n"); + goto detach; + } + + /* + * Setup the transfer. + */ + if ((error = usbd_transfer_setup(udev, uaa->iface_index, sc->sc_xfer, + uscanner_config, USCANNER_N_TRANSFER, sc, &(sc->sc_mtx), + &(sc->sc_mem_wait)))) { + device_printf(dev, "could not setup transfers, " + "error=%s\n", usbd_errstr(error)); + goto detach; + } + + /* + * Setup the character device for USB scanner. + */ + snprintf(buf, sizeof(buf), "uscanner%u", unit); + p_buf[0] = buf; + p_buf[1] = NULL; + + sc->sc_cdev.sc_start_read = &uscanner_start_read; + sc->sc_cdev.sc_stop_read = &uscanner_stop_read; + sc->sc_cdev.sc_start_write = &uscanner_start_write; + sc->sc_cdev.sc_stop_write = &uscanner_stop_write; + sc->sc_cdev.sc_open = &uscanner_open; + sc->sc_cdev.sc_flags |= (USB_CDEV_FLAG_FWD_SHORT| + USB_CDEV_FLAG_WAKEUP_RD_IMMED | + USB_CDEV_FLAG_WAKEUP_WR_IMMED); + + if ((error = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, + UID_ROOT, GID_OPERATOR, 0644, USCANNER_BSIZE, USCANNER_IFQ_MAXLEN, + USCANNER_BSIZE, USCANNER_IFQ_MAXLEN))) { + device_printf(dev, "error setting the " + "char device!\n"); + goto detach; + } + + return (0); + +detach: + uscanner_detach(dev); + return ENOMEM; +} + +/* + * uscanner device detaching method. + */ +static int +uscanner_detach(device_t dev) +{ + struct uscanner_softc *sc; + + sc = device_get_softc(dev); + + usb_cdev_detach(&(sc->sc_cdev)); + usbd_transfer_unsetup(sc->sc_xfer, USCANNER_N_TRANSFER); + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); + mtx_destroy(&(sc->sc_mtx)); + + return (0); +} + +/* + * Reading callback. Implemented as an "in" bulk transfer. + */ +static void +uscanner_read_callback(struct usbd_xfer *xfer) +{ + struct uscanner_softc *sc; + struct usbd_mbuf *m; + + sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + +tr_transferred: + usb_cdev_put_data(&(sc->sc_cdev), xfer->buffer, xfer->actlen, 1); + +tr_setup: + /* + * If reading is in stall, just jump to clear stall callback and + * solve the situation. + */ + if (sc->sc_flags & USCANNER_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + return; + } + + USBD_IF_POLL(&(sc->sc_cdev).sc_rdq_free, m); + if (m) { + usbd_start_hardware(xfer); + } + return; + +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flags |= USCANNER_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); + } + return; +} + +/* + * Removing stall on reading callback. + */ +static void +uscanner_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uscanner_softc *sc; + struct usbd_xfer *xfer_other; + + sc = xfer->priv_sc; + xfer_other = sc->sc_xfer[1]; + + USBD_CHECK_STATUS(xfer); + +tr_setup: + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; + +tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + sc->sc_flags &= ~USCANNER_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + return; + +tr_error: + sc->sc_flags &= ~USCANNER_FLAG_READ_STALL; + usb_cdev_put_data_error(&(sc->sc_cdev)); + return; +} + +/* + * Writing callback. Implemented as an "out" bulk transfer. + */ +static void +uscanner_write_callback(struct usbd_xfer *xfer) +{ + struct uscanner_softc *sc; + uint32_t actlen; + + sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + +tr_setup: +tr_transferred: + /* + * If writing is in stall, just jump to clear stall callback and + * solve the situation. + */ + if (sc->sc_flags & USCANNER_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; + } + + /* + * Write datas, setup and perform hardware transfer. + */ + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->buffer, USCANNER_BSIZE, + &actlen, 0)) { + xfer->length = actlen; + usbd_start_hardware(xfer); + } + return; + +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flags |= USCANNER_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + return; +} + +/* + * Removing stall on writing callback. + */ +static void +uscanner_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uscanner_softc *sc; + struct usbd_xfer *xfer_other; + + sc = xfer->priv_sc; + xfer_other = sc->sc_xfer[0]; + + USBD_CHECK_STATUS(xfer); + +tr_setup: + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; + +tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + sc->sc_flags &= ~USCANNER_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + return; + +tr_error: + sc->sc_flags &= ~USCANNER_FLAG_WRITE_STALL; + usb_cdev_get_data_error(&(sc->sc_cdev)); + return; +} + +/* + * uscanner character device opening method. + */ +static int32_t +uscanner_open(struct usb_cdev *cdev, int32_t fflags, int32_t devtype, + struct thread *td) +{ + struct uscanner_softc *sc; + + sc = cdev->sc_priv_ptr; + + if (!(sc->sc_flags & USCANNER_FLAG_KEEP_OPEN)) { + if (fflags & FWRITE) { + sc->sc_flags |= USCANNER_FLAG_WRITE_STALL; + } + + if (fflags & FREAD) { + sc->sc_flags |= USCANNER_FLAG_READ_STALL; + } + } + return (0); +} + +/* + * uscanner character device start reading method. + */ +static void +uscanner_start_read(struct usb_cdev *cdev) +{ + struct uscanner_softc *sc; + + sc = cdev->sc_priv_ptr; + usbd_transfer_start(sc->sc_xfer[1]); +} + +/* + * uscanner character device start writing method. + */ +static void +uscanner_start_write(struct usb_cdev *cdev) +{ + struct uscanner_softc *sc; + + sc = cdev->sc_priv_ptr; + usbd_transfer_start(sc->sc_xfer[0]); +} + +/* + * uscanner character device stop reading method. + */ +static void +uscanner_stop_read(struct usb_cdev *cdev) +{ + struct uscanner_softc *sc; + + sc = cdev->sc_priv_ptr; + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); +} + +/* + * uscanner character device stop writing method. + */ +static void +uscanner_stop_write(struct usb_cdev *cdev) +{ + struct uscanner_softc *sc; + + sc = cdev->sc_priv_ptr; + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); +} From owner-p4-projects@FreeBSD.ORG Tue Sep 5 19:18:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB48E16A4E2; Tue, 5 Sep 2006 19:18:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F85016A4DD for ; Tue, 5 Sep 2006 19:18:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8824C43D46 for ; Tue, 5 Sep 2006 19:18:30 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85JIUCf096348 for ; Tue, 5 Sep 2006 19:18:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85JIU6d096345 for perforce@freebsd.org; Tue, 5 Sep 2006 19:18:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 5 Sep 2006 19:18:30 GMT Message-Id: <200609051918.k85JIU6d096345@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 105689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 19:18:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=105689 Change 105689 by hselasky@hselasky_mini_itx on 2006/09/05 19:18:11 Define "device_get_dma_tag()" to "bus_get_dma_tag()", when "bus_get_dma_tag()" is available on FreeBSD. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#20 (text+ko) ==== @@ -738,8 +738,12 @@ usbd_mem_free_sub(struct usbd_page *page); #ifdef __FreeBSD__ +#if (__FreeBSD_version >= 700020) +#define device_get_dma_tag(dev) bus_get_dma_tag(dev) +#else #define device_get_dma_tag(dev) NULL /* XXX */ #endif +#endif void usbd_std_transfer_setup(struct usbd_xfer *xfer, const struct usbd_config *setup, From owner-p4-projects@FreeBSD.ORG Tue Sep 5 21:11:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 131C416A4F2; Tue, 5 Sep 2006 21:11:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E36DC16A4EE for ; Tue, 5 Sep 2006 21:11:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8586F43D70 for ; Tue, 5 Sep 2006 21:10:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85LAuDi015103 for ; Tue, 5 Sep 2006 21:10:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85LAuG9015100 for perforce@freebsd.org; Tue, 5 Sep 2006 21:10:56 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Sep 2006 21:10:56 GMT Message-Id: <200609052110.k85LAuG9015100@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 105698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 21:11:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=105698 Change 105698 by imp@imp_lighthouse on 2006/09/05 21:10:13 Fix silly typos Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#18 (text+ko) ==== @@ -288,17 +288,18 @@ *(uint32_t *)data = RD4(sc, PIO_PDSR); return (0); case GPIO_CFG: /* Configure GPIO pins */ - if (sc->cfgmask & GPIO_CFG_INPUT) { - WR4(sc, PIO_OER, sc->iomask & ~sc->input); - WR4(sc, PIO_ODR, sc->iomask & sc->input); + cfg = (struct gpio_cfg *)data; + if (cfg->cfgmask & GPIO_CFG_INPUT) { + WR4(sc, PIO_OER, cfg->iomask & ~cfg->input); + WR4(sc, PIO_ODR, cfg->iomask & cfg->input); } - if (sc->cfgmask & GPIO_CFG_HI_Z) { - WR4(sc, PIO_MDER, sc->iomask & ~sc->hi_z); - WR4(sc, PIO_MDDR, sc->iomask & sc->hi_z); + if (cfg->cfgmask & GPIO_CFG_HI_Z) { + WR4(sc, PIO_MDER, cfg->iomask & ~cfg->hi_z); + WR4(sc, PIO_MDDR, cfg->iomask & cfg->hi_z); } - if (ac->cfgmask & GPIO_CFG_PULLUP) { - WR4(sc, PIO_PUER, sc->iomask & ~sc->pullup); - WR4(sc, PIO_PUDR, sc->iomask & sc->pullup); + if (cfg->cfgmask & GPIO_CFG_PULLUP) { + WR4(sc, PIO_PUER, cfg->iomask & ~cfg->pullup); + WR4(sc, PIO_PUDR, cfg->iomask & cfg->pullup); } return (0); case GPIO_INFO: /* Learn about this device's GPIO bits */ From owner-p4-projects@FreeBSD.ORG Tue Sep 5 21:15:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E2FA16A4FA; Tue, 5 Sep 2006 21:15:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56DF416A4E2 for ; Tue, 5 Sep 2006 21:15:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 502AE43D6E for ; Tue, 5 Sep 2006 21:15:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85LF2lw015356 for ; Tue, 5 Sep 2006 21:15:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85LF2J9015353 for perforce@freebsd.org; Tue, 5 Sep 2006 21:15:02 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Sep 2006 21:15:02 GMT Message-Id: <200609052115.k85LF2J9015353@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 105699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 21:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=105699 Change 105699 by imp@imp_lighthouse on 2006/09/05 21:14:25 "Hey Rockie! Watch me pull a rabit from this hat." "Not that old trick again. That trick never works." "No doubt about it, I gotta get another hat" No, really, make it compile. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#19 (text+ko) ==== @@ -273,6 +273,7 @@ struct thread *td) { struct at91_pio_softc *sc = CDEV2SOFTC(dev); + struct gpio_cfg *cfg; switch(cmd) { case GPIO_SET: /* turn bits on */ From owner-p4-projects@FreeBSD.ORG Tue Sep 5 22:07:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D935716A4E7; Tue, 5 Sep 2006 22:07:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D22D16A4DD for ; Tue, 5 Sep 2006 22:07:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB64243D60 for ; Tue, 5 Sep 2006 22:07:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85M79fx019171 for ; Tue, 5 Sep 2006 22:07:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85M79cg019168 for perforce@freebsd.org; Tue, 5 Sep 2006 22:07:09 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Sep 2006 22:07:09 GMT Message-Id: <200609052207.k85M79cg019168@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 105702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 22:07:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=105702 Change 105702 by imp@imp_lighthouse on 2006/09/05 22:07:01 Initial support for booting off the sd part. Still mondo-primitivo, but it seems to get the job done for compressed kernels. Symbols aren't loaded because there's something wrong with doing that... ok, it isn't pretty, but it is progress... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#10 (text+ko) ==== @@ -67,7 +67,8 @@ OPT_SET(RBX_PAUSE)) #define PATH_CONFIG "/boot.config" -#define PATH_KERNEL "/boot/kernel/kernel" +//#define PATH_KERNEL "/boot/kernel/kernel" +#define PATH_KERNEL "/kernel.gz.tramp" #define ARGS 0x900 #define NOPT 8 @@ -138,7 +139,9 @@ static inline int xfsread(ino_t inode, void *buf, size_t nbyte) { - if ((size_t)fsread(inode, buf, nbyte) != nbyte) { + ssize_t rv; + + if ((size_t)(rv = fsread(inode, buf, nbyte)) != nbyte) { printf("Invalid %s\r\n", "sector"); return -1; } @@ -215,6 +218,7 @@ /* Present the user with the boot2 prompt. */ + p_strcpy(kname, PATH_KERNEL); for (;;) { if (!autoboot || !OPT_CHECK(RBX_QUIET)) printf("\r\nFreeBSD/arm boot\r\n" @@ -237,7 +241,9 @@ { Elf32_Ehdr eh; static Elf32_Phdr ep[2]; +#if 0 static Elf32_Shdr es[2]; +#endif caddr_t p; ino_t ino; uint32_t addr; @@ -267,13 +273,21 @@ if (xfsread(ino, p, ep[i].p_filesz)) return; } +#if 0 + printf("3\n"); p += roundup2(ep[1].p_memsz, PAGE_SIZE); if (eh.e_shnum == eh.e_shstrndx + 3) { + printf("4\n"); fs_off = eh.e_shoff + sizeof(es[0]) * (eh.e_shstrndx + 1); - if (xfsread(ino, &es, sizeof(es))) + printf("5\n"); + if (xfsread(ino, &es, sizeof(es))) { + printf("5a\n"); return; + } + printf("6\n"); for (i = 0; i < 2; i++) { + printf("6.%d\n", i); memcpy(p, &es[i].sh_size, sizeof(es[i].sh_size)); p += sizeof(es[i].sh_size); fs_off = es[i].sh_offset; @@ -282,7 +296,9 @@ p += es[i].sh_size; } } +#endif addr = eh.e_entry; + printf("In 5, 4, 3, 2, 1\n"); ((void(*)(int))addr)(RB_BOOTINFO | (opts & RBX_MASK)); } From owner-p4-projects@FreeBSD.ORG Tue Sep 5 22:34:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 949B516A4E6; Tue, 5 Sep 2006 22:34:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 715AB16A4E0 for ; Tue, 5 Sep 2006 22:34:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5E3743D76 for ; Tue, 5 Sep 2006 22:34:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k85MYiWK020388 for ; Tue, 5 Sep 2006 22:34:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k85MYiFW020384 for perforce@freebsd.org; Tue, 5 Sep 2006 22:34:44 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Sep 2006 22:34:44 GMT Message-Id: <200609052234.k85MYiFW020384@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 105703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Sep 2006 22:34:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=105703 Change 105703 by imp@imp_lighthouse on 2006/09/05 22:34:21 Load that thar FPGA Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#11 (text+ko) ==== @@ -186,6 +186,47 @@ } } +#ifdef BOOT_TSC +#define TSC_FPGA +#endif + +#ifdef TSC_FPGA +#include "at91rm9200.h" +#include "spi_flash.h" +#include "fpga.h" + +#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE) +#define FPGA_LEN (212608) + +char buffer[FPGA_LEN]; + +const struct fpga main_fpga = +{ + AT91C_BASE_PIOB, AT91C_PIO_PB0, + AT91C_BASE_PIOC, AT91C_PIO_PC11, + AT91C_BASE_PIOB, AT91C_PIO_PB2, + AT91C_BASE_PIOC, AT91C_PIO_PC12 +}; + +void +fpga_load(void) +{ + int len, off, i, offset; + char *addr = buffer; + + len = FPGA_LEN; + offset = FPGA_OFFSET; + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + off = i + offset; + SPI_ReadFlash(off, addr + i, FLASH_PAGE_SIZE); + } + fpga_init(&main_fpga); + fpga_clear(&main_fpga); + fpga_write_bytes(&main_fpga, addr, len); + fpga_done(&main_fpga); +} +#endif + int main(void) { @@ -195,6 +236,12 @@ if (kname[0]) printf("bss not zero\r\n"); +#ifdef TSC_FPGA + SPI_InitFlash(); + printf("Loading FPGA..."); + fpga_load(); + printf("done\r\n"); +#endif EMAC_Init(); sdcard_init(); EMAC_SetMACAddress(mac); From owner-p4-projects@FreeBSD.ORG Wed Sep 6 00:08:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0A216A4E0; Wed, 6 Sep 2006 00:08:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BC0A16A4DD for ; Wed, 6 Sep 2006 00:08:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA01243D72 for ; Wed, 6 Sep 2006 00:08:45 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8608j7f026959 for ; Wed, 6 Sep 2006 00:08:45 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8608iiu026956 for perforce@freebsd.org; Wed, 6 Sep 2006 00:08:44 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 6 Sep 2006 00:08:44 GMT Message-Id: <200609060008.k8608iiu026956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 00:08:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=105705 Change 105705 by mjacob@newisp on 2006/09/06 00:08:02 IFC. Affected files ... .. //depot/projects/newisp/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/newisp/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/newisp/conf/files.amd64#2 integrate .. //depot/projects/newisp/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/newisp/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/newisp/dev/puc/pucdata.c#2 integrate .. //depot/projects/newisp/dev/vge/if_vge.c#2 integrate .. //depot/projects/newisp/geom/gate/g_gate.c#2 integrate .. //depot/projects/newisp/geom/gate/g_gate.h#2 integrate .. //depot/projects/newisp/i386/i386/local_apic.c#2 integrate .. //depot/projects/newisp/kern/kern_umtx.c#5 integrate .. //depot/projects/newisp/kern/vfs_subr.c#2 integrate .. //depot/projects/newisp/modules/agp/Makefile#2 integrate .. //depot/projects/newisp/modules/sound/sound/Makefile#2 integrate .. //depot/projects/newisp/net/bpf.h#2 integrate .. //depot/projects/newisp/netinet/tcp_subr.c#2 integrate .. //depot/projects/newisp/netinet/udp_usrreq.c#2 integrate .. //depot/projects/newisp/netinet6/ip6_forward.c#2 integrate .. //depot/projects/newisp/security/audit/audit.h#3 integrate .. //depot/projects/newisp/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/newisp/sys/param.h#3 integrate .. //depot/projects/newisp/vm/vm_contig.c#2 integrate .. //depot/projects/newisp/vm/vm_page.h#3 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.27 2006/09/05 17:15:24 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,6 +613,16 @@ /* Send EOI first thing. */ lapic_eoi(); + /* + * Don't do any accounting for the disabled HTT cores, since it + * will provide misleading numbers for the userland. + * + * No locking is necessary here, since even if we loose the race + * when hlt_cpus_mask changes it is not a big deal, really. + */ + if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) + return; + /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; ==== //depot/projects/newisp/boot/i386/pxeldr/pxeldr.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.14 2006/04/11 20:53:49 sobomax Exp $ + * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.15 2006/09/05 19:28:03 ru Exp $ */ /* @@ -25,6 +25,8 @@ * separate PXE-aware client just to load the loader. */ +#include + /* * Memory locations. */ @@ -53,10 +55,6 @@ .set KARGS_FLAGS_PXE,0x2 # flag to indicate booting from # PXE loader /* - * Boot howto bits - */ - .set RB_SERIAL,0x1000 # serial console -/* * Segment selectors. */ .set SEL_SDATA,0x8 # Supervisor data @@ -119,11 +117,11 @@ #ifdef PROBE_KEYBOARD /* * Look at the BIOS data area to see if we have an enhanced keyboard. If not, - * set the RBX_SERIAL bit in the howto byte. + * set the RBX_DUAL and RBX_SERIAL bits in the howto byte. */ testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present? jnz keyb # yes, so skip - orl $RB_SERIAL, (%bx) # enable serial console + orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console keyb: #endif /* ==== //depot/projects/newisp/conf/files.amd64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.92 2006/08/15 12:54:28 netchild Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.93 2006/09/05 16:55:12 anholt Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -208,6 +208,7 @@ isa/vga_isa.c optional vga kern/link_elf_obj.c standard pci/agp_amd64.c optional agp +pci/agp_i810.c optional agp pci/agp_intel.c optional agp # # IA32 binary support ==== //depot/projects/newisp/dev/aic7xxx/aic7xxx_osm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.44 2005/12/04 02:12:40 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.45 2006/09/05 20:28:28 mjacob Exp $"); #include #include @@ -158,6 +158,8 @@ count = 0; sim = NULL; sim2 = NULL; + path = NULL; + path2 = NULL; /* * Create a thread to perform all recovery. ==== //depot/projects/newisp/dev/atkbdc/atkbdc.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.24 2006/05/12 05:04:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.25 2006/09/04 00:19:31 dwhite Exp $"); #include "opt_kbd.h" @@ -857,6 +857,7 @@ { int t; int f; + int waited = 0; #if KBDIO_DEBUG >= 2 int c1 = 0; int c2 = 0; @@ -877,6 +878,16 @@ } else { t -= delta; } + + /* + * Some systems (Intel/IBM blades) do not have keyboard devices and + * will thus hang in this procedure. Time out after delta seconds to + * avoid this hang -- the keyboard attach will fail later on. + */ + waited += (delta * 1000); + if (waited == (delta * 1000000)) + return; + DELAY(delta*1000); } #if KBDIO_DEBUG >= 2 ==== //depot/projects/newisp/dev/mpt/mpt_cam.c#2 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.31 2006/07/25 00:59:54 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.32 2006/09/05 23:53:07 mjacob Exp $"); #include #include @@ -104,9 +104,9 @@ #include "dev/mpt/mpilib/mpi_init.h" #include "dev/mpt/mpilib/mpi_targ.h" #include "dev/mpt/mpilib/mpi_fc.h" - +#if __FreeBSD_version >= 500000 #include - +#endif #include #include @@ -248,7 +248,7 @@ * If we support target mode, we register a reply handler for it, * but don't add resources until we actually enable target mode. */ - if ((mpt->role & MPT_ROLE_TARGET) != 0) { + if (mpt->is_fc && (mpt->role & MPT_ROLE_TARGET) != 0) { handler.reply_handler = mpt_scsi_tgt_reply_handler; error = mpt_register_handler(mpt, MPT_HANDLER_REPLY, handler, &mpt->scsi_tgt_handler_id); @@ -816,7 +816,7 @@ * If we're in target mode, hang out resources now * so we don't cause the world to hang talking to us. */ - if (mpt->role & MPT_ROLE_TARGET) { + if (mpt->is_fc && (mpt->role & MPT_ROLE_TARGET)) { /* * Try to add some target command resources */ @@ -3166,7 +3166,7 @@ if ((mpt->role & MPT_ROLE_INITIATOR) == 0) { cpi->hba_misc |= PIM_NOINITIATOR; } - if ((mpt->role & MPT_ROLE_TARGET) != 0) { + if (mpt->is_fc && (mpt->role & MPT_ROLE_TARGET)) { cpi->target_sprt = PIT_PROCESSOR | PIT_DISCONNECT | PIT_TERM_IO; } else { ==== //depot/projects/newisp/dev/puc/pucdata.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.57 2006/06/29 16:27:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.58 2006/09/04 18:27:14 marcel Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -590,6 +590,12 @@ * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports. */ + { 0x1415, 0x9501, 0x131f, 0x2051, + "SIIG Cyber 4S PCI 16C650 (20x family)", + DEFAULT_RCLK * 10, + PUC_PORT_4S, 0x10, 0, 8, + }, + { 0x1415, 0x9501, 0xffff, 0, "Oxford Semiconductor OX16PCI954 UARTs", DEFAULT_RCLK, ==== //depot/projects/newisp/dev/vge/if_vge.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.24 2006/02/14 12:44:56 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.25 2006/09/04 13:14:44 mr Exp $"); /* * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. @@ -2129,8 +2129,10 @@ struct mii_data *mii; sc = ifp->if_softc; + VGE_LOCK(sc); mii = device_get_softc(sc->vge_miibus); mii_mediachg(mii); + VGE_UNLOCK(sc); return (0); } ==== //depot/projects/newisp/geom/gate/g_gate.c#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/geom/gate/g_gate.c,v 1.23 2006/02/01 12:05:59 pjd Exp $ + * $FreeBSD: src/sys/geom/gate/g_gate.c,v 1.24 2006/09/05 21:56:00 pjd Exp $ */ #include @@ -56,12 +56,9 @@ SYSCTL_UINT(_kern_geom_gate, OID_AUTO, debug, CTLFLAG_RW, &g_gate_debug, 0, "Debug level"); -static int g_gate_destroy_geom(struct gctl_req *, struct g_class *, - struct g_geom *); struct g_class g_gate_class = { .name = G_GATE_CLASS_NAME, .version = G_VERSION, - .destroy_geom = g_gate_destroy_geom }; static struct cdev *status_dev; @@ -78,17 +75,11 @@ static struct mtx g_gate_list_mtx; -static void -g_gate_wither(struct g_gate_softc *sc) -{ - - atomic_set_32(&sc->sc_flags, G_GATE_FLAG_DESTROY); -} - static int g_gate_destroy(struct g_gate_softc *sc, boolean_t force) { struct g_provider *pp; + struct g_geom *gp; struct bio *bp; g_topology_assert(); @@ -98,18 +89,15 @@ mtx_unlock(&g_gate_list_mtx); return (EBUSY); } - if ((sc->sc_flags & G_GATE_FLAG_DESTROY) == 0) { - g_gate_wither(sc); - LIST_REMOVE(sc, sc_next); - } mtx_unlock(&g_gate_list_mtx); mtx_lock(&sc->sc_queue_mtx); + if ((sc->sc_flags & G_GATE_FLAG_DESTROY) == 0) + sc->sc_flags |= G_GATE_FLAG_DESTROY; wakeup(sc); mtx_unlock(&sc->sc_queue_mtx); - if (sc->sc_ref > 0) { - G_GATE_DEBUG(1, "Cannot destroy %s yet.", sc->sc_name); - return (0); - } + gp = pp->geom; + pp->flags |= G_PF_WITHER; + g_orphan_provider(pp, ENXIO); callout_drain(&sc->sc_callout); mtx_lock(&sc->sc_queue_mtx); for (;;) { @@ -134,35 +122,26 @@ break; } } + mtx_unlock(&sc->sc_queue_mtx); + g_topology_unlock(); + mtx_lock(&g_gate_list_mtx); + /* One reference is ours. */ + sc->sc_ref--; + while (sc->sc_ref > 0) { + msleep(&sc->sc_ref, &g_gate_list_mtx, 0, "gg:destroy", 0); + } + LIST_REMOVE(sc, sc_next); + mtx_unlock(&g_gate_list_mtx); mtx_destroy(&sc->sc_queue_mtx); - G_GATE_DEBUG(0, "Device %s destroyed.", sc->sc_name); - pp->geom->softc = NULL; - g_wither_geom(pp->geom, ENXIO); + g_topology_lock(); + G_GATE_DEBUG(0, "Device %s destroyed.", gp->name); + gp->softc = NULL; + g_wither_geom(gp, ENXIO); sc->sc_provider = NULL; free(sc, M_GATE); return (0); } -static void -g_gate_destroy_it(void *arg, int flag __unused) -{ - struct g_gate_softc *sc; - - g_topology_assert(); - sc = arg; - mtx_lock(&g_gate_list_mtx); - g_gate_destroy(sc, 1); -} - -static int -g_gate_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp) -{ - - g_topology_assert(); - mtx_lock(&g_gate_list_mtx); - return (g_gate_destroy(gp->softc, 0)); -} - static int g_gate_access(struct g_provider *pp, int dr, int dw, int de) { @@ -231,30 +210,17 @@ } static struct g_gate_softc * -g_gate_find(u_int unit) +g_gate_hold(u_int unit) { struct g_gate_softc *sc; + mtx_lock(&g_gate_list_mtx); LIST_FOREACH(sc, &g_gate_list, sc_next) { if (sc->sc_unit == unit) break; } - return (sc); -} - -static struct g_gate_softc * -g_gate_hold(u_int unit) -{ - struct g_gate_softc *sc; - - mtx_lock(&g_gate_list_mtx); - sc = g_gate_find(unit); - if (sc != NULL) { - if ((sc->sc_flags & G_GATE_FLAG_DESTROY) != 0) - sc = NULL; - else - sc->sc_ref++; - } + if (sc != NULL) + sc->sc_ref++; mtx_unlock(&g_gate_list_mtx); return (sc); } @@ -268,8 +234,8 @@ sc->sc_ref--; KASSERT(sc->sc_ref >= 0, ("Negative sc_ref for %s.", sc->sc_name)); if (sc->sc_ref == 0 && (sc->sc_flags & G_GATE_FLAG_DESTROY) != 0) { + wakeup(&sc->sc_ref); mtx_unlock(&g_gate_list_mtx); - g_waitfor_event(g_gate_destroy_it, sc, M_WAITOK, NULL); } else { mtx_unlock(&g_gate_list_mtx); } @@ -485,10 +451,9 @@ g_topology_lock(); mtx_lock(&g_gate_list_mtx); error = g_gate_destroy(sc, ggio->gctl_force); - if (error == 0) - g_gate_wither(sc); g_topology_unlock(); - g_gate_release(sc); + if (error != 0) + g_gate_release(sc); return (error); } case G_GATE_CMD_CANCEL: @@ -534,22 +499,24 @@ struct g_gate_ctl_io *ggio = (void *)addr; G_GATE_CHECK_VERSION(ggio); - sc = g_gate_find(ggio->gctl_unit); + sc = g_gate_hold(ggio->gctl_unit); if (sc == NULL) return (ENXIO); + error = 0; for (;;) { mtx_lock(&sc->sc_queue_mtx); bp = bioq_first(&sc->sc_inqueue); if (bp != NULL) break; + if ((sc->sc_flags & G_GATE_FLAG_DESTROY) != 0) { + ggio->gctl_error = ECANCELED; + mtx_unlock(&sc->sc_queue_mtx); + goto start_end; + } if (msleep(sc, &sc->sc_queue_mtx, PPAUSE | PDROP | PCATCH, "ggwait", 0) != 0) { ggio->gctl_error = ECANCELED; - return (0); - } - if ((sc->sc_flags & G_GATE_FLAG_DESTROY) != 0) { - ggio->gctl_error = ECANCELED; - return (0); + goto start_end; } } ggio->gctl_cmd = bp->bio_cmd; @@ -558,7 +525,7 @@ mtx_unlock(&sc->sc_queue_mtx); ggio->gctl_length = bp->bio_length; ggio->gctl_error = ENOMEM; - return (0); + goto start_end; } bioq_remove(&sc->sc_inqueue, bp); bioq_insert_tail(&sc->sc_outqueue, bp); @@ -580,20 +547,23 @@ bioq_remove(&sc->sc_outqueue, bp); bioq_insert_head(&sc->sc_inqueue, bp); mtx_unlock(&sc->sc_queue_mtx); - return (error); + goto start_end; } break; } - return (0); +start_end: + g_gate_release(sc); + return (error); } case G_GATE_CMD_DONE: { struct g_gate_ctl_io *ggio = (void *)addr; G_GATE_CHECK_VERSION(ggio); - sc = g_gate_find(ggio->gctl_unit); + sc = g_gate_hold(ggio->gctl_unit); if (sc == NULL) return (ENOENT); + error = 0; mtx_lock(&sc->sc_queue_mtx); TAILQ_FOREACH(bp, &sc->sc_outqueue.queue, bio_queue) { if (ggio->gctl_seq == (uintptr_t)bp->bio_driver1) @@ -608,7 +578,7 @@ /* * Request was probably canceled. */ - return (0); + goto done_end; } if (ggio->gctl_error == EAGAIN) { bp->bio_error = 0; @@ -637,6 +607,8 @@ G_GATE_LOGREQ(2, bp, "Request done."); g_io_deliver(bp, bp->bio_error); } +done_end: + g_gate_release(sc); return (error); } } ==== //depot/projects/newisp/geom/gate/g_gate.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/geom/gate/g_gate.h,v 1.8 2006/02/01 12:05:59 pjd Exp $ + * $FreeBSD: src/sys/geom/gate/g_gate.h,v 1.9 2006/09/05 21:56:00 pjd Exp $ */ #ifndef _G_GATE_H_ @@ -68,9 +68,9 @@ */ struct g_gate_softc { int sc_unit; /* P: (read-only) */ - int16_t sc_ref; /* P: g_gate_list_mtx */ + int sc_ref; /* P: g_gate_list_mtx */ struct g_provider *sc_provider; /* P: (read-only) */ - uint32_t sc_flags; /* P: (read-only) */ + uint32_t sc_flags; /* P: sc_queue_mtx */ struct bio_queue_head sc_inqueue; /* P: sc_queue_mtx */ struct bio_queue_head sc_outqueue; /* P: sc_queue_mtx */ ==== //depot/projects/newisp/i386/i386/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.28 2006/07/12 21:22:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.29 2006/09/05 17:15:24 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -615,6 +615,16 @@ /* Send EOI first thing. */ lapic_eoi(); + /* + * Don't do any accounting for the disabled HTT cores, since it + * will provide misleading numbers for the userland. + * + * No locking is necessary here, since even if we loose the race + * when hlt_cpus_mask changes it is not a big deal, really. + */ + if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) + return; + /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; ==== //depot/projects/newisp/kern/kern_umtx.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.44 2006/09/03 00:07:37 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.45 2006/09/05 12:01:09 davidxu Exp $"); #include #include @@ -624,6 +624,9 @@ if (timeout == NULL) { error = _do_lock(td, umtx, id, 0); + /* Mutex locking is restarted if it is interrupted. */ + if (error == EINTR) + error = ERESTART; } else { getnanouptime(&ts); timespecadd(&ts, timeout); @@ -641,10 +644,10 @@ timespecsub(&ts3, &ts2); TIMESPEC_TO_TIMEVAL(&tv, &ts3); } + /* Timed-locking is not restarted. */ + if (error == ERESTART) + error = EINTR; } - /* Mutex locking is be restarted if it is interrupted. */ - if (error == EINTR) - error = ERESTART; return (error); } @@ -770,7 +773,6 @@ umtxq_unlock(&uq->uq_key); } umtx_key_release(&uq->uq_key); - /* Mutex locking is be restarted if it is interrupted. */ if (error == ERESTART) error = EINTR; return (error); @@ -903,40 +905,6 @@ /* * Lock PTHREAD_PRIO_NONE protocol POSIX mutex. */ -static int -do_lock_normal(struct thread *td, struct umutex *m, uint32_t flags, - struct timespec *timeout, int try) -{ - struct timespec ts, ts2, ts3; - struct timeval tv; - int error; - - if (timeout == NULL) { - error = _do_lock_normal(td, m, flags, 0, try); - } else { - getnanouptime(&ts); - timespecadd(&ts, timeout); - TIMESPEC_TO_TIMEVAL(&tv, timeout); - for (;;) { - error = _do_lock_normal(td, m, flags, tvtohz(&tv), try); - if (error != ETIMEDOUT) - break; - getnanouptime(&ts2); - if (timespeccmp(&ts2, &ts, >=)) { - error = ETIMEDOUT; - break; - } - ts3 = ts; - timespecsub(&ts3, &ts2); - TIMESPEC_TO_TIMEVAL(&tv, &ts3); - } - } - /* Mutex locking is be restarted if it is interrupted. */ - if (error == EINTR) - error = ERESTART; - return (error); -} - /* * Unlock PTHREAD_PRIO_NONE protocol POSIX mutex. */ @@ -1531,40 +1499,6 @@ return (error); } -static int -do_lock_pi(struct thread *td, struct umutex *m, uint32_t flags, - struct timespec *timeout, int try) -{ - struct timespec ts, ts2, ts3; - struct timeval tv; - int error; - - if (timeout == NULL) { - error = _do_lock_pi(td, m, flags, 0, try); - } else { - getnanouptime(&ts); - timespecadd(&ts, timeout); - TIMESPEC_TO_TIMEVAL(&tv, timeout); - for (;;) { - error = _do_lock_pi(td, m, flags, tvtohz(&tv), try); - if (error != ETIMEDOUT) - break; - getnanouptime(&ts2); - if (timespeccmp(&ts2, &ts, >=)) { - error = ETIMEDOUT; - break; - } - ts3 = ts; - timespecsub(&ts3, &ts2); - TIMESPEC_TO_TIMEVAL(&tv, &ts3); - } - } - /* Mutex locking is be restarted if it is interrupted. */ - if (error == EINTR) - error = ERESTART; - return (error); -} - /* * Unlock a PI mutex. */ @@ -1780,43 +1714,6 @@ } /* - * Lock a PP mutex. - */ -static int -do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags, - struct timespec *timeout, int try) -{ - struct timespec ts, ts2, ts3; - struct timeval tv; - int error; - - if (timeout == NULL) { - error = _do_lock_pp(td, m, flags, 0, try); - } else { - getnanouptime(&ts); - timespecadd(&ts, timeout); - TIMESPEC_TO_TIMEVAL(&tv, timeout); - for (;;) { - error = _do_lock_pp(td, m, flags, tvtohz(&tv), try); - if (error != ETIMEDOUT) - break; - getnanouptime(&ts2); - if (timespeccmp(&ts2, &ts, >=)) { - error = ETIMEDOUT; - break; - } - ts3 = ts; - timespecsub(&ts3, &ts2); - TIMESPEC_TO_TIMEVAL(&tv, &ts3); - } - } - /* Mutex locking is be restarted if it is interrupted. */ - if (error == EINTR) - error = ERESTART; - return (error); -} - -/* * Unlock a PP mutex. */ static int @@ -1978,29 +1875,64 @@ return (error); } +static int +_do_lock_umutex(struct thread *td, struct umutex *m, int flags, int timo, + int try) +{ + switch(flags & (UMUTEX_PRIO_INHERIT | UMUTEX_PRIO_PROTECT)) { + case 0: + return (_do_lock_normal(td, m, flags, timo, try)); + case UMUTEX_PRIO_INHERIT: + return (_do_lock_pi(td, m, flags, timo, try)); + case UMUTEX_PRIO_PROTECT: + return (_do_lock_pp(td, m, flags, timo, try)); + } + return (EINVAL); +} + /* * Lock a userland POSIX mutex. */ static int -do_lock_umutex(struct thread *td, struct umutex *m, struct timespec *ts, - int try) +do_lock_umutex(struct thread *td, struct umutex *m, + struct timespec *timeout, int try) { + struct timespec ts, ts2, ts3; + struct timeval tv; uint32_t flags; + int error; flags = fuword32(&m->m_flags); if (flags == -1) return (EFAULT); - switch(flags & (UMUTEX_PRIO_INHERIT | UMUTEX_PRIO_PROTECT)) { - case 0: - return (do_lock_normal(td, m, flags, ts, try)); - case UMUTEX_PRIO_INHERIT: - return (do_lock_pi(td, m, flags, ts, try)); - case UMUTEX_PRIO_PROTECT: - return (do_lock_pp(td, m, flags, ts, try)); + if (timeout == NULL) { + error = _do_lock_umutex(td, m, flags, 0, try); + /* Mutex locking is restarted if it is interrupted. */ + if (error == EINTR) + error = ERESTART; + } else { + getnanouptime(&ts); + timespecadd(&ts, timeout); + TIMESPEC_TO_TIMEVAL(&tv, timeout); + for (;;) { + error = _do_lock_umutex(td, m, flags, tvtohz(&tv), try); + if (error != ETIMEDOUT) + break; + getnanouptime(&ts2); + if (timespeccmp(&ts2, &ts, >=)) { + error = ETIMEDOUT; + break; + } + ts3 = ts; + timespecsub(&ts3, &ts2); + TIMESPEC_TO_TIMEVAL(&tv, &ts3); + } + /* Timed-locking is not restarted. */ + if (error == ERESTART) + error = EINTR; } - - return (EINVAL); + return (error); } /* ==== //depot/projects/newisp/kern/vfs_subr.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.681 2006/08/10 08:56:03 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.682 2006/09/04 22:15:44 pjd Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -81,6 +81,10 @@ #include #include +#ifdef DDB +#include +#endif + static MALLOC_DEFINE(M_NETADDR, "subr_export_host", "Export host address structure"); static void delmntque(struct vnode *vp); @@ -2543,7 +2547,6 @@ } #ifdef DDB -#include /* * List all of the locked vnodes in the system. * Called when debugging the kernel. @@ -2569,7 +2572,20 @@ nmp = TAILQ_NEXT(mp, mnt_list); } } -#endif + +/* + * Show details about the given vnode. + */ +DB_SHOW_COMMAND(vnode, db_show_vnode) +{ + struct vnode *vp; + + if (!have_addr) + return; + vp = (struct vnode *)addr; + vn_printf(vp, "vnode "); +} +#endif /* DDB */ /* * Fill in a struct xvfsconf based on a struct vfsconf. ==== //depot/projects/newisp/modules/agp/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/agp/Makefile,v 1.17 2006/07/27 19:12:48 marcel Exp $ +# $FreeBSD: src/sys/modules/agp/Makefile,v 1.18 2006/09/05 16:55:13 anholt Exp $ .PATH: ${.CURDIR}/../../pci @@ -12,7 +12,7 @@ SRCS+= agp_amd64.c .endif .if ${MACHINE_ARCH} == "amd64" -SRCS+= agp_amd64.c +SRCS+= agp_amd64.c agp_i810.c .endif SRCS+= device_if.h bus_if.h agp_if.h pci_if.h SRCS+= opt_bus.h ==== //depot/projects/newisp/modules/sound/sound/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.19 2006/08/14 13:28:53 des Exp $ +# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.20 2006/09/04 07:40:53 ru Exp $ .PATH: ${.CURDIR}/../../../dev/sound/pcm .PATH: ${.CURDIR}/../../../dev/sound/midi @@ -24,10 +24,17 @@ opt_isa.h: :> ${.TARGET} .else +.if !defined(KERNBUILDDIR) SRCS+= sndbuf_dma.c opt_isa.h: echo "#define DEV_ISA 1" > ${.TARGET} +.else +DEV_ISA!= sed -n '/DEV_ISA/p' ${KERNBUILDDIR}/opt_isa.h +.if !empty(DEV_ISA) +SRCS+= sndbuf_dma.c +.endif +.endif .endif .include ==== //depot/projects/newisp/net/bpf.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * @(#)bpf.h 8.1 (Berkeley) 6/10/93 * @(#)bpf.h 1.34 (LBL) 6/16/96 * - * $FreeBSD: src/sys/net/bpf.h,v 1.45 2006/06/14 02:23:28 csjp Exp $ + * $FreeBSD: src/sys/net/bpf.h,v 1.46 2006/09/04 19:24:34 sam Exp $ */ #ifndef _NET_BPF_H_ @@ -523,6 +523,18 @@ #define DLT_LINUX_LAPD 177 /* + * Juniper-private data link type, as per request from + * Hannes Gredler . + * The DLT_ are used for prepending meta-information + * like interface index, interface name + * before standard Ethernet, PPP, Frelay & C-HDLC Frames + */ +#define DLT_JUNIPER_ETHER 178 +#define DLT_JUNIPER_PPP 179 +#define DLT_JUNIPER_FRELAY 180 +#define DLT_JUNIPER_CHDLC 181 + +/* * The instruction encodings. */ /* instruction classes */ ==== //depot/projects/newisp/netinet/tcp_subr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.255 2006/08/26 17:53:19 mohans Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.258 2006/09/05 14:00:59 glebius Exp $ */ #include "opt_compat.h" @@ -177,9 +177,30 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW, &tcp_isn_reseed_interval, 0, "Seconds between reseeding of ISN secret"); +static uma_zone_t tcptw_zone; static int maxtcptw; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, maxtcptw, CTLFLAG_RDTUN, - &maxtcptw, 0, "Maximum number of compressed TCP TIME_WAIT entries"); +static int +sysctl_maxtcptw(SYSCTL_HANDLER_ARGS) +{ + int error, new; + + if (maxtcptw == 0) + new = maxsockets / 5; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 6 08:32:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38F6216A4E2; Wed, 6 Sep 2006 08:32:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1592D16A4E0 for ; Wed, 6 Sep 2006 08:32:33 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5ACC43D4C for ; Wed, 6 Sep 2006 08:32:32 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k868WWh5076825 for ; Wed, 6 Sep 2006 08:32:32 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k868WWvp076822 for perforce@freebsd.org; Wed, 6 Sep 2006 08:32:32 GMT (envelope-from piso@freebsd.org) Date: Wed, 6 Sep 2006 08:32:32 GMT Message-Id: <200609060832.k868WWvp076822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 105718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 08:32:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=105718 Change 105718 by piso@piso_longino on 2006/09/06 08:32:11 Rename libalias TOK_LOG to TOK_ALOG to avoid clashing with ALTQ TOK_LOG. Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#7 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#7 (text+ko) ==== @@ -315,7 +315,7 @@ TOK_WEIGHT, TOK_IP, TOK_IF, - TOK_LOG, + TOK_ALOG, TOK_DENY_INC, TOK_SAME_PORTS, TOK_UNREG_ONLY, @@ -370,7 +370,7 @@ struct _s_x nat_params[] = { { "ip", TOK_IP }, { "if", TOK_IF }, - { "log", TOK_LOG }, + { "log", TOK_ALOG }, { "deny_in", TOK_DENY_INC }, { "same_ports", TOK_SAME_PORTS }, { "unreg_only", TOK_UNREG_ONLY }, @@ -3923,7 +3923,7 @@ ac--; av++; break; - case TOK_LOG: + case TOK_ALOG: n->mode |= PKT_ALIAS_LOG; break; From owner-p4-projects@FreeBSD.ORG Wed Sep 6 14:14:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A948316A4DE; Wed, 6 Sep 2006 14:14:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E36516A4DA for ; Wed, 6 Sep 2006 14:14:40 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE00D43D4C for ; Wed, 6 Sep 2006 14:14:39 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86EEd6L018270 for ; Wed, 6 Sep 2006 14:14:39 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86EEdNv018267 for perforce@freebsd.org; Wed, 6 Sep 2006 14:14:39 GMT (envelope-from bushman@freebsd.org) Date: Wed, 6 Sep 2006 14:14:39 GMT Message-Id: <200609061414.k86EEdNv018267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 105721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 14:14:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=105721 Change 105721 by bushman@bushman_nss_ldap_cached_make on 2006/09/06 14:14:06 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/Makefile.inc1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/amd.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/apmd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/auth.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/bluetooth/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/bluetooth/hcsecd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/bluetooth/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/bluetooth/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/cached.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/crontab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/csh.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/csh.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/csh.logout#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/defaults/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/defaults/devfs.rules#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/defaults/pccard.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/defaults/periodic.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/defaults/rc.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/devd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/devfs.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/dhclient.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/disktab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.alpha/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.amd64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.arm/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.i386/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.ia64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.powerpc/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/etc.sparc64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/fbtab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/ftpusers#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/gettytab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/group#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/gss/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/gss/mech#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/gss/qop#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/hosts.allow#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/hosts.equiv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/hosts.lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/inetd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/answer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/holidays.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdnd.rates.A#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdnd.rates.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdnd.rates.F#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdnd.rates.L#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdnd.rates.UK.BT#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdnd.rc.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdntel.alias.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/isdntel.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/record#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/tell#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/tell-record#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/isdn/unknown_incoming#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/login.access#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/login.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mac.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/access.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/mailer.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/mailertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mail/virtusertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/man.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/master.passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/minfree#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BIND.chroot.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BIND.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.local.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.release.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.root.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.sendmail.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.var.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.x11-4.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/BSD.x11.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/mtree/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/namedb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/namedb/PROTO.localhost-v6.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/namedb/PROTO.localhost.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/namedb/make-localhost#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/namedb/named.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/namedb/named.root#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/netconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/netstart#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/network.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/networks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/newsyslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/nls.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/nsmb.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/nsswitch.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/opieaccess#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/convert.pl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/gdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/imap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/kde#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/other#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/pop3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/rsh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/su#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/system#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/telnetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pam.d/xdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pccard_ether#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/100.clean-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/110.clean-tmps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/120.clean-preserve#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/130.clean-msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/140.clean-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/150.clean-hoststat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/200.backup-passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/210.backup-aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/300.calendar#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/310.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/330.news#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/400.status-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/405.status-ata-raid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/420.status-network#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/430.status-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/440.status-mailq#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/450.status-security#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/460.status-mail-rejects#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/470.status-named#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/500.queuerun#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/daily/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/monthly/200.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/monthly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/monthly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/100.chksetuid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/200.chkmounts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/300.chkuid0#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/400.passwdless#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/500.ipfwdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/510.ipfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/550.ipfwlimit#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/610.ipf6denied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/700.kernelmsg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/800.loginfail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/900.tcpwrap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/security/security.functions#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/120.clean-kvmdb#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/310.locate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/320.whatis#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/330.catman#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/340.noid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/400.status-pkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/periodic/weekly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pf.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/pf.os#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/phones#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/portsnap.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/ppp/ppp.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/printcap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.bsdextended#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/DAEMON#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/LOGIN#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/NETWORKING#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/SERVERS#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/abi#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/addswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/adjkerntz#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/amd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/apm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/apmd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/archdep#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/atm1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/atm2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/atm3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/auditd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/bgfsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/bluetooth#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/bootconf.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/bootparams#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/bridge#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/bsnmpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/cached#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ccd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/cleanvar#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/cleartmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/cron#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/devd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/devfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/dhclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/dmesg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/dumpon#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/early.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/encswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/fsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/gbde#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/geli#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/geli2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/hcsecd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/hostapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/hostname#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/inetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/initrandom#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ip6addrctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ip6fw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipfilter#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipmon#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipnat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipsec#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ipxrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/isdnd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/jail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/kadmind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/kerberos#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/kernel#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/keyserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/kldxref#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/kpasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ldconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/localpkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mdconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mdconfig2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mixer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mountcritlocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mountcritremote#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mountd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mountlate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/moused#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mroute6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/mrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/named#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/natd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/netif#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/netoptions#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/network_ipv6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/newsyslog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/nfsclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/nfsd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/nfslocking#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/nfsserver#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/nisdomain#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/nsswitch#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ntpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ntpdate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/othermta#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/pf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/pflog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/pfsync#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/power_profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/powerd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/pppoed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/pwcheck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/quota#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ramdisk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ramdisk-own#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/random#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/rarpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/resolv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/root#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/route6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/routed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/routing#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/rpcbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/rtadvd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/savecore#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/sdpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/securelevel#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/serial#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/sppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/swap1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/syscons#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/sysctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/syslogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/timed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/tmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ugidfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/var#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/virecover#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/watchdogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/wpa_supplicant#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ypbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/yppasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ypserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ypset#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ypupdated#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.d/ypxfrd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.firewall#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.firewall6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.initdiskless#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.resume#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.shutdown#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rc.suspend#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/remote#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/root/dot.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/root/dot.k5login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/root/dot.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/root/dot.profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/rpc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/sendmail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/sendmail/freebsd.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/sendmail/freebsd.submit.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/sendmail/freefall.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/services#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/shells#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/snmpd.config#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/sysctl.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/syslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/etc/termcap.small#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/_ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/a.out.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/ftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/inet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/nameser.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/nameser_compat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/telnet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/arpa/tftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/assert.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/bitstring.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/complex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/cpio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/dirent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/dlfcn.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/elf-hints.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/elf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/err.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/fmtmsg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/fnmatch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/fstab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/fts.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ftw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/getopt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/glob.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/grp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/gssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/gssapi/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/hesiod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/histedit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ieeefp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ifaddrs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/inttypes.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/iso646.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/kenv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/langinfo.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/libgen.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/limits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/link.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/locale.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/malloc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/malloc_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/memory.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/monetary.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/mpool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/mqueue.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ndbm.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/netconfig.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/netdb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/nl_types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/nlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/nss.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/nsswitch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/objformat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/paths.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/printf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/proc_service.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/protocols/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/protocols/dumprestore.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/protocols/routed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/protocols/rwhod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/protocols/talkd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/protocols/timed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/pthread.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/pthread_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/pwd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ranlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/readpassphrase.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/regex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/regexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/res_update.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/resolv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/auth_des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/auth_kerb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/auth_unix.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/clnt_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/clnt_stat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/des_crypt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/nettype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/pmap_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/pmap_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/pmap_rmt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/raw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/rpc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/rpc_com.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/rpc_msg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/rpcb_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/rpcb_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/rpcent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/svc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/svc_auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/svc_dg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/svc_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpc/xdr.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/bootparam_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/crypt.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/key_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/klm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/mount.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nfs_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nis.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nis_cache.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nis_callback.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nis_db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nis_object.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nis_tags.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nislib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/nlm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/pmap_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/rex.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/rnusers.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/rquota.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/rstat.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/rwall.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/sm_inter.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/spray.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/yp.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/yp_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/ypclnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/yppasswd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/ypupdate_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/rpcsvc/ypxfrd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/runetype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/search.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/setjmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/sgtty.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/signal.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/stab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/stdbool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/stddef.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/stdio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/stdlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/string.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/stringlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/strings.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/sysexits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/tar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/tgmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/time.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/timeconv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/timers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ttyent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/ulimit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/unistd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/utime.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/utmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/uuid.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/varargs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/vis.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/wchar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/wctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/include/wordexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/doc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/include/config.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/include/crypto-headers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/include/krb5-types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/include/version.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libasn1/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libgssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libhdb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libkadm5clnt/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libkadm5srv/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libkafs5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libkrb5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libroken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libsl/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/lib/libvers/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/hprop/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/hpropd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/ipropd-master/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/ipropd-slave/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/kadmind/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/kdc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/libexec/kpasswdd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/tools/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/kadmin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/kdestroy/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/kinit/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/klist/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/kpasswd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/krb5-config/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/ksu/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.bin/verify_krb5_conf/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.sbin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.sbin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.sbin/kstash/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/kerberos5/usr.sbin/ktutil/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/Versions.def#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/divrem.m4#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/byte_swap_2.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/byte_swap_4.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/alpha/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpsetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/creat.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/creat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/gethostid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/gethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/getwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/killpg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/sethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/setpgrp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/setrgid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/setruid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/setruid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/sigcompat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/sigpause.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/sigsetmask.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/compat-43/sigvec.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_conv.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_debug.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_overflow.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_split.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/bt_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/btree.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/btree/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/changelog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/db/db.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/docs/hash.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/docs/libtp.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash_bigkey.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash_buf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash_func.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash_log2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/hash_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/ndbm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/hash/page.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/btree.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/dbm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/dbopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/hash.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/mpool.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/man/recno.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/mpool/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/mpool/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/mpool/mpool.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/mpool/mpool.libtp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/rec_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/recno/recno.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/btree.tests/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/dbtest.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/driver2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/makedb.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tcreat3.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tdel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/testit#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/thash4.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tread2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tseq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tverify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/db/test/run.test#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/_ldtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/__xuname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/_pthread_stubs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/_rand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/_spinlock_stub.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/_thread_init.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/alarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/alarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/arc4random.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/arc4random.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/assert.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/basename.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/basename.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/check_utility_compat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/check_utility_compat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/clock.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/clock.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/closedir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/confstr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/confstr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/crypt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ctermid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ctermid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/daemon.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/daemon.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/devname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/devname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/directory.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dirname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dirname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/disklabel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dladdr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dlfcn.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dlfunc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dlinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dllockinit.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/dlopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/drand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/erand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/err.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/err.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/errlst.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/errno.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/exec.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/exec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fmtcheck.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fmtcheck.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fnmatch.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fnmatch.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fpclassify.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fpclassify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/frexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/frexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fstab.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ftok.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ftok.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fts.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/fts.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ftw.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getbootfile.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getbootfile.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getbsize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getbsize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getcap.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getcap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getcwd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getcwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getdiskbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getdomainname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getfsent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getgrouplist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getgrouplist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/gethostname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/gethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getloadavg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getloadavg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getlogin.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getmntinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getmntinfo.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getnetgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getnetgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getobjformat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getosreldate.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getosreldate.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpagesize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpagesize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpass.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpeereid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpeereid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getprogname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpwent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getpwent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getttyent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getttyent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getusershell.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getusershell.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getvfsbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/getvfsbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/glob.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/glob.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/initgroups.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/initgroups.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/isatty.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/isgreater.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/isinf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/isnan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/jrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/lcong48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ldexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/lockf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/lockf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/lrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/modf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/mrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/msgctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/msgget.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/msgrcv.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/msgsnd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/nftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/nice.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/nice.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/nlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/nlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/nrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/opendir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pause.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pause.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pmadvise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/popen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/popen.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/posixshm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pselect.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pselect.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/psignal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/psignal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pw_scan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pw_scan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pwcache.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/pwcache.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/raise.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/raise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/rand48.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/rand48.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/readdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/readpassphrase.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/readpassphrase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/rewinddir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/rfork_thread.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/scandir.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/scandir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/seed48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/seekdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/semctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/sethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setjmp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setjmperr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setmode.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setmode.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setproctitle.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setproctitle.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_final/nss_ldap_cached/src/lib/libc/gen/setprogname.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 6 14:50:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E2AC16A504; Wed, 6 Sep 2006 14:50:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDB5016A4DD for ; Wed, 6 Sep 2006 14:50:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2878843D70 for ; Wed, 6 Sep 2006 14:50:24 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86EoO2V020032 for ; Wed, 6 Sep 2006 14:50:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86EoOs9020024 for perforce@freebsd.org; Wed, 6 Sep 2006 14:50:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 6 Sep 2006 14:50:24 GMT Message-Id: <200609061450.k86EoOs9020024@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 105723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 14:50:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=105723 Change 105723 by hselasky@hselasky_mini_itx on 2006/09/06 14:49:26 Updated README. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#6 (text+ko) ==== @@ -59,6 +59,10 @@ void usbd_default_callback(struct usbd_xfer *xfer) { + /* NOTE: it is not allowed to return + * before "USBD_CHECK_STATUS()", + * even if the system is tearing down! + */ USBD_CHECK_STATUS(xfer); tr_setup: From owner-p4-projects@FreeBSD.ORG Wed Sep 6 19:40:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 899A416A4DF; Wed, 6 Sep 2006 19:40:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5AB1316A4DD for ; Wed, 6 Sep 2006 19:40:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2891243D45 for ; Wed, 6 Sep 2006 19:40:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86JeVt9049450 for ; Wed, 6 Sep 2006 19:40:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86JeVQQ049447 for perforce@freebsd.org; Wed, 6 Sep 2006 19:40:31 GMT (envelope-from imp@freebsd.org) Date: Wed, 6 Sep 2006 19:40:31 GMT Message-Id: <200609061940.k86JeVQQ049447@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 105732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 19:40:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=105732 Change 105732 by imp@imp_lighthouse on 2006/09/06 19:39:43 Check malloc for success/failure. Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/iic.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/iic.c#5 (text+ko) ==== @@ -282,6 +282,10 @@ break; } buf = malloc((unsigned long)s->count, M_TEMP, M_WAITOK); + if (buf == NULL) { + error = ENOMEM; + break; + } error = copyin(s->buf, buf, s->count); if (error) break; @@ -294,6 +298,10 @@ break; } buf = malloc((unsigned long)s->count, M_TEMP, M_WAITOK); + if (buf == NULL) { + error = ENOMEM; + break; + } error = iicbus_read(parent, buf, s->count, &count, s->last, 10); if (error) break; @@ -302,7 +310,15 @@ case I2CRDWR: buf = malloc(sizeof(*d->msgs) * d->nmsgs, M_TEMP, M_WAITOK); + if (buf == NULL) { + error = ENOMEM; + break; + } usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK); + if (usrbufs == NULL) { + error = ENOMEM; + break; + } error = copyin(d->msgs, buf, sizeof(*d->msgs) * d->nmsgs); if (error) break; From owner-p4-projects@FreeBSD.ORG Wed Sep 6 20:30:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90F3C16A509; Wed, 6 Sep 2006 20:30:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E04F16A506 for ; Wed, 6 Sep 2006 20:30:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7631B43D70 for ; Wed, 6 Sep 2006 20:30:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86KUaRq053403 for ; Wed, 6 Sep 2006 20:30:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86KUak9053400 for perforce@freebsd.org; Wed, 6 Sep 2006 20:30:36 GMT (envelope-from imp@freebsd.org) Date: Wed, 6 Sep 2006 20:30:36 GMT Message-Id: <200609062030.k86KUak9053400@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 105736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 20:30:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=105736 Change 105736 by imp@imp_lighthouse on 2006/09/06 20:30:12 make twi support bulk transfer. I'm not sure that the 'broken down' elements of a iic transfer work with this driver, but the bulk transfer should work. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#20 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#20 (text+ko) ==== @@ -228,12 +228,15 @@ } static int -at91_twi_wait_stop_done(struct at91_twi_softc *sc) +at91_twi_wait(struct at91_twi_softc *sc, uint32_t bit) { int err = 0; + int counter = 10000; - while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + while (!(RD4(sc, TWI_SR) & bit) && counter-- != 0) continue; + if (counter == 0) + err = EIO; return (err); } @@ -252,7 +255,7 @@ sc = device_get_softc(dev); if (sc->sc_started) { WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); } return (err); } @@ -345,7 +348,7 @@ if (!last) goto errout; WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); *walker = RD4(sc, TWI_RHR) & 0xff; if (read) *read = walker - buf; @@ -419,6 +422,53 @@ return (error); } +static int +at91_twi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) +{ + struct at91_twi_softc *sc; + int i, len; + uint32_t rdwr; + uint8_t *buf; + + sc = device_get_softc(dev); + for (i = 0; i < nmsgs; i++) { + /* + * The linux atmel driver doesn't use the internal device + * address feature of twi. A separate i2c message needs to + * be written to use this. + * See http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html + * for details. + */ + rdwr = (msgs[i].flags & IIC_M_RD) ? TWI_MMR_MREAD : 0; + WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); + len = msgs[i].len; + buf = msgs[i].buf; + if (len != 0 || buf == NULL) + return EINVAL; + WR4(sc, TWI_CR, TWI_CR_START); + if (msgs[i].flags & IIC_M_RD) { + while (len--) { + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_RXRDY)) + return EIO; + *buf++ = RD4(sc, TWI_RHR) & 0xff; + } + } else { + while (len--) { + WR4(sc, TWI_THR, *buf++); + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_TXRDY)) + return EIO; + } + } + if (!at91_twi_wait(sc, TWI_SR_TXCOMP)) + return EIO; + } + return 0; +} + static device_method_t at91_twi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_twi_probe), @@ -433,6 +483,7 @@ DEVMETHOD(iicbus_write, at91_twi_write), DEVMETHOD(iicbus_read, at91_twi_read), DEVMETHOD(iicbus_reset, at91_twi_rst_card), + DEVMETHOD(iicbus_transfer, at91_twi_transfer), { 0, 0 } }; From owner-p4-projects@FreeBSD.ORG Wed Sep 6 21:29:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F1B916A4DD; Wed, 6 Sep 2006 21:29:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EECDD16A4E1 for ; Wed, 6 Sep 2006 21:29:50 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9601443D72 for ; Wed, 6 Sep 2006 21:29:50 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86LToUN066141 for ; Wed, 6 Sep 2006 21:29:50 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86LTo8j066138 for perforce@freebsd.org; Wed, 6 Sep 2006 21:29:50 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 6 Sep 2006 21:29:50 GMT Message-Id: <200609062129.k86LTo8j066138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 21:29:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=105738 Change 105738 by mjacob@newisp on 2006/09/06 21:29:05 some internal function rototilling. Affected files ... .. //depot/projects/newisp/dev/isp/isp_library.h#4 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_library.h#4 (text) ==== @@ -33,8 +33,7 @@ extern int isp_save_xs(ispsoftc_t *, XS_T *, uint32_t *); extern XS_T *isp_find_xs(ispsoftc_t *, uint32_t); extern uint32_t isp_find_handle(ispsoftc_t *, XS_T *); -extern int isp_handle_index(uint32_t); -extern uint32_t isp_index_handle(int); +extern uint32_t isp_handle_index(uint32_t); extern void isp_destroy_handle(ispsoftc_t *, uint32_t); extern int isp_getrqentry(ispsoftc_t *, uint32_t *, uint32_t *, void **); extern void isp_print_qentry (ispsoftc_t *, char *, int, void *); From owner-p4-projects@FreeBSD.ORG Wed Sep 6 21:29:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07FFA16A4E6; Wed, 6 Sep 2006 21:29:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA8B816A4DF for ; Wed, 6 Sep 2006 21:29:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECCF243D76 for ; Wed, 6 Sep 2006 21:29:50 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86LTort066147 for ; Wed, 6 Sep 2006 21:29:50 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86LToDn066144 for perforce@freebsd.org; Wed, 6 Sep 2006 21:29:50 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 6 Sep 2006 21:29:50 GMT Message-Id: <200609062129.k86LToDn066144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 21:29:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=105739 Change 105739 by mjacob@newisp on 2006/09/06 21:29:49 Some internal function rototilling. Affected files ... .. //depot/projects/newisp/dev/isp/isp_library.c#4 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_library.c#4 (text) ==== @@ -48,7 +48,7 @@ int isp_save_xs(ispsoftc_t *isp, XS_T *xs, uint32_t *handlep) { - uint32_t i, j; + uint16_t i, j; for (j = isp->isp_lasthdls, i = 0; i < isp->isp_maxcmds; i++) { if (isp->isp_xflist[j] == NULL) { @@ -83,27 +83,21 @@ uint32_t isp_find_handle(ispsoftc_t *isp, XS_T *xs) { - int i; + uint16_t i; if (xs != NULL) { for (i = 0; i < isp->isp_maxcmds; i++) { if (isp->isp_xflist[i] == xs) { - return ((uint32_t) i+1); + return ((uint32_t) (i+1)); } } } return (0); } -int +uint32_t isp_handle_index(uint32_t handle) { - return (handle-1); -} - -uint32_t -isp_index_handle(int index) -{ - return (index+1); + return (handle - 1); } void @@ -206,22 +200,30 @@ fcp = FCPARAM(isp); tptr = &tval; if (isp_control(isp, ISPCTL_FCLINK_TEST, tptr) != 0) { + isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: linktest failed"); return (-1); } if (fcp->isp_fwstate != FW_READY || fcp->isp_loopstate < LOOP_PDB_RCVD) { + isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: f/w not ready"); return (-1); } if (isp_control(isp, ISPCTL_SCAN_LOOP, NULL) != 0) { + isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: scan loop fails"); return (-1); } if (isp_control(isp, ISPCTL_SCAN_FABRIC, NULL) != 0) { + isp_prt(isp, ISP_LOGINFO, + "isp_fc_runstate: scan fabric fails"); return (-1); } if (isp_control(isp, ISPCTL_PDB_SYNC, NULL) != 0) { + isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: pdb_sync fails"); return (-1); } if (fcp->isp_fwstate != FW_READY || fcp->isp_loopstate != LOOP_READY) { + isp_prt(isp, ISP_LOGINFO, + "isp_fc_runstate: f/w not ready again"); return (-1); } return (0); From owner-p4-projects@FreeBSD.ORG Wed Sep 6 21:31:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E59E116A4E1; Wed, 6 Sep 2006 21:31:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C42A616A4DD for ; Wed, 6 Sep 2006 21:31:57 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E774643D81 for ; Wed, 6 Sep 2006 21:31:53 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86LVrSN066377 for ; Wed, 6 Sep 2006 21:31:53 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86LVrGJ066374 for perforce@freebsd.org; Wed, 6 Sep 2006 21:31:53 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 6 Sep 2006 21:31:53 GMT Message-Id: <200609062131.k86LVrGJ066374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 21:31:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=105740 Change 105740 by mjacob@newisp on 2006/09/06 21:31:04 Checkpoint 2400 target mode. Affected files ... .. //depot/projects/newisp/dev/isp/isp_target.h#4 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_target.h#4 (text+ko) ==== @@ -178,6 +178,46 @@ #endif /* + * ISP24XX Immediate Notify + */ + +typedef struct { + isphdr_t in_header; + uint32_t in_reserved; + uint16_t in_nphdl; + uint16_t in_reserved1; + uint16_t in_flags; + uint16_t in_srr_rx_id; + uint16_t in_status; + uint16_t in_status_subcode; + uint32_t in_rx_addr; /* receive exchange address */ + uint16_t in_rx_reloff_lo; + uint16_t in_rx_reloff_hi; + uint16_t in_srr_iu; + uint16_t in_srr_oxid; + uint8_t in_reserved2[18]; + uint16_t in_vpindex; /* in high eight bits */ + uint32_t in_reserved3; + uint16_t in_portid_lo; + uint16_t in_portid_hi; + uint16_t in_reserved4; + uint16_t in_oxid; +} in_fcentry_2400_t; + +#define IN24XX_FLAG_PUREX_IOCB 0x1 +#define IN24XX_FLAG_GLOBAL_LOGOUT 0x2 + +#define IN24XX_LIP_RESET 0x0E +#define IN24XX_LINK_RESET 0x0F +#define IN24XX_PORT_LOGOUT 0x29 +#define IN24XX_PORT_CHANGED 0x2A +#define IN24XX_LINK_FAILED 0x2E +#define IN24XX_SRR_RCVD 0x45 +#define IN24XX_ELS_RCVD 0x46 /* + * login-affectin ELS received- check + * subcode for specific opcode + */ +/* * Notify Acknowledge Entry structure */ #define NA_RSVDLEN 22 From owner-p4-projects@FreeBSD.ORG Wed Sep 6 22:17:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDED316A4EC; Wed, 6 Sep 2006 22:17:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7915516A4E7 for ; Wed, 6 Sep 2006 22:17:22 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89E2943DD5 for ; Wed, 6 Sep 2006 22:15:54 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86MFsKm070703 for ; Wed, 6 Sep 2006 22:15:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86MFqEL070696 for perforce@freebsd.org; Wed, 6 Sep 2006 22:15:52 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 6 Sep 2006 22:15:52 GMT Message-Id: <200609062215.k86MFqEL070696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Sep 2006 22:17:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=105747 Change 105747 by mjacob@newisp on 2006/09/06 22:15:12 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/newisp/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/newisp/dev/iicbus/iic.c#2 integrate .. //depot/projects/newisp/dev/isp/isp.c#9 edit .. //depot/projects/newisp/dev/usb/ugen.c#2 integrate .. //depot/projects/newisp/i386/acpica/Makefile#2 integrate .. //depot/projects/newisp/i386/i386/local_apic.c#3 integrate .. //depot/projects/newisp/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/newisp/kern/vfs_aio.c#2 integrate .. //depot/projects/newisp/net/if.c#2 integrate .. //depot/projects/newisp/net/if.h#2 integrate .. //depot/projects/newisp/net/if_var.h#2 integrate .. //depot/projects/newisp/netinet/in_pcb.c#2 integrate .. //depot/projects/newisp/netinet/ip_output.c#2 integrate .. //depot/projects/newisp/netinet/raw_ip.c#2 integrate .. //depot/projects/newisp/netinet/tcp_input.c#2 integrate .. //depot/projects/newisp/netinet/tcp_subr.c#3 integrate .. //depot/projects/newisp/netinet/tcp_timer.c#2 integrate .. //depot/projects/newisp/netinet/tcp_var.h#2 integrate .. //depot/projects/newisp/netinet/udp_usrreq.c#3 integrate .. //depot/projects/newisp/netinet6/icmp6.c#2 integrate .. //depot/projects/newisp/sys/mbuf.h#2 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.27 2006/09/05 17:15:24 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.28 2006/09/06 22:05:34 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,6 +613,7 @@ /* Send EOI first thing. */ lapic_eoi(); +#ifdef SMP /* * Don't do any accounting for the disabled HTT cores, since it * will provide misleading numbers for the userland. @@ -622,6 +623,7 @@ */ if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) return; +#endif /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; ==== //depot/projects/newisp/contrib/pf/net/pf_ioctl.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.25 2006/07/21 09:48:13 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.26 2006/09/06 17:19:45 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* add: $OpenBSD: pf_ioctl.c,v 1.168 2006/07/21 01:21:17 dhartmei Exp $ */ @@ -3438,11 +3438,17 @@ struct inpcb *inp) { /* - * IPv6 does not affected ip_len/ip_off byte order changes. + * IPv6 is not affected by ip_len/ip_off byte order changes. */ int chk; - chk = pf_test6(PF_IN, ifp, m, NULL, inp); + /* + * In case of loopback traffic IPv6 uses the real interface in + * order to support scoped addresses. In order to support stateful + * filtering we have change this to lo0 as it is the case in IPv4. + */ + chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &loif[0] : ifp, m, + NULL, inp); if (chk && *m) { m_freem(*m); *m = NULL; ==== //depot/projects/newisp/dev/iicbus/iic.c#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/dev/iicbus/iic.c,v 1.35 2006/07/14 23:15:06 imp Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.37 2006/09/06 20:22:43 imp Exp $ * */ #include ==== //depot/projects/newisp/dev/isp/isp.c#9 (text+ko) ==== @@ -2095,11 +2095,7 @@ plp->plogx_portlo = portid; plp->plogx_rspsz_porthi = (portid >> 16) & 0xff; if (log_ret) { - if (*log_ret) { - plp->plogx_flags = 0; - } else { - plp->plogx_flags = 0xc8; - } + plp->plogx_flags = *log_ret; } else { log_ret = &junk; } @@ -2192,7 +2188,7 @@ *log_ret = MBOX_PORT_ID_USED; break; case PLOGX_IOCBERR_HNDLUSED: - isp_prt(isp, /* ISP_LOGDEBUG0 */ ISP_LOGALL, + isp_prt(isp, ISP_LOGDEBUG0, "N-port handle 0x%x already used for portid 0x%x", handle, parm1); *log_ret = MBOX_LOOP_ID_USED; @@ -3092,7 +3088,6 @@ return (1); } - /* * Build a Passthrough IOCB in memory. */ @@ -3198,7 +3193,7 @@ FC_SCRATCH_RELEASE(isp); return (0); } else if (r < 0) { - fcp->isp_loopstate = LOOP_PDB_RCVD; /* try again */ + fcp->isp_loopstate = LOOP_LIP_RCVD; /* try again */ FC_SCRATCH_RELEASE(isp); return (0); } @@ -3500,7 +3495,7 @@ * Try and log out of the device first. */ if (IS_24XX(isp)) { - logval = 0; + logval = 0xc8; isp_plogx_24xx(isp, handle, portid, &logval); } else { isp_port_logout(isp, handle, portid); @@ -3514,7 +3509,7 @@ * Try and log into the device. */ if (IS_24XX(isp)) { - logval = 1; + logval = 0; isp_plogx_24xx(isp, handle, portid, &logval); } else { logval = isp_port_login(isp, handle, portid); @@ -6830,7 +6825,7 @@ isp_reinit(ispsoftc_t *isp) { XS_T *xs; - int i; + uint32_t tmp; if (IS_FC(isp)) { isp_mark_portdb(isp, 0); @@ -6850,13 +6845,17 @@ } isp->isp_nactive = 0; - for (i = 0; i < isp->isp_maxcmds; i++) { + for (tmp = 0; tmp < isp->isp_maxcmds; tmp++) { uint16_t handle; - xs = isp->isp_xflist[i]; + + xs = isp->isp_xflist[tmp]; if (xs == NULL) { continue; } - handle = isp_index_handle(i); + handle = isp_find_handle(isp, xs); + if (handle == 0) { + continue; + } isp_destroy_handle(isp, handle); if (XS_XFRLEN(xs)) { ISP_DMAFREE(isp, xs, handle); ==== //depot/projects/newisp/dev/usb/ugen.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.106 2006/06/05 14:44:39 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.107 2006/09/06 21:53:28 imp Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -52,24 +52,15 @@ #include #include #include -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include -#include -#elif defined(__FreeBSD__) #include #include #include #include #include #include -#endif #include #include -#if __FreeBSD_version >= 500014 #include -#else -#include -#endif #include #include #include @@ -79,8 +70,8 @@ #include #ifdef USB_DEBUG -#define DPRINTF(x) if (ugendebug) logprintf x -#define DPRINTFN(n,x) if (ugendebug>(n)) logprintf x +#define DPRINTF(x) if (ugendebug) printf x +#define DPRINTFN(n,x) if (ugendebug>(n)) printf x int ugendebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB ugen"); SYSCTL_INT(_hw_usb_ugen, OID_AUTO, debug, CTLFLAG_RW, @@ -100,9 +91,7 @@ struct ugen_endpoint { struct ugen_softc *sc; -#if defined(__FreeBSD__) struct cdev *dev; -#endif usb_endpoint_descriptor_t *edesc; usbd_interface_handle iface; int state; @@ -127,16 +116,13 @@ struct ugen_softc { USBBASEDEVICE sc_dev; /* base device */ usbd_device_handle sc_udev; -#if defined(__FreeBSD__) struct cdev *dev; -#endif char sc_is_open[USB_MAX_ENDPOINTS]; struct ugen_endpoint sc_endpoints[USB_MAX_ENDPOINTS][2]; #define OUT 0 #define IN 1 -#ifdef __FreeBSD__ #define UGEN_DEV_REF(dev, sc) \ if ((sc)->sc_dying || dev_refthread(dev) == NULL) \ return (ENXIO) @@ -146,26 +132,9 @@ /* handled by dev layer */ #define UGEN_DEV_CLOSE(dev, sc) \ /* handled by dev layer */ -#else - int sc_refcnt; -#define UGEN_DEV_REF(dev, sc) \ - if ((sc)->sc_dying) \ - return (ENXIO); \ - (sc)->sc_refcnt++ -#define UGEN_DEV_RELE(dev, sc) \ - if (--(sc)->sc_refcnt < 0) \ - usb_detach_wakeup(USBDEV((sc)->sc_dev)) -#define UGEN_DEV_OPEN(dev, sc) \ - (sc)->sc_refcnt++ -#define UGEN_DEV_CLOSE(dev, sc) \ - UGEN_DEV_RELE(dev, sc) -#endif u_char sc_dying; }; -#if defined(__NetBSD__) || defined(__OpenBSD__) -cdev_decl(ugen); -#elif defined(__FreeBSD__) d_open_t ugenopen; d_close_t ugenclose; d_read_t ugenread; @@ -174,7 +143,7 @@ d_poll_t ugenpoll; d_purge_t ugenpurge; -Static struct cdevsw ugenctl_cdevsw = { +static struct cdevsw ugenctl_cdevsw = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, .d_open = ugenopen, @@ -182,12 +151,9 @@ .d_ioctl = ugenioctl, .d_purge = ugenpurge, .d_name = "ugenctl", -#if __FreeBSD_version < 500014 - .d_bmaj -1 -#endif }; -Static struct cdevsw ugen_cdevsw = { +static struct cdevsw ugen_cdevsw = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, .d_open = ugenopen, @@ -198,39 +164,54 @@ .d_poll = ugenpoll, .d_purge = ugenpurge, .d_name = "ugen", -#if __FreeBSD_version < 500014 - .d_bmaj -1 -#endif }; -#endif -Static void ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr, +static void ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status); -Static void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr, +static void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status); -Static int ugen_do_read(struct ugen_softc *, int, struct uio *, int); -Static int ugen_do_write(struct ugen_softc *, int, struct uio *, int); -Static int ugen_do_ioctl(struct ugen_softc *, int, u_long, +static int ugen_do_read(struct ugen_softc *, int, struct uio *, int); +static int ugen_do_write(struct ugen_softc *, int, struct uio *, int); +static int ugen_do_ioctl(struct ugen_softc *, int, u_long, caddr_t, int, usb_proc_ptr); -#if defined(__FreeBSD__) -Static void ugen_make_devnodes(struct ugen_softc *sc); -Static void ugen_destroy_devnodes(struct ugen_softc *sc); -#endif -Static int ugen_set_config(struct ugen_softc *sc, int configno); -Static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc, +static void ugen_make_devnodes(struct ugen_softc *sc); +static void ugen_destroy_devnodes(struct ugen_softc *sc); +static int ugen_set_config(struct ugen_softc *sc, int configno); +static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp); -Static usbd_status ugen_set_interface(struct ugen_softc *, int, int); -Static int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx); +static usbd_status ugen_set_interface(struct ugen_softc *, int, int); +static int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx); #define UGENUNIT(n) ((minor(n) >> 4) & 0xf) #define UGENENDPOINT(n) (minor(n) & 0xf) #define UGENMINOR(u, e) (((u) << 4) | (e)) -USB_DECLARE_DRIVER(ugen); +static device_probe_t ugen_match; +static device_attach_t ugen_attach; +static device_detach_t ugen_detach; + +static devclass_t ugen_devclass; + +static device_method_t ugen_methods[] = { + DEVMETHOD(device_probe, ugen_match), + DEVMETHOD(device_attach, ugen_attach), + DEVMETHOD(device_detach, ugen_detach), + {0,0}, + {0,0} +}; + +static driver_t ugen_driver = { + "ugen", + ugen_methods, + sizeof(struct ugen_softc) +}; + +MODULE_DEPEND(ugen, usb, 1, 1, 1); -USB_MATCH(ugen) +static int +ugen_match(device_t self) { - USB_MATCH_START(ugen, uaa); + struct usb_attach_arg *uaa = device_get_ivars(self); #if 0 if (uaa->matchlvl) @@ -242,16 +223,19 @@ return (UMATCH_NONE); } -USB_ATTACH(ugen) +static int +ugen_attach(device_t self) { - USB_ATTACH_START(ugen, sc, uaa); + struct ugen_softc *sc = device_get_softc(self); + struct usb_attach_arg *uaa = device_get_ivars(self); usbd_device_handle udev; char devinfo[1024]; usbd_status err; int conf; usbd_devinfo(uaa->device, 0, devinfo); - USB_ATTACH_SETUP; + sc->sc_dev = self; + device_set_desc_copy(self, devinfo); sc->sc_udev = udev = uaa->device; @@ -263,7 +247,7 @@ printf("%s: setting configuration index 0 failed\n", USBDEVNAME(sc->sc_dev)); sc->sc_dying = 1; - USB_ATTACH_ERROR_RETURN; + return (ENXIO); } conf = usbd_get_config_descriptor(udev)->bConfigurationValue; @@ -273,25 +257,22 @@ printf("%s: setting configuration %d failed\n", USBDEVNAME(sc->sc_dev), conf); sc->sc_dying = 1; - USB_ATTACH_ERROR_RETURN; + return (ENXIO); } -#if defined(__FreeBSD__) /* the main device, ctrl endpoint */ sc->dev = make_dev(&ugenctl_cdevsw, UGENMINOR(USBDEVUNIT(sc->sc_dev), 0), UID_ROOT, GID_OPERATOR, 0644, "%s", USBDEVNAME(sc->sc_dev)); ugen_make_devnodes(sc); -#endif usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, USBDEV(sc->sc_dev)); - USB_ATTACH_SUCCESS_RETURN; + return (0); } -#if defined(__FreeBSD__) -Static void +static void ugen_make_devnodes(struct ugen_softc *sc) { int endptno; @@ -322,7 +303,7 @@ } } -Static void +static void ugen_destroy_devnodes(struct ugen_softc *sc) { int endptno, prev_sc_dying; @@ -358,9 +339,8 @@ } sc->sc_dying = prev_sc_dying; } -#endif -Static int +static int ugen_set_config(struct ugen_softc *sc, int configno) { usbd_device_handle dev = sc->sc_udev; @@ -433,9 +413,7 @@ } } -#if defined(__FreeBSD__) ugen_destroy_devnodes(sc); -#endif /* now we can clear the old interface's ugen_endpoints */ for(ifaceno = 0; ifaceno < niface_cache; ifaceno++) { @@ -504,7 +482,9 @@ void *buf; int i, j; - USB_GET_SC_OPEN(ugen, unit, sc); + sc = devclass_get_softc(ugen_devclass, unit); + if (sc == NULL) + return (ENXIO); DPRINTFN(5, ("ugenopen: flag=%d, mode=%d, unit=%d endpt=%d\n", flag, mode, unit, endpt)); @@ -641,7 +621,7 @@ int dir; int i; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); DPRINTFN(5, ("ugenclose: flag=%d, mode=%d, unit=%d, endpt=%d\n", flag, mode, UGENUNIT(dev), endpt)); @@ -698,7 +678,7 @@ return (0); } -Static int +static int ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag) { struct ugen_endpoint *sce = &sc->sc_endpoints[endpt][IN]; @@ -847,7 +827,7 @@ struct ugen_softc *sc; int error; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); if (sc->sc_dying) return (EIO); @@ -858,7 +838,7 @@ return (error); } -Static int +static int ugen_do_write(struct ugen_softc *sc, int endpt, struct uio *uio, int flag) { struct ugen_endpoint *sce = &sc->sc_endpoints[endpt][OUT]; @@ -951,7 +931,7 @@ struct ugen_softc *sc; int error; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); if (sc->sc_dying) return (EIO); @@ -962,25 +942,6 @@ return (error); } -#if defined(__NetBSD__) || defined(__OpenBSD__) -int -ugen_activate(device_ptr_t self, enum devact act) -{ - struct ugen_softc *sc = (struct ugen_softc *)self; - - switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - - case DVACT_DEACTIVATE: - sc->sc_dying = 1; - break; - } - return (0); -} -#endif - -#ifdef __FreeBSD__ void ugenpurge(struct cdev *dev) { @@ -990,7 +951,7 @@ if (endpt == USB_CONTROL_ENDPOINT) return; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); sce = &sc->sc_endpoints[endpt][IN]; if (sce->pipeh) usbd_abort_pipe(sce->pipeh); @@ -1009,22 +970,15 @@ } selwakeuppri(&sce->rsel, PZERO); } -#endif -USB_DETACH(ugen) +static int +ugen_detach(device_t self) { - USB_DETACH_START(ugen, sc); + struct ugen_softc *sc = device_get_softc(self); struct ugen_endpoint *sce; int i, dir; -#if defined(__NetBSD__) || defined(__OpenBSD__) - int maj, mn, c, s; -#endif -#if defined(__NetBSD__) || defined(__OpenBSD__) - DPRINTF(("ugen_detach: sc=%p flags=%d\n", sc, flags)); -#elif defined(__FreeBSD__) DPRINTF(("ugen_detach: sc=%p\n", sc)); -#endif sc->sc_dying = 1; /* Abort all pipes. Causes processes waiting for transfer to wake. */ @@ -1037,41 +991,8 @@ } } -#if defined(__NetBSD__) || defined(__OpenBSD__) - s = splusb(); - if (sc->sc_refcnt > 0) { - /* Wake everyone */ - for (i = 0; i < USB_MAX_ENDPOINTS; i++) - wakeup(&sc->sc_endpoints[i][IN]); - /* Wait for processes to go away. */ - while (sc->sc_refcnt > 0) - usb_detach_wait(USBDEV(sc->sc_dev)); - } - splx(s); - - /* Wait for opens to go away. */ - do { - c = 0; - for (i = 0; i < USB_MAX_ENDPOINTS; i++) { - if (sc->sc_is_open[i]) - c++; - } - if (c != 0) - tsleep(&sc->sc_dying, PZERO, "ugendr", hz); - } while (c != 0); - - /* locate the major number */ - for (maj = 0; maj < nchrdev; maj++) - if (cdevsw[maj].d_open == ugenopen) - break; - - /* Nuke the vnodes for any open instances (calls close). */ - mn = self->dv_unit * USB_MAX_ENDPOINTS; - vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); -#elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ destroy_dev(sc->dev); -#endif usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, USBDEV(sc->sc_dev)); @@ -1079,7 +1000,7 @@ return (0); } -Static void +static void ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) { struct ugen_endpoint *sce = addr; @@ -1115,7 +1036,7 @@ selwakeuppri(&sce->rsel, PZERO); } -Static void +static void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) { @@ -1174,7 +1095,7 @@ selwakeuppri(&sce->rsel, PZERO); } -Static usbd_status +static usbd_status ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int altno) { usbd_interface_handle iface; @@ -1222,10 +1143,8 @@ if (err) panic("ugen_set_interface: endpoint count failed"); -#if defined(__FreeBSD__) /* destroy the existing devices, we remake the new ones in a moment */ ugen_destroy_devnodes(sc); -#endif /* now we can clear the old interface's ugen_endpoints */ for (endptno = 0; endptno < nendpt_cache; endptno++) { @@ -1247,16 +1166,14 @@ sce->iface = iface; } -#if defined(__FreeBSD__) /* make the new devices */ ugen_make_devnodes(sc); -#endif return (0); } /* Retrieve a complete descriptor for a certain device and index. */ -Static usb_config_descriptor_t * +static usb_config_descriptor_t * ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp) { usb_config_descriptor_t *cdesc, *tdesc, cdescr; @@ -1289,7 +1206,7 @@ return (cdesc); } -Static int +static int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx) { usbd_interface_handle iface; @@ -1301,7 +1218,7 @@ return (usbd_get_interface_altindex(iface)); } -Static int +static int ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p) { @@ -1374,9 +1291,7 @@ err = ugen_set_config(sc, *(int *)addr); switch (err) { case USBD_NORMAL_COMPLETION: -#if defined(__FreeBSD__) ugen_make_devnodes(sc); -#endif break; case USBD_IN_USE: return (EBUSY); @@ -1582,7 +1497,7 @@ struct ugen_softc *sc; int error; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); if (sc->sc_dying) return (EIO); @@ -1602,7 +1517,7 @@ int revents = 0; int s; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); if (sc->sc_dying) return ((events & (POLLIN | POLLOUT | POLLRDNORM | @@ -1666,6 +1581,4 @@ return (revents); } -#if defined(__FreeBSD__) DRIVER_MODULE(ugen, uhub, ugen_driver, ugen_devclass, usbd_driver_load, 0); -#endif ==== //depot/projects/newisp/i386/acpica/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/acpica/Makefile,v 1.6 2004/04/13 13:43:11 des Exp $ +# $FreeBSD: src/sys/i386/acpica/Makefile,v 1.7 2006/09/06 14:23:40 ru Exp $ # Correct path for kernel builds # Don't rely on the kernel's .depend file @@ -9,7 +9,13 @@ MAKESRCPATH= ${.CURDIR} CLEANFILES= acpi_wakecode.h acpi_wakecode.bin acpi_wakecode.o .endif -CFLAGS+= -I. -I@ +.if ${CC} == "icc" +CFLAGS+= -restrict +NOSTDINC= -X +.else +NOSTDINC= -nostdinc +.endif +CFLAGS+= ${NOSTDINC} -I. -I${MAKESRCPATH}/../.. all: acpi_wakecode.h ==== //depot/projects/newisp/i386/i386/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.29 2006/09/05 17:15:24 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.30 2006/09/06 22:05:33 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -615,6 +615,7 @@ /* Send EOI first thing. */ lapic_eoi(); +#ifdef SMP /* * Don't do any accounting for the disabled HTT cores, since it * will provide misleading numbers for the userland. @@ -624,6 +625,7 @@ */ if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) return; +#endif /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; ==== //depot/projects/newisp/kern/uipc_sockbuf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.164 2006/08/02 13:01:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.165 2006/09/06 21:59:36 jhb Exp $"); #include "opt_param.h" @@ -253,18 +253,14 @@ sysctl_handle_sb_max(SYSCTL_HANDLER_ARGS) { int error = 0; - u_long old_sb_max = sb_max; + u_long tmp_sb_max = sb_max; - error = SYSCTL_OUT(req, arg1, sizeof(u_long)); + error = sysctl_handle_long(oidp, &tmp_sb_max, arg2, req); if (error || !req->newptr) return (error); - error = SYSCTL_IN(req, arg1, sizeof(u_long)); - if (error) - return (error); - if (sb_max < MSIZE + MCLBYTES) { - sb_max = old_sb_max; + if (tmp_sb_max < MSIZE + MCLBYTES) return (EINVAL); - } + sb_max = tmp_sb_max; sb_max_adj = (u_quad_t)sb_max * MCLBYTES / (MSIZE + MCLBYTES); return (0); } ==== //depot/projects/newisp/kern/vfs_aio.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.225 2006/08/15 12:10:57 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.226 2006/09/06 15:11:20 mp Exp $"); #include #include @@ -977,12 +977,6 @@ aiop->aiothread = td; aiop->aiothreadflags = 0; - /* - * Get rid of our current filedescriptors. AIOD's don't need any - * filedescriptors, except as temporarily inherited from the client. - */ - fdfree(td); - /* The daemon resides in its own pgrp. */ setsid(td, NULL); ==== //depot/projects/newisp/net/if.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.261 2006/07/09 06:04:00 sam Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.262 2006/09/06 17:12:10 andre Exp $ */ #include "opt_compat.h" @@ -1006,6 +1006,33 @@ } /* + * Locate an interface based on the broadcast address. + */ +/* ARGSUSED */ +struct ifaddr * +ifa_ifwithbroadaddr(struct sockaddr *addr) +{ + struct ifnet *ifp; + struct ifaddr *ifa; + + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { + if (ifa->ifa_addr->sa_family != addr->sa_family) + continue; + if ((ifp->if_flags & IFF_BROADCAST) && + ifa->ifa_broadaddr && + ifa->ifa_broadaddr->sa_len != 0 && + sa_equal(ifa->ifa_broadaddr, addr)) + goto done; + } + ifa = NULL; +done: + IFNET_RUNLOCK(); + return (ifa); +} + +/* * Locate the point to point interface with a given destination address. */ /*ARGSUSED*/ ==== //depot/projects/newisp/net/if.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if.h,v 1.103 2006/06/19 22:20:44 mlaier Exp $ + * $FreeBSD: src/sys/net/if.h,v 1.105 2006/09/06 21:51:58 andre Exp $ */ #ifndef _NET_IF_H_ @@ -101,7 +101,7 @@ u_long ifi_omcasts; /* packets sent via multicast */ u_long ifi_iqdrops; /* dropped on input, this interface */ u_long ifi_noproto; /* destined for unsupported protocol */ - u_long ifi_hwassist; /* HW offload capabilities */ + u_long ifi_hwassist; /* HW offload capabilities, see IFCAP */ time_t ifi_epoch; /* uptime at attach or stat reset */ struct timeval ifi_lastchange; /* time of last administrative change */ }; @@ -180,7 +180,24 @@ #define IF_Mbps(x) (IF_Kbps((x) * 1000)) /* megabits/sec. */ #define IF_Gbps(x) (IF_Mbps((x) * 1000)) /* gigabits/sec. */ -/* Capabilities that interfaces can advertise. */ +/* + * Capabilities that interfaces can advertise. + * + * struct ifnet.if_capabilities + * contains the optional features & capabilities a particular interface + * supports (not only the driver but also the detected hw revision). + * Capabilities are defined by IFCAP_* below. + * struct ifnet.if_capenabled + * contains the enabled (either by default or through ifconfig) optional + * features & capabilities on this interface. + * Capabilities are defined by IFCAP_* below. + * struct if_data.ifi_hwassist in mbuf CSUM_ flag form, controlled by above + * contains the enabled optional feature & capabilites that can be used + * individually per packet and are specified in the mbuf pkthdr.csum_flags + * field. IFCAP_* and CSUM_* do not match one to one and CSUM_* may be + * more detailed or differenciated that IFCAP_*. + * Hwassist features are defined CSUM_* in sys/mbuf.h + */ #define IFCAP_RXCSUM 0x0001 /* can offload checksum on RX */ #define IFCAP_TXCSUM 0x0002 /* can offload checksum on TX */ #define IFCAP_NETCONS 0x0004 /* can be a network console */ @@ -189,8 +206,11 @@ #define IFCAP_JUMBO_MTU 0x0020 /* 9000 byte MTU supported */ #define IFCAP_POLLING 0x0040 /* driver supports polling */ #define IFCAP_VLAN_HWCSUM 0x0080 /* can do IFCAP_HWCSUM on VLANs */ +#define IFCAP_TSO4 0x0100 /* can do TCP Segmentation Offload */ +#define IFCAP_TSO6 0x0200 /* can do TCP6 Segmentation Offload */ #define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM) +#define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6) #define IFQ_MAXLEN 50 #define IFNET_SLOWHZ 1 /* granularity is 1 second */ ==== //depot/projects/newisp/net/if_var.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.108 2006/08/04 21:27:37 brooks Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.110 2006/09/06 18:06:03 andre Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -137,8 +137,8 @@ short if_timer; /* time 'til if_watchdog called */ struct ifvlantrunk *if_vlantrunk; /* pointer to 802.1q data */ int if_flags; /* up/down, broadcast, etc. */ - int if_capabilities; /* interface capabilities */ - int if_capenable; /* enabled features */ + int if_capabilities; /* interface features & capabilities */ + int if_capenable; /* enabled features & capabilities */ void *if_linkmib; /* link-type-specific MIB data */ size_t if_linkmiblen; /* length of above data */ struct if_data if_data; @@ -683,6 +683,7 @@ struct ifnet *ifunit(const char *); struct ifaddr *ifa_ifwithaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithbroadaddr(struct sockaddr *); struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *); struct ifaddr *ifa_ifwithnet(struct sockaddr *); struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *); ==== //depot/projects/newisp/netinet/in_pcb.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 7 04:42:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3D3F16A4FB; Thu, 7 Sep 2006 04:42:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A53816A4F2 for ; Thu, 7 Sep 2006 04:42:03 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7FB243D45 for ; Thu, 7 Sep 2006 04:42:02 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k874g2nP039833 for ; Thu, 7 Sep 2006 04:42:02 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k874g1x7039830 for perforce@freebsd.org; Thu, 7 Sep 2006 04:42:01 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Sep 2006 04:42:01 GMT Message-Id: <200609070442.k874g1x7039830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 04:42:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=105762 Change 105762 by mjacob@newisp on 2006/09/07 04:41:53 IFC. Affected files ... .. //depot/projects/newisp/dev/usb/ehci.c#2 integrate .. //depot/projects/newisp/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/newisp/dev/usb/ehcivar.h#2 integrate .. //depot/projects/newisp/dev/usb/hid.c#2 integrate .. //depot/projects/newisp/dev/usb/if_aue.c#2 integrate .. //depot/projects/newisp/dev/usb/if_axe.c#2 integrate .. //depot/projects/newisp/dev/usb/if_cdce.c#2 integrate .. //depot/projects/newisp/dev/usb/if_cue.c#2 integrate .. //depot/projects/newisp/dev/usb/if_kue.c#2 integrate .. //depot/projects/newisp/dev/usb/if_rue.c#2 integrate .. //depot/projects/newisp/dev/usb/if_udav.c#2 integrate .. //depot/projects/newisp/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/newisp/dev/usb/if_ural.c#2 integrate .. //depot/projects/newisp/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/newisp/dev/usb/kue_fw.h#2 integrate .. //depot/projects/newisp/dev/usb/ohci.c#2 integrate .. //depot/projects/newisp/dev/usb/ohcivar.h#2 integrate .. //depot/projects/newisp/dev/usb/sl811hs.c#2 integrate .. //depot/projects/newisp/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/newisp/dev/usb/ubsa.c#2 integrate .. //depot/projects/newisp/dev/usb/ubser.c#2 integrate .. //depot/projects/newisp/dev/usb/ucom.c#2 integrate .. //depot/projects/newisp/dev/usb/ucomvar.h#2 integrate .. //depot/projects/newisp/dev/usb/udbp.c#2 integrate .. //depot/projects/newisp/dev/usb/ufm.c#2 integrate .. //depot/projects/newisp/dev/usb/ufoma.c#2 integrate .. //depot/projects/newisp/dev/usb/uftdi.c#2 integrate .. //depot/projects/newisp/dev/usb/ugen.c#3 integrate .. //depot/projects/newisp/dev/usb/uhci.c#2 integrate .. //depot/projects/newisp/dev/usb/uhcivar.h#2 integrate .. //depot/projects/newisp/dev/usb/uhid.c#2 integrate .. //depot/projects/newisp/dev/usb/uhub.c#2 integrate .. //depot/projects/newisp/dev/usb/ukbd.c#2 integrate .. //depot/projects/newisp/dev/usb/ulpt.c#2 integrate .. //depot/projects/newisp/dev/usb/umass.c#2 integrate .. //depot/projects/newisp/dev/usb/umct.c#2 integrate .. //depot/projects/newisp/dev/usb/umodem.c#2 integrate .. //depot/projects/newisp/dev/usb/ums.c#2 integrate .. //depot/projects/newisp/dev/usb/uplcom.c#2 integrate .. //depot/projects/newisp/dev/usb/urio.c#2 integrate .. //depot/projects/newisp/dev/usb/usb.c#2 integrate .. //depot/projects/newisp/dev/usb/usb.h#2 integrate .. //depot/projects/newisp/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/newisp/dev/usb/usb_mem.c#2 integrate .. //depot/projects/newisp/dev/usb/usb_port.h#2 integrate .. //depot/projects/newisp/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/newisp/dev/usb/usb_subr.c#2 integrate .. //depot/projects/newisp/dev/usb/usbdi.c#2 integrate .. //depot/projects/newisp/dev/usb/usbdi.h#2 integrate .. //depot/projects/newisp/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/newisp/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/newisp/dev/usb/usbdivar.h#2 integrate .. //depot/projects/newisp/dev/usb/uscanner.c#2 integrate .. //depot/projects/newisp/dev/usb/uvisor.c#2 integrate .. //depot/projects/newisp/dev/usb/uvscom.c#2 integrate .. //depot/projects/newisp/sys/mbuf.h#3 integrate Differences ... ==== //depot/projects/newisp/dev/usb/ehci.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.47 2006/05/28 23:37:04 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.49 2006/09/07 00:06:41 imp Exp $"); #include #include @@ -142,105 +142,105 @@ } u; }; -Static usbd_status ehci_open(usbd_pipe_handle); -Static void ehci_poll(struct usbd_bus *); -Static void ehci_softintr(void *); -Static int ehci_intr1(ehci_softc_t *); -Static void ehci_waitintr(ehci_softc_t *, usbd_xfer_handle); -Static void ehci_check_intr(ehci_softc_t *, struct ehci_xfer *); -Static void ehci_idone(struct ehci_xfer *); -Static void ehci_timeout(void *); -Static void ehci_timeout_task(void *); -Static void ehci_intrlist_timeout(void *); +static usbd_status ehci_open(usbd_pipe_handle); +static void ehci_poll(struct usbd_bus *); +static void ehci_softintr(void *); +static int ehci_intr1(ehci_softc_t *); +static void ehci_waitintr(ehci_softc_t *, usbd_xfer_handle); +static void ehci_check_intr(ehci_softc_t *, struct ehci_xfer *); +static void ehci_idone(struct ehci_xfer *); +static void ehci_timeout(void *); +static void ehci_timeout_task(void *); +static void ehci_intrlist_timeout(void *); -Static usbd_status ehci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t); -Static void ehci_freem(struct usbd_bus *, usb_dma_t *); +static usbd_status ehci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t); +static void ehci_freem(struct usbd_bus *, usb_dma_t *); -Static usbd_xfer_handle ehci_allocx(struct usbd_bus *); -Static void ehci_freex(struct usbd_bus *, usbd_xfer_handle); +static usbd_xfer_handle ehci_allocx(struct usbd_bus *); +static void ehci_freex(struct usbd_bus *, usbd_xfer_handle); -Static usbd_status ehci_root_ctrl_transfer(usbd_xfer_handle); -Static usbd_status ehci_root_ctrl_start(usbd_xfer_handle); -Static void ehci_root_ctrl_abort(usbd_xfer_handle); -Static void ehci_root_ctrl_close(usbd_pipe_handle); -Static void ehci_root_ctrl_done(usbd_xfer_handle); +static usbd_status ehci_root_ctrl_transfer(usbd_xfer_handle); +static usbd_status ehci_root_ctrl_start(usbd_xfer_handle); +static void ehci_root_ctrl_abort(usbd_xfer_handle); +static void ehci_root_ctrl_close(usbd_pipe_handle); +static void ehci_root_ctrl_done(usbd_xfer_handle); -Static usbd_status ehci_root_intr_transfer(usbd_xfer_handle); -Static usbd_status ehci_root_intr_start(usbd_xfer_handle); -Static void ehci_root_intr_abort(usbd_xfer_handle); -Static void ehci_root_intr_close(usbd_pipe_handle); -Static void ehci_root_intr_done(usbd_xfer_handle); +static usbd_status ehci_root_intr_transfer(usbd_xfer_handle); +static usbd_status ehci_root_intr_start(usbd_xfer_handle); +static void ehci_root_intr_abort(usbd_xfer_handle); +static void ehci_root_intr_close(usbd_pipe_handle); +static void ehci_root_intr_done(usbd_xfer_handle); -Static usbd_status ehci_device_ctrl_transfer(usbd_xfer_handle); -Static usbd_status ehci_device_ctrl_start(usbd_xfer_handle); -Static void ehci_device_ctrl_abort(usbd_xfer_handle); -Static void ehci_device_ctrl_close(usbd_pipe_handle); -Static void ehci_device_ctrl_done(usbd_xfer_handle); +static usbd_status ehci_device_ctrl_transfer(usbd_xfer_handle); +static usbd_status ehci_device_ctrl_start(usbd_xfer_handle); +static void ehci_device_ctrl_abort(usbd_xfer_handle); +static void ehci_device_ctrl_close(usbd_pipe_handle); +static void ehci_device_ctrl_done(usbd_xfer_handle); -Static usbd_status ehci_device_bulk_transfer(usbd_xfer_handle); -Static usbd_status ehci_device_bulk_start(usbd_xfer_handle); -Static void ehci_device_bulk_abort(usbd_xfer_handle); -Static void ehci_device_bulk_close(usbd_pipe_handle); -Static void ehci_device_bulk_done(usbd_xfer_handle); +static usbd_status ehci_device_bulk_transfer(usbd_xfer_handle); +static usbd_status ehci_device_bulk_start(usbd_xfer_handle); +static void ehci_device_bulk_abort(usbd_xfer_handle); +static void ehci_device_bulk_close(usbd_pipe_handle); +static void ehci_device_bulk_done(usbd_xfer_handle); -Static usbd_status ehci_device_intr_transfer(usbd_xfer_handle); -Static usbd_status ehci_device_intr_start(usbd_xfer_handle); -Static void ehci_device_intr_abort(usbd_xfer_handle); -Static void ehci_device_intr_close(usbd_pipe_handle); -Static void ehci_device_intr_done(usbd_xfer_handle); +static usbd_status ehci_device_intr_transfer(usbd_xfer_handle); +static usbd_status ehci_device_intr_start(usbd_xfer_handle); +static void ehci_device_intr_abort(usbd_xfer_handle); +static void ehci_device_intr_close(usbd_pipe_handle); +static void ehci_device_intr_done(usbd_xfer_handle); -Static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle); -Static usbd_status ehci_device_isoc_start(usbd_xfer_handle); -Static void ehci_device_isoc_abort(usbd_xfer_handle); -Static void ehci_device_isoc_close(usbd_pipe_handle); -Static void ehci_device_isoc_done(usbd_xfer_handle); +static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle); +static usbd_status ehci_device_isoc_start(usbd_xfer_handle); +static void ehci_device_isoc_abort(usbd_xfer_handle); +static void ehci_device_isoc_close(usbd_pipe_handle); +static void ehci_device_isoc_done(usbd_xfer_handle); -Static void ehci_device_clear_toggle(usbd_pipe_handle pipe); -Static void ehci_noop(usbd_pipe_handle pipe); +static void ehci_device_clear_toggle(usbd_pipe_handle pipe); +static void ehci_noop(usbd_pipe_handle pipe); -Static int ehci_str(usb_string_descriptor_t *, int, char *); -Static void ehci_pcd(ehci_softc_t *, usbd_xfer_handle); -Static void ehci_pcd_able(ehci_softc_t *, int); -Static void ehci_pcd_enable(void *); -Static void ehci_disown(ehci_softc_t *, int, int); +static int ehci_str(usb_string_descriptor_t *, int, char *); +static void ehci_pcd(ehci_softc_t *, usbd_xfer_handle); +static void ehci_pcd_able(ehci_softc_t *, int); +static void ehci_pcd_enable(void *); +static void ehci_disown(ehci_softc_t *, int, int); -Static ehci_soft_qh_t *ehci_alloc_sqh(ehci_softc_t *); -Static void ehci_free_sqh(ehci_softc_t *, ehci_soft_qh_t *); +static ehci_soft_qh_t *ehci_alloc_sqh(ehci_softc_t *); +static void ehci_free_sqh(ehci_softc_t *, ehci_soft_qh_t *); -Static ehci_soft_qtd_t *ehci_alloc_sqtd(ehci_softc_t *); -Static void ehci_free_sqtd(ehci_softc_t *, ehci_soft_qtd_t *); -Static usbd_status ehci_alloc_sqtd_chain(struct ehci_pipe *, +static ehci_soft_qtd_t *ehci_alloc_sqtd(ehci_softc_t *); +static void ehci_free_sqtd(ehci_softc_t *, ehci_soft_qtd_t *); +static usbd_status ehci_alloc_sqtd_chain(struct ehci_pipe *, ehci_softc_t *, int, int, usbd_xfer_handle, ehci_soft_qtd_t *, ehci_soft_qtd_t *, ehci_soft_qtd_t **, ehci_soft_qtd_t **); -Static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qh_t *, +static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qh_t *, ehci_soft_qtd_t *, ehci_soft_qtd_t *); -Static usbd_status ehci_device_request(usbd_xfer_handle xfer); +static usbd_status ehci_device_request(usbd_xfer_handle xfer); -Static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *, +static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *, int ival); -Static void ehci_add_qh(ehci_soft_qh_t *, ehci_soft_qh_t *); -Static void ehci_rem_qh(ehci_softc_t *, ehci_soft_qh_t *, +static void ehci_add_qh(ehci_soft_qh_t *, ehci_soft_qh_t *); +static void ehci_rem_qh(ehci_softc_t *, ehci_soft_qh_t *, ehci_soft_qh_t *); -Static void ehci_activate_qh(ehci_soft_qh_t *, ehci_soft_qtd_t *); -Static void ehci_sync_hc(ehci_softc_t *); +static void ehci_activate_qh(ehci_soft_qh_t *, ehci_soft_qtd_t *); +static void ehci_sync_hc(ehci_softc_t *); -Static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *); -Static void ehci_abort_xfer(usbd_xfer_handle, usbd_status); +static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *); +static void ehci_abort_xfer(usbd_xfer_handle, usbd_status); #ifdef EHCI_DEBUG -Static void ehci_dump_regs(ehci_softc_t *); +static void ehci_dump_regs(ehci_softc_t *); void ehci_dump(void); -Static ehci_softc_t *theehci; -Static void ehci_dump_link(ehci_link_t, int); -Static void ehci_dump_sqtds(ehci_soft_qtd_t *); -Static void ehci_dump_sqtd(ehci_soft_qtd_t *); -Static void ehci_dump_qtd(ehci_qtd_t *); -Static void ehci_dump_sqh(ehci_soft_qh_t *); +static ehci_softc_t *theehci; +static void ehci_dump_link(ehci_link_t, int); +static void ehci_dump_sqtds(ehci_soft_qtd_t *); +static void ehci_dump_sqtd(ehci_soft_qtd_t *); +static void ehci_dump_qtd(ehci_qtd_t *); +static void ehci_dump_sqh(ehci_soft_qh_t *); #ifdef DIAGNOSTIC -Static void ehci_dump_exfer(struct ehci_xfer *); +static void ehci_dump_exfer(struct ehci_xfer *); #endif #endif @@ -257,7 +257,7 @@ } while (0) #define ehci_active_intr_list(ex) ((ex)->inext.le_prev != NULL) -Static struct usbd_bus_methods ehci_bus_methods = { +static struct usbd_bus_methods ehci_bus_methods = { ehci_open, ehci_softintr, ehci_poll, @@ -267,7 +267,7 @@ ehci_freex, }; -Static struct usbd_pipe_methods ehci_root_ctrl_methods = { +static struct usbd_pipe_methods ehci_root_ctrl_methods = { ehci_root_ctrl_transfer, ehci_root_ctrl_start, ehci_root_ctrl_abort, @@ -276,7 +276,7 @@ ehci_root_ctrl_done, }; -Static struct usbd_pipe_methods ehci_root_intr_methods = { +static struct usbd_pipe_methods ehci_root_intr_methods = { ehci_root_intr_transfer, ehci_root_intr_start, ehci_root_intr_abort, @@ -285,7 +285,7 @@ ehci_root_intr_done, }; -Static struct usbd_pipe_methods ehci_device_ctrl_methods = { +static struct usbd_pipe_methods ehci_device_ctrl_methods = { ehci_device_ctrl_transfer, ehci_device_ctrl_start, ehci_device_ctrl_abort, @@ -294,7 +294,7 @@ ehci_device_ctrl_done, }; -Static struct usbd_pipe_methods ehci_device_intr_methods = { +static struct usbd_pipe_methods ehci_device_intr_methods = { ehci_device_intr_transfer, ehci_device_intr_start, ehci_device_intr_abort, @@ -303,7 +303,7 @@ ehci_device_intr_done, }; -Static struct usbd_pipe_methods ehci_device_bulk_methods = { +static struct usbd_pipe_methods ehci_device_bulk_methods = { ehci_device_bulk_transfer, ehci_device_bulk_start, ehci_device_bulk_abort, @@ -312,7 +312,7 @@ ehci_device_bulk_done, }; -Static struct usbd_pipe_methods ehci_device_isoc_methods = { +static struct usbd_pipe_methods ehci_device_isoc_methods = { ehci_device_isoc_transfer, ehci_device_isoc_start, ehci_device_isoc_abort, @@ -339,7 +339,7 @@ sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH); version = EREAD2(sc, EHCI_HCIVERSION); - printf("%s: EHCI version %x.%x\n", USBDEVNAME(sc->sc_bus.bdev), + printf("%s: EHCI version %x.%x\n", device_get_nameunit(sc->sc_bus.bdev), version >> 8, version & 0xff); sparams = EREAD4(sc, EHCI_HCSPARAMS); @@ -348,18 +348,18 @@ ncomp = EHCI_HCS_N_CC(sparams); if (ncomp != sc->sc_ncomp) { printf("%s: wrong number of companions (%d != %d)\n", - USBDEVNAME(sc->sc_bus.bdev), + device_get_nameunit(sc->sc_bus.bdev), ncomp, sc->sc_ncomp); if (ncomp < sc->sc_ncomp) sc->sc_ncomp = ncomp; } if (sc->sc_ncomp > 0) { printf("%s: companion controller%s, %d port%s each:", - USBDEVNAME(sc->sc_bus.bdev), sc->sc_ncomp!=1 ? "s" : "", + device_get_nameunit(sc->sc_bus.bdev), sc->sc_ncomp!=1 ? "s" : "", EHCI_HCS_N_PCC(sparams), EHCI_HCS_N_PCC(sparams)!=1 ? "s" : ""); for (i = 0; i < sc->sc_ncomp; i++) - printf(" %s", USBDEVNAME(sc->sc_comps[i]->bdev)); + printf(" %s", device_get_nameunit(sc->sc_comps[i]->bdev)); printf("\n"); } sc->sc_noport = EHCI_HCS_N_PORTS(sparams); @@ -374,7 +374,7 @@ sc->sc_bus.usbrev = USBREV_2_0; /* Reset the controller */ - DPRINTF(("%s: resetting\n", USBDEVNAME(sc->sc_bus.bdev))); + DPRINTF(("%s: resetting\n", device_get_nameunit(sc->sc_bus.bdev))); EOWRITE4(sc, EHCI_USBCMD, 0); /* Halt controller */ usb_delay_ms(&sc->sc_bus, 1); EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET); @@ -386,7 +386,7 @@ } if (hcr) { printf("%s: reset timeout\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); return (USBD_IOERROR); } @@ -401,7 +401,7 @@ EHCI_FLALIGN_ALIGN, &sc->sc_fldma); if (err) return (err); - DPRINTF(("%s: flsize=%d\n", USBDEVNAME(sc->sc_bus.bdev),sc->sc_flsize)); + DPRINTF(("%s: flsize=%d\n", device_get_nameunit(sc->sc_bus.bdev),sc->sc_flsize)); sc->sc_flist = KERNADDR(&sc->sc_fldma, 0); EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0)); @@ -512,7 +512,7 @@ break; } if (hcr) { - printf("%s: run timeout\n", USBDEVNAME(sc->sc_bus.bdev)); + printf("%s: run timeout\n", device_get_nameunit(sc->sc_bus.bdev)); return (USBD_IOERROR); } @@ -550,7 +550,7 @@ return (ehci_intr1(sc)); } -Static int +static int ehci_intr1(ehci_softc_t *sc) { u_int32_t intrs, eintrs; @@ -593,7 +593,7 @@ } if (eintrs & EHCI_STS_HSE) { printf("%s: unrecoverable error, controller halted\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); /* XXX what else */ } if (eintrs & EHCI_STS_PCD) { @@ -615,7 +615,7 @@ sc->sc_eintrs &= ~eintrs; EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); printf("%s: blocking intrs 0x%x\n", - USBDEVNAME(sc->sc_bus.bdev), eintrs); + device_get_nameunit(sc->sc_bus.bdev), eintrs); } return (1); @@ -675,7 +675,7 @@ ehci_softc_t *sc = v; struct ehci_xfer *ex, *nextex; - DPRINTFN(10,("%s: ehci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev), + DPRINTFN(10,("%s: ehci_softintr (%d)\n", device_get_nameunit(sc->sc_bus.bdev), sc->sc_bus.intr_context)); sc->sc_bus.intr_context++; @@ -967,7 +967,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) int -ehci_activate(device_ptr_t self, enum devact act) +ehci_activate(device_t self, enum devact act) { struct ehci_softc *sc = (struct ehci_softc *)self; int rv = 0; @@ -1037,7 +1037,7 @@ } if (hcr != 0) { printf("%s: reset timeout\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); } cmd &= ~EHCI_CMD_RS; @@ -1052,7 +1052,7 @@ } if (hcr != EHCI_STS_HCH) { printf("%s: config timeout\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); } sc->sc_bus.use_polling--; @@ -1102,7 +1102,7 @@ } if (hcr == EHCI_STS_HCH) { printf("%s: config timeout\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); } usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT); @@ -1163,9 +1163,9 @@ struct ehci_softc *sc = (struct ehci_softc *)bus; usbd_xfer_handle xfer; - xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers); + xfer = STAILQ_FIRST(&sc->sc_free_xfers); if (xfer != NULL) { - SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next); + STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next); #ifdef DIAGNOSTIC if (xfer->busy_free != XFER_FREE) { printf("ehci_allocx: xfer=%p not free, 0x%08x\n", xfer, @@ -1205,10 +1205,10 @@ return; } #endif - SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next); + STAILQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next); } -Static void +static void ehci_device_clear_toggle(usbd_pipe_handle pipe) { struct ehci_pipe *epipe = (struct ehci_pipe *)pipe; @@ -1225,7 +1225,7 @@ epipe->sqh->qh.qh_qtd.qtd_status &= htole32(~EHCI_QTD_TOGGLE_MASK); } -Static void +static void ehci_noop(usbd_pipe_handle pipe) { } @@ -1354,7 +1354,7 @@ } #ifdef DIAGNOSTIC -Static void +static void ehci_dump_exfer(struct ehci_xfer *ex) { printf("ehci_dump_exfer: ex=%p\n", ex); @@ -1415,7 +1415,7 @@ if (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_ISOCHRONOUS) { printf("%s: *** WARNING: opening low/full speed device, this " "does not work yet.\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); DPRINTFN(1,("ehci_open: hshubaddr=%d hshubport=%d\n", hshubaddr, hshubport)); return USBD_INVAL; @@ -1608,7 +1608,7 @@ /* * Data structures and routines to emulate the root hub. */ -Static usb_device_descriptor_t ehci_devd = { +static usb_device_descriptor_t ehci_devd = { USB_DEVICE_DESCRIPTOR_SIZE, UDESC_DEVICE, /* type */ {0x00, 0x02}, /* USB version */ @@ -1621,7 +1621,7 @@ 1 /* # of configurations */ }; -Static usb_device_qualifier_t ehci_odevd = { +static usb_device_qualifier_t ehci_odevd = { USB_DEVICE_DESCRIPTOR_SIZE, UDESC_DEVICE_QUALIFIER, /* type */ {0x00, 0x02}, /* USB version */ @@ -1633,7 +1633,7 @@ 0 }; -Static usb_config_descriptor_t ehci_confd = { +static usb_config_descriptor_t ehci_confd = { USB_CONFIG_DESCRIPTOR_SIZE, UDESC_CONFIG, {USB_CONFIG_DESCRIPTOR_SIZE + @@ -1646,7 +1646,7 @@ 0 /* max power */ }; -Static usb_interface_descriptor_t ehci_ifcd = { +static usb_interface_descriptor_t ehci_ifcd = { USB_INTERFACE_DESCRIPTOR_SIZE, UDESC_INTERFACE, 0, @@ -1658,7 +1658,7 @@ 0 }; -Static usb_endpoint_descriptor_t ehci_endpd = { +static usb_endpoint_descriptor_t ehci_endpd = { USB_ENDPOINT_DESCRIPTOR_SIZE, UDESC_ENDPOINT, UE_DIR_IN | EHCI_INTR_ENDPT, @@ -1667,7 +1667,7 @@ 255 }; -Static usb_hub_descriptor_t ehci_hubd = { +static usb_hub_descriptor_t ehci_hubd = { USB_HUB_DESCRIPTOR_SIZE, UDESC_HUB, 0, @@ -1677,7 +1677,7 @@ {0}, }; -Static int +static int ehci_str(usb_string_descriptor_t *p, int l, char *s) { int i; @@ -1697,7 +1697,7 @@ /* * Simulate a hardware hub by handling all the necessary requests. */ -Static usbd_status +static usbd_status ehci_root_ctrl_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -1708,10 +1708,10 @@ return (err); /* Pipe isn't running, start first */ - return (ehci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); + return (ehci_root_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ehci_root_ctrl_start(usbd_xfer_handle xfer) { ehci_softc_t *sc = (ehci_softc_t *)xfer->pipe->device->bus; @@ -2050,7 +2050,7 @@ DPRINTF(("ehci after reset, status=0x%08x\n", v)); if (v & EHCI_PS_PR) { printf("%s: port reset timeout\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); return (USBD_TIMEOUT); } if (!(v & EHCI_PS_PE)) { @@ -2112,15 +2112,15 @@ int i = (index-1) / sc->sc_npcomp; if (i >= sc->sc_ncomp) printf("%s: strange port\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); else printf("%s: handing over %s speed device on " "port %d to %s\n", - USBDEVNAME(sc->sc_bus.bdev), + device_get_nameunit(sc->sc_bus.bdev), lowspeed ? "low" : "full", - index, USBDEVNAME(sc->sc_comps[i]->bdev)); + index, device_get_nameunit(sc->sc_comps[i]->bdev)); } else { - printf("%s: npcomp == 0\n", USBDEVNAME(sc->sc_bus.bdev)); + printf("%s: npcomp == 0\n", device_get_nameunit(sc->sc_bus.bdev)); } #endif port = EHCI_PORTSC(index); @@ -2129,14 +2129,14 @@ } /* Abort a root control request. */ -Static void +static void ehci_root_ctrl_abort(usbd_xfer_handle xfer) { /* Nothing to do, all transfers are synchronous. */ } /* Close the root pipe. */ -Static void +static void ehci_root_ctrl_close(usbd_pipe_handle pipe) { DPRINTF(("ehci_root_ctrl_close\n")); @@ -2148,7 +2148,7 @@ { } -Static usbd_status +static usbd_status ehci_root_intr_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -2159,10 +2159,10 @@ return (err); /* Pipe isn't running, start first */ - return (ehci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); + return (ehci_root_intr_start(STAILQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ehci_root_intr_start(usbd_xfer_handle xfer) { usbd_pipe_handle pipe = xfer->pipe; @@ -2177,7 +2177,7 @@ } /* Abort a root interrupt request. */ -Static void +static void ehci_root_intr_abort(usbd_xfer_handle xfer) { int s; @@ -2193,7 +2193,7 @@ } /* Close the root pipe. */ -Static void +static void ehci_root_intr_close(usbd_pipe_handle pipe) { ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus; @@ -2485,7 +2485,7 @@ } /* Free the chain starting at sqtd and end at the qTD before sqtdend */ -Static void +static void ehci_free_sqtd_chain(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qtd_t *sqtd, ehci_soft_qtd_t *sqtdend) { @@ -2776,7 +2776,7 @@ /************************/ -Static usbd_status +static usbd_status ehci_device_ctrl_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -2787,10 +2787,10 @@ return (err); /* Pipe isn't running, start first */ - return (ehci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); + return (ehci_device_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ehci_device_ctrl_start(usbd_xfer_handle xfer) { ehci_softc_t *sc = (ehci_softc_t *)xfer->pipe->device->bus; @@ -2841,7 +2841,7 @@ } /* Abort a device control request. */ -Static void +static void ehci_device_ctrl_abort(usbd_xfer_handle xfer) { DPRINTF(("ehci_device_ctrl_abort: xfer=%p\n", xfer)); @@ -2849,7 +2849,7 @@ } /* Close a device control pipe. */ -Static void +static void ehci_device_ctrl_close(usbd_pipe_handle pipe) { ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus; @@ -3019,7 +3019,7 @@ /************************/ -Static usbd_status +static usbd_status ehci_device_bulk_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -3030,7 +3030,7 @@ return (err); /* Pipe isn't running, start first */ - return (ehci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); + return (ehci_device_bulk_start(STAILQ_FIRST(&xfer->pipe->queue))); } usbd_status @@ -3140,7 +3140,7 @@ #undef exfer } -Static void +static void ehci_device_bulk_abort(usbd_xfer_handle xfer) { DPRINTF(("ehci_device_bulk_abort: xfer=%p\n", xfer)); @@ -3150,7 +3150,7 @@ /* * Close a device bulk pipe. */ -Static void +static void ehci_device_bulk_close(usbd_pipe_handle pipe) { ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus; @@ -3180,7 +3180,7 @@ /************************/ -Static usbd_status +static usbd_status ehci_device_setintr(ehci_softc_t *sc, ehci_soft_qh_t *sqh, int ival) { struct ehci_soft_islot *isp; @@ -3202,7 +3202,7 @@ return (USBD_NORMAL_COMPLETION); } -Static usbd_status +static usbd_status ehci_device_intr_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -3216,10 +3216,10 @@ * Pipe isn't running (otherwise err would be USBD_INPROG), * so start it first. */ - return (ehci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); + return (ehci_device_intr_start(STAILQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ehci_device_intr_start(usbd_xfer_handle xfer) { #define exfer EXFER(xfer) @@ -3321,7 +3321,7 @@ #undef exfer } -Static void +static void ehci_device_intr_abort(usbd_xfer_handle xfer) { DPRINTFN(1, ("ehci_device_intr_abort: xfer=%p\n", xfer)); @@ -3332,7 +3332,7 @@ ehci_abort_xfer(xfer, USBD_CANCELLED); } -Static void +static void ehci_device_intr_close(usbd_pipe_handle pipe) { ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus; @@ -3343,7 +3343,7 @@ ehci_close_pipe(pipe, isp->sqh); } -Static void +static void ehci_device_intr_done(usbd_xfer_handle xfer) { #define exfer EXFER(xfer) @@ -3421,8 +3421,8 @@ /************************/ -Static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle xfer) { return USBD_IOERROR; } -Static usbd_status ehci_device_isoc_start(usbd_xfer_handle xfer) { return USBD_IOERROR; } -Static void ehci_device_isoc_abort(usbd_xfer_handle xfer) { } -Static void ehci_device_isoc_close(usbd_pipe_handle pipe) { } -Static void ehci_device_isoc_done(usbd_xfer_handle xfer) { } +static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle xfer) { return USBD_IOERROR; } +static usbd_status ehci_device_isoc_start(usbd_xfer_handle xfer) { return USBD_IOERROR; } +static void ehci_device_isoc_abort(usbd_xfer_handle xfer) { } +static void ehci_device_isoc_close(usbd_pipe_handle pipe) { } +static void ehci_device_isoc_done(usbd_xfer_handle xfer) { } ==== //depot/projects/newisp/dev/usb/ehci_pci.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.22 2006/05/28 05:27:08 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.23 2006/09/07 00:06:41 imp Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. @@ -414,7 +414,7 @@ continue; bsc = device_get_softc(nbus[0]); DPRINTF(("ehci_pci_attach: companion %s\n", - USBDEVNAME(bsc->bdev))); + device_get_nameunit(bsc->bdev))); sc->sc_comps[ncomp++] = bsc; if (ncomp >= EHCI_COMPANION_MAX) break; @@ -526,7 +526,7 @@ pci_write_config(self, eecp, legsup | EHCI_LEGSUP_OSOWNED, 4); if (legsup & EHCI_LEGSUP_BIOSOWNED) { printf("%s: waiting for BIOS to give up control\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); for (i = 0; i < 5000; i++) { legsup = pci_read_config(self, eecp, 4); if ((legsup & EHCI_LEGSUP_BIOSOWNED) == 0) @@ -535,7 +535,7 @@ } if (legsup & EHCI_LEGSUP_BIOSOWNED) printf("%s: timed out waiting for BIOS\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); } } } ==== //depot/projects/newisp/dev/usb/ehcivar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ehcivar.h,v 1.19 2005/04/29 15:04:29 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ehcivar.h,v 1.14 2006/05/24 03:04:11 iedowse Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ehcivar.h,v 1.16 2006/09/07 00:06:41 imp Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -150,7 +150,7 @@ u_int32_t sc_eintrs; ehci_soft_qh_t *sc_async_head; - SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */ + STAILQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */ struct lock sc_doorbell_lock; @@ -158,7 +158,7 @@ usb_callout_t sc_tmo_intrlist; #if defined(__NetBSD__) || defined(__OpenBSD__) - device_ptr_t sc_child; /* /dev/usb# device */ + device_t sc_child; /* /dev/usb# device */ #endif char sc_dying; #if defined(__NetBSD__) @@ -183,7 +183,7 @@ int ehci_intr(void *); int ehci_detach(ehci_softc_t *, int); #if defined(__NetBSD__) || defined(__OpenBSD__) -int ehci_activate(device_ptr_t, enum devact); +int ehci_activate(device_t, enum devact); #endif void ehci_power(int state, void *priv); void ehci_shutdown(void *v); ==== //depot/projects/newisp/dev/usb/hid.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.26 2006/03/22 02:04:12 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.27 2006/09/06 23:44:23 imp Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -61,7 +61,7 @@ #define DPRINTFN(n,x) #endif -Static void hid_clear_local(struct hid_item *); +static void hid_clear_local(struct hid_item *); #define MAXUSAGE 100 struct hid_data { @@ -77,7 +77,7 @@ int kindset; }; -Static void +static void hid_clear_local(struct hid_item *c) { ==== //depot/projects/newisp/dev/usb/if_aue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.97 2006/07/05 00:49:26 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.99 2006/09/07 00:06:41 imp Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -116,7 +116,7 @@ #define PII 0x0004 /* Pegasus II chip */ }; -Static const struct aue_type aue_devs[] = { +static const struct aue_type aue_devs[] = { {{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, PNA|PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, PII }, @@ -177,43 +177,43 @@ }; #define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) -Static int aue_match(device_ptr_t); -Static int aue_attach(device_ptr_t); -Static int aue_detach(device_ptr_t); +static int aue_match(device_t); +static int aue_attach(device_t); +static int aue_detach(device_t); -Static void aue_reset_pegasus_II(struct aue_softc *sc); -Static int aue_encap(struct aue_softc *, struct mbuf *, int); +static void aue_reset_pegasus_II(struct aue_softc *sc); +static int aue_encap(struct aue_softc *, struct mbuf *, int); #ifdef AUE_INTR_PIPE -Static void aue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); +static void aue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); #endif -Static void aue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void aue_tick(void *); -Static void aue_rxstart(struct ifnet *); -Static void aue_start(struct ifnet *); -Static int aue_ioctl(struct ifnet *, u_long, caddr_t); -Static void aue_init(void *); -Static void aue_stop(struct aue_softc *); -Static void aue_watchdog(struct ifnet *); -Static void aue_shutdown(device_ptr_t); -Static int aue_ifmedia_upd(struct ifnet *); -Static void aue_ifmedia_sts(struct ifnet *, struct ifmediareq *); +static void aue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); +static void aue_tick(void *); +static void aue_rxstart(struct ifnet *); +static void aue_start(struct ifnet *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 7 05:17:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 674C316A4E5; Thu, 7 Sep 2006 05:17:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4215616A4DF for ; Thu, 7 Sep 2006 05:17:51 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BE4943D49 for ; Thu, 7 Sep 2006 05:17:50 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k875Ho9H052281 for ; Thu, 7 Sep 2006 05:17:50 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k875Hoja052273 for perforce@freebsd.org; Thu, 7 Sep 2006 05:17:50 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Sep 2006 05:17:50 GMT Message-Id: <200609070517.k875Hoja052273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 05:17:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=105765 Change 105765 by mjacob@newisp on 2006/09/07 05:17:17 IFC Affected files ... .. //depot/projects/newisp/dev/mfi/mfi.c#2 integrate Differences ... ==== //depot/projects/newisp/dev/mfi/mfi.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.13 2006/06/30 18:59:08 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.14 2006/09/07 05:05:41 scottl Exp $"); #include "opt_mfi.h" @@ -779,17 +779,10 @@ mtx_lock(&sc->mfi_io_lock); while (ci != pi) { context = sc->mfi_comms->hw_reply_q[ci]; - sc->mfi_comms->hw_reply_q[ci] = 0xffffffff; - if (context == 0xffffffff) { - device_printf(sc->mfi_dev, "mfi_intr: invalid context " - "pi= %d ci= %d\n", pi, ci); - } else { - cm = &sc->mfi_commands[context]; - mfi_remove_busy(cm); - mfi_complete(sc, cm); - } - ci++; - if (ci == (sc->mfi_max_fw_cmds + 1)) { + cm = &sc->mfi_commands[context]; + mfi_remove_busy(cm); + mfi_complete(sc, cm); + if (++ci == (sc->mfi_max_fw_cmds + 1)) { ci = 0; } } From owner-p4-projects@FreeBSD.ORG Thu Sep 7 05:57:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D94A16A4E0; Thu, 7 Sep 2006 05:57:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 690F016A4DA for ; Thu, 7 Sep 2006 05:57:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11B4543D45 for ; Thu, 7 Sep 2006 05:57:41 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k875vfAg055055 for ; Thu, 7 Sep 2006 05:57:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k875veaP055052 for perforce@freebsd.org; Thu, 7 Sep 2006 05:57:40 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Sep 2006 05:57:40 GMT Message-Id: <200609070557.k875veaP055052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 05:57:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=105768 Change 105768 by mjacob@newisp on 2006/09/07 05:57:16 IFC Affected files ... .. //depot/projects/newisp/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/newisp/dev/sound/usb/uaudio.c#2 integrate Differences ... ==== //depot/projects/newisp/dev/if_ndis/if_ndis_usb.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.5 2005/04/24 20:21:22 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.6 2006/09/07 05:34:04 trhodes Exp $"); #include #include @@ -69,9 +69,9 @@ MODULE_DEPEND(ndis, usb, 1, 1, 1); -Static int ndisusb_match (device_ptr_t); -Static int ndisusb_attach (device_ptr_t); -Static struct resource_list *ndis_get_resource_list +static int ndisusb_match (device_t); +static int ndisusb_attach (device_t); +static struct resource_list *ndis_get_resource_list (device_t, device_t); extern int ndisdrv_modevent (module_t, int, void *); ==== //depot/projects/newisp/dev/sound/usb/uaudio.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.20 2006/02/05 17:47:26 netchild Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.21 2006/09/07 05:21:52 scottl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -221,7 +221,7 @@ }; struct uaudio_softc { - USBBASEDEVICE sc_dev; /* base device */ + device_t sc_dev; /* base device */ usbd_device_handle sc_udev; /* USB device */ int sc_ac_iface; /* Audio Control interface */ usbd_interface_handle sc_ac_ifaceh; @@ -243,7 +243,7 @@ int sc_mode; /* play/record capability */ struct mixerctl *sc_ctls; /* mixer controls */ int sc_nctls; /* # of mixer controls */ - device_ptr_t sc_audiodev; + device_t sc_audiodev; char sc_dying; #if defined(__FreeBSD__) struct sbuf uaudio_sndstat; @@ -287,140 +287,140 @@ #define AudioCrecord "record" #define AudioCequalization "equalization" #endif -Static const char *uac_names[] = { +static const char *uac_names[] = { AudioCoutputs, AudioCinputs, AudioCequalization, AudioCrecord, }; #endif -Static usbd_status uaudio_identify_ac +static usbd_status uaudio_identify_ac (struct uaudio_softc *, const usb_config_descriptor_t *); -Static usbd_status uaudio_identify_as +static usbd_status uaudio_identify_as (struct uaudio_softc *, const usb_config_descriptor_t *); -Static usbd_status uaudio_process_as +static usbd_status uaudio_process_as (struct uaudio_softc *, const char *, int *, int, const usb_interface_descriptor_t *); -Static void uaudio_add_alt(struct uaudio_softc *, const struct as_info *); +static void uaudio_add_alt(struct uaudio_softc *, const struct as_info *); -Static const usb_interface_descriptor_t *uaudio_find_iface +static const usb_interface_descriptor_t *uaudio_find_iface (const char *, int, int *, int); -Static void uaudio_mixer_add_ctl(struct uaudio_softc *, struct mixerctl *); +static void uaudio_mixer_add_ctl(struct uaudio_softc *, struct mixerctl *); #if defined(__NetBSD__) || defined(__OpenBSD__) -Static char *uaudio_id_name +static char *uaudio_id_name (struct uaudio_softc *, const struct io_terminal *, int); #endif #ifdef USB_DEBUG -Static void uaudio_dump_cluster(const struct usb_audio_cluster *); +static void uaudio_dump_cluster(const struct usb_audio_cluster *); #endif -Static struct usb_audio_cluster uaudio_get_cluster +static struct usb_audio_cluster uaudio_get_cluster (int, const struct io_terminal *); -Static void uaudio_add_input +static void uaudio_add_input (struct uaudio_softc *, const struct io_terminal *, int); -Static void uaudio_add_output +static void uaudio_add_output (struct uaudio_softc *, const struct io_terminal *, int); -Static void uaudio_add_mixer +static void uaudio_add_mixer (struct uaudio_softc *, const struct io_terminal *, int); -Static void uaudio_add_selector +static void uaudio_add_selector (struct uaudio_softc *, const struct io_terminal *, int); #ifdef USB_DEBUG -Static const char *uaudio_get_terminal_name(int); +static const char *uaudio_get_terminal_name(int); #endif -Static int uaudio_determine_class +static int uaudio_determine_class (const struct io_terminal *, struct mixerctl *); #if defined(__FreeBSD__) -Static const int uaudio_feature_name(const struct io_terminal *, +static const int uaudio_feature_name(const struct io_terminal *, struct mixerctl *); #else -Static const char *uaudio_feature_name +static const char *uaudio_feature_name (const struct io_terminal *, struct mixerctl *); #endif -Static void uaudio_add_feature +static void uaudio_add_feature (struct uaudio_softc *, const struct io_terminal *, int); -Static void uaudio_add_processing_updown +static void uaudio_add_processing_updown (struct uaudio_softc *, const struct io_terminal *, int); -Static void uaudio_add_processing +static void uaudio_add_processing (struct uaudio_softc *, const struct io_terminal *, int); -Static void uaudio_add_extension +static void uaudio_add_extension (struct uaudio_softc *, const struct io_terminal *, int); -Static struct terminal_list *uaudio_merge_terminal_list +static struct terminal_list *uaudio_merge_terminal_list (const struct io_terminal *); -Static struct terminal_list *uaudio_io_terminaltype +static struct terminal_list *uaudio_io_terminaltype (int, struct io_terminal *, int); -Static usbd_status uaudio_identify +static usbd_status uaudio_identify (struct uaudio_softc *, const usb_config_descriptor_t *); -Static int uaudio_signext(int, int); +static int uaudio_signext(int, int); #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int uaudio_value2bsd(struct mixerctl *, int); +static int uaudio_value2bsd(struct mixerctl *, int); #endif -Static int uaudio_bsd2value(struct mixerctl *, int); -Static int uaudio_get(struct uaudio_softc *, int, int, int, int, int); +static int uaudio_bsd2value(struct mixerctl *, int); +static int uaudio_get(struct uaudio_softc *, int, int, int, int, int); #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int uaudio_ctl_get +static int uaudio_ctl_get (struct uaudio_softc *, int, struct mixerctl *, int); #endif -Static void uaudio_set +static void uaudio_set (struct uaudio_softc *, int, int, int, int, int, int); -Static void uaudio_ctl_set +static void uaudio_ctl_set (struct uaudio_softc *, int, struct mixerctl *, int, int); -Static usbd_status uaudio_set_speed(struct uaudio_softc *, int, u_int); +static usbd_status uaudio_set_speed(struct uaudio_softc *, int, u_int); -Static usbd_status uaudio_chan_open(struct uaudio_softc *, struct chan *); -Static void uaudio_chan_close(struct uaudio_softc *, struct chan *); -Static usbd_status uaudio_chan_alloc_buffers +static usbd_status uaudio_chan_open(struct uaudio_softc *, struct chan *); +static void uaudio_chan_close(struct uaudio_softc *, struct chan *); +static usbd_status uaudio_chan_alloc_buffers (struct uaudio_softc *, struct chan *); -Static void uaudio_chan_free_buffers(struct uaudio_softc *, struct chan *); +static void uaudio_chan_free_buffers(struct uaudio_softc *, struct chan *); #if defined(__NetBSD__) || defined(__OpenBSD__) -Static void uaudio_chan_init +static void uaudio_chan_init (struct chan *, int, const struct audio_params *, int); -Static void uaudio_chan_set_param(struct chan *, u_char *, u_char *, int); +static void uaudio_chan_set_param(struct chan *, u_char *, u_char *, int); #endif -Static void uaudio_chan_ptransfer(struct chan *); -Static void uaudio_chan_pintr +static void uaudio_chan_ptransfer(struct chan *); +static void uaudio_chan_pintr (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void uaudio_chan_rtransfer(struct chan *); -Static void uaudio_chan_rintr +static void uaudio_chan_rtransfer(struct chan *); +static void uaudio_chan_rintr (usbd_xfer_handle, usbd_private_handle, usbd_status); #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int uaudio_open(void *, int); -Static void uaudio_close(void *); -Static int uaudio_drain(void *); -Static int uaudio_query_encoding(void *, struct audio_encoding *); -Static void uaudio_get_minmax_rates +static int uaudio_open(void *, int); +static void uaudio_close(void *); +static int uaudio_drain(void *); +static int uaudio_query_encoding(void *, struct audio_encoding *); +static void uaudio_get_minmax_rates (int, const struct as_info *, const struct audio_params *, int, u_long *, u_long *); -Static int uaudio_match_alt_sub +static int uaudio_match_alt_sub (int, const struct as_info *, const struct audio_params *, int, u_long); -Static int uaudio_match_alt_chan +static int uaudio_match_alt_chan (int, const struct as_info *, struct audio_params *, int); -Static int uaudio_match_alt +static int uaudio_match_alt (int, const struct as_info *, struct audio_params *, int); -Static int uaudio_set_params +static int uaudio_set_params (void *, int, int, struct audio_params *, struct audio_params *); -Static int uaudio_round_blocksize(void *, int); -Static int uaudio_trigger_output +static int uaudio_round_blocksize(void *, int); +static int uaudio_trigger_output (void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); -Static int uaudio_trigger_input +static int uaudio_trigger_input (void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); -Static int uaudio_halt_in_dma(void *); -Static int uaudio_halt_out_dma(void *); -Static int uaudio_getdev(void *, struct audio_device *); -Static int uaudio_mixer_set_port(void *, mixer_ctrl_t *); -Static int uaudio_mixer_get_port(void *, mixer_ctrl_t *); -Static int uaudio_query_devinfo(void *, mixer_devinfo_t *); -Static int uaudio_get_props(void *); +static int uaudio_halt_in_dma(void *); +static int uaudio_halt_out_dma(void *); +static int uaudio_getdev(void *, struct audio_device *); +static int uaudio_mixer_set_port(void *, mixer_ctrl_t *); +static int uaudio_mixer_get_port(void *, mixer_ctrl_t *); +static int uaudio_query_devinfo(void *, mixer_devinfo_t *); +static int uaudio_get_props(void *); -Static const struct audio_hw_if uaudio_hw_if = { +static const struct audio_hw_if uaudio_hw_if = { uaudio_open, uaudio_close, uaudio_drain, @@ -450,15 +450,15 @@ NULL, }; -Static struct audio_device uaudio_device = { +static struct audio_device uaudio_device = { "USB audio", "", "uaudio" }; #elif defined(__FreeBSD__) -Static int audio_attach_mi(device_t); -Static int uaudio_init_params(struct uaudio_softc * sc, struct chan *ch, int mode); +static int audio_attach_mi(device_t); +static int uaudio_init_params(struct uaudio_softc * sc, struct chan *ch, int mode); static int uaudio_sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose); /* for NetBSD compatibirity */ @@ -533,14 +533,14 @@ cdesc = usbd_get_config_descriptor(sc->sc_udev); if (cdesc == NULL) { printf("%s: failed to get configuration descriptor\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); USB_ATTACH_ERROR_RETURN; } err = uaudio_identify(sc, cdesc); if (err) { printf("%s: audio descriptors make no sense, error=%d\n", - USBDEVNAME(sc->sc_dev), err); + device_get_nameunit(sc->sc_dev), err); USB_ATTACH_ERROR_RETURN; } @@ -567,12 +567,12 @@ for (j = 0; j < sc->sc_nalts; j++) { if (sc->sc_alts[j].ifaceh == NULL) { printf("%s: alt %d missing AS interface(s)\n", - USBDEVNAME(sc->sc_dev), j); + device_get_nameunit(sc->sc_dev), j); USB_ATTACH_ERROR_RETURN; } } - printf("%s: audio rev %d.%02x\n", USBDEVNAME(sc->sc_dev), + printf("%s: audio rev %d.%02x\n", device_get_nameunit(sc->sc_dev), sc->sc_audio_rev >> 8, sc->sc_audio_rev & 0xff); sc->sc_playchan.sc = sc->sc_recchan.sc = sc; @@ -585,7 +585,7 @@ #ifndef USB_DEBUG if (bootverbose) #endif - printf("%s: %d mixer controls\n", USBDEVNAME(sc->sc_dev), + printf("%s: %d mixer controls\n", device_get_nameunit(sc->sc_dev), sc->sc_nctls); #if !defined(__FreeBSD__) @@ -611,7 +611,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) int -uaudio_activate(device_ptr_t self, enum devact act) +uaudio_activate(device_t self, enum devact act) { struct uaudio_softc *sc; int rv; @@ -634,7 +634,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) int -uaudio_detach(device_ptr_t self, int flags) +uaudio_detach(device_t self, int flags) { struct uaudio_softc *sc; int rv; @@ -674,7 +674,7 @@ #endif #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int +static int uaudio_query_encoding(void *addr, struct audio_encoding *fp) { struct uaudio_softc *sc; @@ -745,7 +745,7 @@ } #endif -Static const usb_interface_descriptor_t * +static const usb_interface_descriptor_t * uaudio_find_iface(const char *buf, int size, int *offsp, int subtype) { const usb_interface_descriptor_t *d; @@ -761,7 +761,7 @@ return NULL; } -Static void +static void uaudio_mixer_add_ctl(struct uaudio_softc *sc, struct mixerctl *mc) { int res; @@ -846,7 +846,7 @@ } #if defined(__NetBSD__) || defined(__OpenBSD__) -Static char * +static char * uaudio_id_name(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { static char buf[32]; @@ -857,7 +857,7 @@ #endif #ifdef USB_DEBUG -Static void +static void uaudio_dump_cluster(const struct usb_audio_cluster *cl) { static const char *channel_names[16] = { @@ -883,7 +883,7 @@ } #endif -Static struct usb_audio_cluster +static struct usb_audio_cluster uaudio_get_cluster(int id, const struct io_terminal *iot) { struct usb_audio_cluster r; @@ -933,7 +933,7 @@ } -Static void +static void uaudio_add_input(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { #ifdef USB_DEBUG @@ -948,7 +948,7 @@ #endif } -Static void +static void uaudio_add_output(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { #ifdef USB_DEBUG @@ -962,7 +962,7 @@ #endif } -Static void +static void uaudio_add_mixer(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { const struct usb_audio_mixer_unit *d = iot[id].d.mu; @@ -1031,7 +1031,7 @@ } -Static void +static void uaudio_add_selector(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { const struct usb_audio_selector_unit *d; @@ -1079,7 +1079,7 @@ } #ifdef USB_DEBUG -Static const char * +static const char * uaudio_get_terminal_name(int terminal_type) { static char buf[100]; @@ -1155,7 +1155,7 @@ } #endif -Static int +static int uaudio_determine_class(const struct io_terminal *iot, struct mixerctl *mix) { int terminal_type; @@ -1307,7 +1307,7 @@ return SOUND_MIXER_VOLUME; } #else -Static const char * +static const char * uaudio_feature_name(const struct io_terminal *iot, struct mixerctl *mix) { int terminal_type; @@ -1410,7 +1410,7 @@ } #endif -Static void +static void uaudio_add_feature(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { const struct usb_audio_feature_unit *d; @@ -1573,7 +1573,7 @@ } } -Static void +static void uaudio_add_processing_updown(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { @@ -1614,7 +1614,7 @@ uaudio_mixer_add_ctl(sc, &mix); } -Static void +static void uaudio_add_processing(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { const struct usb_audio_processing_unit *d; @@ -1661,7 +1661,7 @@ } } -Static void +static void uaudio_add_extension(struct uaudio_softc *sc, const struct io_terminal *iot, int id) { const struct usb_audio_extension_unit *d; @@ -1692,7 +1692,7 @@ } } -Static struct terminal_list* +static struct terminal_list* uaudio_merge_terminal_list(const struct io_terminal *iot) { struct terminal_list *tml; @@ -1727,7 +1727,7 @@ return tml; } -Static struct terminal_list * +static struct terminal_list * uaudio_io_terminaltype(int outtype, struct io_terminal *iot, int id) { struct terminal_list *tml; @@ -1878,7 +1878,7 @@ } } -Static usbd_status +static usbd_status uaudio_identify(struct uaudio_softc *sc, const usb_config_descriptor_t *cdesc) { usbd_status err; @@ -1889,7 +1889,7 @@ return uaudio_identify_as(sc, cdesc); } -Static void +static void uaudio_add_alt(struct uaudio_softc *sc, const struct as_info *ai) { size_t len; @@ -1912,7 +1912,7 @@ sc->sc_alts[sc->sc_nalts++] = *ai; } -Static usbd_status +static usbd_status uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp, int size, const usb_interface_descriptor_t *id) #define offs (*offsp) @@ -1948,7 +1948,7 @@ if (asf1d->bFormatType != FORMAT_TYPE_I) { printf("%s: ignored setting with type %d format\n", - USBDEVNAME(sc->sc_dev), UGETW(asid->wFormatTag)); + device_get_nameunit(sc->sc_dev), UGETW(asid->wFormatTag)); return USBD_NORMAL_COMPLETION; } @@ -1979,7 +1979,7 @@ sync = TRUE; #ifndef UAUDIO_MULTIPLE_ENDPOINTS printf("%s: ignored input endpoint of type adaptive\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); return USBD_NORMAL_COMPLETION; #endif } @@ -1987,7 +1987,7 @@ sync = TRUE; #ifndef UAUDIO_MULTIPLE_ENDPOINTS printf("%s: ignored output endpoint of type async\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); return USBD_NORMAL_COMPLETION; #endif } @@ -2003,12 +2003,12 @@ if (sync && id->bNumEndpoints <= 1) { printf("%s: a sync-pipe endpoint but no other endpoint\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); return USBD_INVAL; } if (!sync && id->bNumEndpoints > 1) { printf("%s: non sync-pipe endpoint but multiple endpoints\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); return USBD_INVAL; } epdesc1 = NULL; @@ -2029,19 +2029,19 @@ return USBD_INVAL; if (epdesc1->bSynchAddress != 0) { printf("%s: invalid endpoint: bSynchAddress=0\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); return USBD_INVAL; } if (UE_GET_XFERTYPE(epdesc1->bmAttributes) != UE_ISOCHRONOUS) { printf("%s: invalid endpoint: bmAttributes=0x%x\n", - USBDEVNAME(sc->sc_dev), epdesc1->bmAttributes); + device_get_nameunit(sc->sc_dev), epdesc1->bmAttributes); return USBD_INVAL; } if (epdesc1->bEndpointAddress != ed->bSynchAddress) { printf("%s: invalid endpoint addresses: " "ep[0]->bSynchAddress=0x%x " "ep[1]->bEndpointAddress=0x%x\n", - USBDEVNAME(sc->sc_dev), ed->bSynchAddress, + device_get_nameunit(sc->sc_dev), ed->bSynchAddress, epdesc1->bEndpointAddress); return USBD_INVAL; } @@ -2053,7 +2053,7 @@ prec = asf1d->bBitResolution; if (prec != 8 && prec != 16 && prec != 24 && prec != 32) { printf("%s: ignored setting with precision %d\n", - USBDEVNAME(sc->sc_dev), prec); + device_get_nameunit(sc->sc_dev), prec); return USBD_NORMAL_COMPLETION; } switch (format) { @@ -2088,11 +2088,11 @@ case UA_FMT_IEEE_FLOAT: default: printf("%s: ignored setting with format %d\n", - USBDEVNAME(sc->sc_dev), format); + device_get_nameunit(sc->sc_dev), format); return USBD_NORMAL_COMPLETION; } #ifdef USB_DEBUG - printf("%s: %s: %dch, %d/%dbit, %s,", USBDEVNAME(sc->sc_dev), + printf("%s: %s: %dch, %d/%dbit, %s,", device_get_nameunit(sc->sc_dev), dir == UE_DIR_IN ? "recording" : "playback", chan, prec, asf1d->bSubFrameSize * 8, format_str); if (asf1d->bSamFreqType == UA_SAMP_CONTNUOUS) { @@ -2148,7 +2148,7 @@ } #undef offs -Static usbd_status +static usbd_status uaudio_identify_as(struct uaudio_softc *sc, const usb_config_descriptor_t *cdesc) { @@ -2189,7 +2189,7 @@ default: printf("%s: ignored audio interface with %d " "endpoints\n", - USBDEVNAME(sc->sc_dev), id->bNumEndpoints); + device_get_nameunit(sc->sc_dev), id->bNumEndpoints); break; } id = uaudio_find_iface(buf, size, &offs,UISUBCLASS_AUDIOSTREAM); @@ -2205,14 +2205,14 @@ if (sc->sc_mode == 0) { printf("%s: no usable endpoint found\n", - USBDEVNAME(sc->sc_dev)); + device_get_nameunit(sc->sc_dev)); return USBD_INVAL; } return USBD_NORMAL_COMPLETION; } -Static usbd_status +static usbd_status uaudio_identify_ac(struct uaudio_softc *sc, const usb_config_descriptor_t *cdesc) { struct io_terminal* iot; @@ -2441,7 +2441,7 @@ } #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int +static int uaudio_query_devinfo(void *addr, mixer_devinfo_t *mi) { struct uaudio_softc *sc; @@ -2525,7 +2525,7 @@ return 0; } -Static int +static int uaudio_open(void *addr, int flags) { struct uaudio_softc *sc; @@ -2546,12 +2546,12 @@ /* * Close function is called at splaudio(). */ -Static void +static void uaudio_close(void *addr) { } -Static int +static int uaudio_drain(void *addr) { struct uaudio_softc *sc; @@ -2562,7 +2562,7 @@ return 0; } -Static int +static int uaudio_halt_out_dma(void *addr) { struct uaudio_softc *sc; @@ -2581,7 +2581,7 @@ return 0; } -Static int +static int uaudio_halt_in_dma(void *addr) { struct uaudio_softc *sc; @@ -2597,7 +2597,7 @@ return 0; } -Static int +static int uaudio_getdev(void *addr, struct audio_device *retp) { struct uaudio_softc *sc; @@ -2614,7 +2614,7 @@ /* * Make sure the block size is large enough to hold all outstanding transfers. */ -Static int +static int uaudio_round_blocksize(void *addr, int blk) { struct uaudio_softc *sc; @@ -2659,7 +2659,7 @@ return blk; } -Static int +static int uaudio_get_props(void *addr) { return AUDIO_PROP_FULLDUPLEX | AUDIO_PROP_INDEPENDENT; @@ -2667,7 +2667,7 @@ } #endif /* NetBSD or OpenBSD */ -Static int +static int uaudio_get(struct uaudio_softc *sc, int which, int type, int wValue, int wIndex, int len) { @@ -2712,7 +2712,7 @@ return val; } -Static void +static void uaudio_set(struct uaudio_softc *sc, int which, int type, int wValue, int wIndex, int len, int val) { @@ -2754,7 +2754,7 @@ #endif } -Static int +static int uaudio_signext(int type, int val) { if (!MIX_UNSIGNED(type)) { @@ -2767,7 +2767,7 @@ } #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int +static int uaudio_value2bsd(struct mixerctl *mc, int val) { DPRINTFN(5, ("uaudio_value2bsd: type=%03x val=%d min=%d max=%d ", @@ -2802,7 +2802,7 @@ } #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int +static int uaudio_ctl_get(struct uaudio_softc *sc, int which, struct mixerctl *mc, int chan) { @@ -2815,7 +2815,7 @@ } #endif -Static void +static void uaudio_ctl_set(struct uaudio_softc *sc, int which, struct mixerctl *mc, int chan, int val) { @@ -2825,7 +2825,7 @@ } #if defined(__NetBSD__) || defined(__OpenBSD__) -Static int +static int uaudio_mixer_get_port(void *addr, mixer_ctrl_t *cp) { struct uaudio_softc *sc; @@ -2870,7 +2870,7 @@ return 0; } -Static int +static int uaudio_mixer_set_port(void *addr, mixer_ctrl_t *cp) { struct uaudio_softc *sc; @@ -2912,7 +2912,7 @@ return 0; } -Static int +static int uaudio_trigger_input(void *addr, void *start, void *end, int blksize, void (*intr)(void *), void *arg, struct audio_params *param) @@ -2955,7 +2955,7 @@ return 0; } -Static int +static int uaudio_trigger_output(void *addr, void *start, void *end, int blksize, void (*intr)(void *), void *arg, struct audio_params *param) @@ -3000,7 +3000,7 @@ #endif /* NetBSD or OpenBSD */ /* Set up a pipe for a channel. */ -Static usbd_status +static usbd_status uaudio_chan_open(struct uaudio_softc *sc, struct chan *ch) { struct as_info *as; @@ -3048,7 +3048,7 @@ return err; } -Static void +static void uaudio_chan_close(struct uaudio_softc *sc, struct chan *ch) { struct as_info *as; @@ -3075,7 +3075,7 @@ } } -Static usbd_status +static usbd_status uaudio_chan_alloc_buffers(struct uaudio_softc *sc, struct chan *ch) { usbd_xfer_handle xfer; @@ -3106,7 +3106,7 @@ return USBD_NOMEM; } -Static void +static void uaudio_chan_free_buffers(struct uaudio_softc *sc, struct chan *ch) { int i; @@ -3116,7 +3116,7 @@ } /* Called at splusb() */ -Static void +static void uaudio_chan_ptransfer(struct chan *ch) { struct chanbuf *cb; @@ -3181,7 +3181,7 @@ (void)usbd_transfer(cb->xfer); } -Static void +static void uaudio_chan_pintr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) { @@ -3229,7 +3229,7 @@ } /* Called at splusb() */ -Static void +static void uaudio_chan_rtransfer(struct chan *ch) { struct chanbuf *cb; @@ -3274,7 +3274,7 @@ (void)usbd_transfer(cb->xfer); } -Static void +static void uaudio_chan_rintr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) { @@ -3339,7 +3339,7 @@ } #if defined(__NetBSD__) || defined(__OpenBSD__) -Static void +static void uaudio_chan_init(struct chan *ch, int altidx, const struct audio_params *param, int maxpktsize) { @@ -3360,7 +3360,7 @@ ch->residue = 0; } -Static void +static void uaudio_chan_set_param(struct chan *ch, u_char *start, u_char *end, int blksize) { ch->start = start; @@ -3371,7 +3371,7 @@ ch->curchanbuf = 0; } -Static void +static void uaudio_get_minmax_rates(int nalts, const struct as_info *alts, const struct audio_params *p, int mode, u_long *min, u_long *max) @@ -3413,7 +3413,7 @@ } } -Static int +static int uaudio_match_alt_sub(int nalts, const struct as_info *alts, const struct audio_params *p, int mode, u_long rate) { @@ -3452,7 +3452,7 @@ return -1; } -Static int +static int uaudio_match_alt_chan(int nalts, const struct as_info *alts, struct audio_params *p, int mode) { @@ -3496,7 +3496,7 @@ return -1; } -Static int +static int uaudio_match_alt(int nalts, const struct as_info *alts, struct audio_params *p, int mode) { @@ -3520,7 +3520,7 @@ return uaudio_match_alt_chan(nalts, alts, p, mode); } -Static int +static int uaudio_set_params(void *addr, int setmode, int usemode, struct audio_params *play, struct audio_params *rec) { @@ -3714,7 +3714,7 @@ } #endif /* NetBSD or OpenBSD */ -Static usbd_status +static usbd_status uaudio_set_speed(struct uaudio_softc *sc, int endpt, u_int speed) { usb_device_request_t req; @@ -4520,7 +4520,7 @@ sndstat_register(dev, d->status, uaudio_sndstat_prepare_pcm); } -Static int +static int audio_attach_mi(device_t dev) { device_t child; From owner-p4-projects@FreeBSD.ORG Thu Sep 7 06:24:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C408116A4E9; Thu, 7 Sep 2006 06:24:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC4F216A5A9 for ; Thu, 7 Sep 2006 06:24:16 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE22643D46 for ; Thu, 7 Sep 2006 06:24:15 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k876OFNr058143 for ; Thu, 7 Sep 2006 06:24:15 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k876OFfi058140 for perforce@freebsd.org; Thu, 7 Sep 2006 06:24:15 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Sep 2006 06:24:15 GMT Message-Id: <200609070624.k876OFfi058140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 06:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=105772 Change 105772 by mjacob@newisp on 2006/09/07 06:23:22 More usb fallout. Affected files ... .. //depot/projects/newisp/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/newisp/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/newisp/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/newisp/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate Differences ... ==== //depot/projects/newisp/dev/if_ndis/if_ndis_usb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.6 2006/09/07 05:34:04 trhodes Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.7 2006/09/07 06:00:03 mjacob Exp $"); #include #include @@ -83,7 +83,7 @@ extern unsigned char drv_data[]; -Static device_method_t ndis_methods[] = { +static device_method_t ndis_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ndisusb_match), DEVMETHOD(device_attach, ndisusb_attach), @@ -98,13 +98,13 @@ { 0, 0 } }; -Static driver_t ndis_driver = { +static driver_t ndis_driver = { "ndis", ndis_methods, sizeof(struct ndis_softc) }; -Static devclass_t ndis_devclass; +static devclass_t ndis_devclass; DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); ==== //depot/projects/newisp/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.26 2005/12/04 10:06:05 ru Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.27 2006/09/07 06:14:05 mjacob Exp $ */ #include @@ -67,66 +67,66 @@ USB_DECLARE_DRIVER(ubt); -Static int ubt_modevent (module_t, int, void *); +static int ubt_modevent (module_t, int, void *); -Static usbd_status ubt_request_start (ubt_softc_p); -Static void ubt_request_complete (usbd_xfer_handle, +static usbd_status ubt_request_start (ubt_softc_p); +static void ubt_request_complete (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void ubt_request_complete2 (node_p, hook_p, void *, int); +static void ubt_request_complete2 (node_p, hook_p, void *, int); -Static usbd_status ubt_intr_start (ubt_softc_p); -Static void ubt_intr_complete (usbd_xfer_handle, +static usbd_status ubt_intr_start (ubt_softc_p); +static void ubt_intr_complete (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void ubt_intr_complete2 (node_p, hook_p, void *, int); +static void ubt_intr_complete2 (node_p, hook_p, void *, int); -Static usbd_status ubt_bulk_in_start (ubt_softc_p); -Static void ubt_bulk_in_complete (usbd_xfer_handle, +static usbd_status ubt_bulk_in_start (ubt_softc_p); +static void ubt_bulk_in_complete (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void ubt_bulk_in_complete2 (node_p, hook_p, void *, int); +static void ubt_bulk_in_complete2 (node_p, hook_p, void *, int); -Static usbd_status ubt_bulk_out_start (ubt_softc_p); -Static void ubt_bulk_out_complete (usbd_xfer_handle, +static usbd_status ubt_bulk_out_start (ubt_softc_p); +static void ubt_bulk_out_complete (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void ubt_bulk_out_complete2 (node_p, hook_p, void *, int); +static void ubt_bulk_out_complete2 (node_p, hook_p, void *, int); -Static usbd_status ubt_isoc_in_start (ubt_softc_p); -Static void ubt_isoc_in_complete (usbd_xfer_handle, +static usbd_status ubt_isoc_in_start (ubt_softc_p); +static void ubt_isoc_in_complete (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void ubt_isoc_in_complete2 (node_p, hook_p, void *, int); +static void ubt_isoc_in_complete2 (node_p, hook_p, void *, int); -Static usbd_status ubt_isoc_out_start (ubt_softc_p); -Static void ubt_isoc_out_complete (usbd_xfer_handle, +static usbd_status ubt_isoc_out_start (ubt_softc_p); +static void ubt_isoc_out_complete (usbd_xfer_handle, usbd_private_handle, usbd_status); -Static void ubt_isoc_out_complete2 (node_p, hook_p, void *, int); +static void ubt_isoc_out_complete2 (node_p, hook_p, void *, int); -Static void ubt_reset (ubt_softc_p); +static void ubt_reset (ubt_softc_p); /* * Netgraph methods */ -Static ng_constructor_t ng_ubt_constructor; -Static ng_shutdown_t ng_ubt_shutdown; -Static ng_newhook_t ng_ubt_newhook; -Static ng_connect_t ng_ubt_connect; -Static ng_disconnect_t ng_ubt_disconnect; -Static ng_rcvmsg_t ng_ubt_rcvmsg; -Static ng_rcvdata_t ng_ubt_rcvdata; +static ng_constructor_t ng_ubt_constructor; +static ng_shutdown_t ng_ubt_shutdown; +static ng_newhook_t ng_ubt_newhook; +static ng_connect_t ng_ubt_connect; +static ng_disconnect_t ng_ubt_disconnect; +static ng_rcvmsg_t ng_ubt_rcvmsg; +static ng_rcvdata_t ng_ubt_rcvdata; /* Queue length */ -Static const struct ng_parse_struct_field ng_ubt_node_qlen_type_fields[] = +static const struct ng_parse_struct_field ng_ubt_node_qlen_type_fields[] = { { "queue", &ng_parse_int32_type, }, { "qlen", &ng_parse_int32_type, }, { NULL, } }; -Static const struct ng_parse_type ng_ubt_node_qlen_type = { +static const struct ng_parse_type ng_ubt_node_qlen_type = { &ng_parse_struct_type, &ng_ubt_node_qlen_type_fields }; /* Stat info */ -Static const struct ng_parse_struct_field ng_ubt_node_stat_type_fields[] = +static const struct ng_parse_struct_field ng_ubt_node_stat_type_fields[] = { { "pckts_recv", &ng_parse_uint32_type, }, { "bytes_recv", &ng_parse_uint32_type, }, @@ -136,13 +136,13 @@ { "ierrors", &ng_parse_uint32_type, }, { NULL, } }; -Static const struct ng_parse_type ng_ubt_node_stat_type = { +static const struct ng_parse_type ng_ubt_node_stat_type = { &ng_parse_struct_type, &ng_ubt_node_stat_type_fields }; /* Netgraph node command list */ -Static const struct ng_cmdlist ng_ubt_cmdlist[] = { +static const struct ng_cmdlist ng_ubt_cmdlist[] = { { NGM_UBT_COOKIE, NGM_UBT_NODE_SET_DEBUG, @@ -189,7 +189,7 @@ }; /* Netgraph node type */ -Static struct ng_type typestruct = { +static struct ng_type typestruct = { .version = NG_ABI_VERSION, .name = NG_UBT_NODE_TYPE, .constructor = ng_ubt_constructor, @@ -220,7 +220,7 @@ * Load/Unload the driver module */ -Static int +static int ubt_modevent(module_t mod, int event, void *data) { int error; @@ -266,7 +266,7 @@ * where VENDOR_ID and PRODUCT_ID are hex numbers. */ - Static struct usb_devno const ubt_ignored_devices[] = { + static struct usb_devno const ubt_ignored_devices[] = { { USB_VENDOR_AVM, 0x2200 }, /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ { 0, 0 } /* This should be the last item in the list */ }; @@ -279,7 +279,7 @@ * to attach to the broken device. */ - Static struct usb_devno const ubt_broken_devices[] = { + static struct usb_devno const ubt_broken_devices[] = { { USB_VENDOR_AVM, 0x3800 }, /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ { 0, 0 } /* This should be the last item in the list */ }; @@ -853,7 +853,7 @@ * Start USB control request (HCI command). Must be called with node locked */ -Static usbd_status +static usbd_status ubt_request_start(ubt_softc_p sc) { usb_device_request_t req; @@ -939,14 +939,14 @@ * USB control request callback */ -Static void +static void ubt_request_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) { ng_send_fn((node_p) p, NULL, ubt_request_complete2, (void *) h, s); NG_NODE_UNREF((node_p) p); } /* ubt_request_complete */ -Static void +static void ubt_request_complete2(node_p node, hook_p hook, void *arg1, int arg2) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -994,7 +994,7 @@ * Start interrupt transfer. Must be called when node is locked */ -Static usbd_status +static usbd_status ubt_intr_start(ubt_softc_p sc) { struct mbuf *m = NULL; @@ -1058,14 +1058,14 @@ * Process interrupt from USB device (We got data from interrupt pipe) */ -Static void +static void ubt_intr_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) { ng_send_fn((node_p) p, NULL, ubt_intr_complete2, (void *) h, s); NG_NODE_UNREF((node_p) p); } /* ubt_intr_complete */ -Static void +static void ubt_intr_complete2(node_p node, hook_p hook, void *arg1, int arg2) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1160,7 +1160,7 @@ * Start bulk-in USB transfer (ACL data). Must be called when node is locked */ -Static usbd_status +static usbd_status ubt_bulk_in_start(ubt_softc_p sc) { struct mbuf *m = NULL; @@ -1224,14 +1224,14 @@ * USB bulk-in transfer callback */ -Static void +static void ubt_bulk_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) { ng_send_fn((node_p) p, NULL, ubt_bulk_in_complete2, (void *) h, s); NG_NODE_UNREF((node_p) p); } /* ubt_bulk_in_complete */ -Static void +static void ubt_bulk_in_complete2(node_p node, hook_p hook, void *arg1, int arg2) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1326,7 +1326,7 @@ * Start bulk-out USB transfer. Must be called with node locked */ -Static usbd_status +static usbd_status ubt_bulk_out_start(ubt_softc_p sc) { struct mbuf *m = NULL; @@ -1401,14 +1401,14 @@ * USB bulk-out transfer callback */ -Static void +static void ubt_bulk_out_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) { ng_send_fn((node_p) p, NULL, ubt_bulk_out_complete2, (void *) h, s); NG_NODE_UNREF((node_p) p); } /* ubt_bulk_out_complete */ -Static void +static void ubt_bulk_out_complete2(node_p node, hook_p hook, void *arg1, int arg2) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1457,7 +1457,7 @@ * Start Isochronous-in USB transfer. Must be called with node locked */ -Static usbd_status +static usbd_status ubt_isoc_in_start(ubt_softc_p sc) { usbd_status status; @@ -1503,14 +1503,14 @@ * USB isochronous transfer callback */ -Static void +static void ubt_isoc_in_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) { ng_send_fn((node_p) p, NULL, ubt_isoc_in_complete2, (void *) h, s); NG_NODE_UNREF((node_p) p); } /* ubt_isoc_in_complete */ -Static void +static void ubt_isoc_in_complete2(node_p node, hook_p hook, void *arg1, int arg2) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1632,7 +1632,7 @@ * Start isochronous-out USB transfer. Must be called with node locked */ -Static usbd_status +static usbd_status ubt_isoc_out_start(ubt_softc_p sc) { struct mbuf *m = NULL; @@ -1717,14 +1717,14 @@ * USB isoc-out. transfer callback */ -Static void +static void ubt_isoc_out_complete(usbd_xfer_handle h, usbd_private_handle p, usbd_status s) { ng_send_fn((node_p) p, NULL, ubt_isoc_out_complete2, (void *) h, s); NG_NODE_UNREF((node_p) p); } /* ubt_isoc_out_complete */ -Static void +static void ubt_isoc_out_complete2(node_p node, hook_p hook, void *arg1, int arg2) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1774,7 +1774,7 @@ * Abort transfers on all USB pipes */ -Static void +static void ubt_reset(ubt_softc_p sc) { /* Interrupt */ @@ -1809,7 +1809,7 @@ * Netgraph node constructor. Do not allow to create node of this type. */ -Static int +static int ng_ubt_constructor(node_p node) { return (EINVAL); @@ -1819,7 +1819,7 @@ * Netgraph node destructor. Destroy node only when device has been detached */ -Static int +static int ng_ubt_shutdown(node_p node) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1858,7 +1858,7 @@ * Create new hook. There can only be one. */ -Static int +static int ng_ubt_newhook(node_p node, hook_p hook, char const *name) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -1878,7 +1878,7 @@ * Connect hook. Start incoming USB transfers */ -Static int +static int ng_ubt_connect(hook_p hook) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); @@ -1930,7 +1930,7 @@ * Disconnect hook */ -Static int +static int ng_ubt_disconnect(hook_p hook) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); @@ -1950,7 +1950,7 @@ * Process control message */ -Static int +static int ng_ubt_rcvmsg(node_p node, item_p item, hook_p lasthook) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(node); @@ -2131,7 +2131,7 @@ * Process data */ -Static int +static int ng_ubt_rcvdata(hook_p hook, item_p item) { ubt_softc_p sc = (ubt_softc_p) NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); ==== //depot/projects/newisp/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 (text+ko) ==== @@ -28,12 +28,17 @@ * SUCH DAMAGE. * * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.5 2005/01/07 01:45:42 imp Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.6 2006/09/07 06:14:05 mjacob Exp $ */ #ifndef _NG_UBT_VAR_H_ #define _NG_UBT_VAR_H_ +/* FreeBSD 7.0 defines */ + +#define USBBASEDEVICE device_t +#define USBDEVNAME device_get_nameunit + /* pullup wrapper */ #define NG_UBT_M_PULLUP(m, s) \ do { \ ==== //depot/projects/newisp/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.10 2005/01/07 01:45:42 imp Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.11 2006/09/07 06:18:34 mjacob Exp $ */ #include @@ -50,6 +50,12 @@ #include "usbdevs.h" +/* FreeBSD 7.0 defines */ + +#define USBBASEDEVICE device_t +#define USBDEVNAME device_get_nameunit +#define USBDEVUNIT(bdev) device_get_unit(bdev) + /* * Download firmware to BCM2033. */ @@ -88,14 +94,14 @@ #define UBTBCMFW_MINOR(u, e) (((u) << 4) | (e)) #define UBTBCMFW_BSIZE 1024 -Static d_open_t ubtbcmfw_open; -Static d_close_t ubtbcmfw_close; -Static d_read_t ubtbcmfw_read; -Static d_write_t ubtbcmfw_write; -Static d_ioctl_t ubtbcmfw_ioctl; -Static d_poll_t ubtbcmfw_poll; +static d_open_t ubtbcmfw_open; +static d_close_t ubtbcmfw_close; +static d_read_t ubtbcmfw_read; +static d_write_t ubtbcmfw_write; +static d_ioctl_t ubtbcmfw_ioctl; +static d_poll_t ubtbcmfw_poll; -Static struct cdevsw ubtbcmfw_cdevsw = { +static struct cdevsw ubtbcmfw_cdevsw = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, .d_open = ubtbcmfw_open, @@ -266,7 +272,7 @@ * XXX FIXME softc locking */ -Static int +static int ubtbcmfw_open(struct cdev *dev, int flag, int mode, usb_proc_ptr p) { ubtbcmfw_softc_p sc = NULL; @@ -318,7 +324,7 @@ * XXX FIXME softc locking */ -Static int +static int ubtbcmfw_close(struct cdev *dev, int flag, int mode, usb_proc_ptr p) { ubtbcmfw_softc_p sc = NULL; @@ -355,7 +361,7 @@ * XXX FIXME softc locking */ -Static int +static int ubtbcmfw_read(struct cdev *dev, struct uio *uio, int flag) { ubtbcmfw_softc_p sc = NULL; @@ -419,7 +425,7 @@ * XXX FIXME softc locking */ -Static int +static int ubtbcmfw_write(struct cdev *dev, struct uio *uio, int flag) { ubtbcmfw_softc_p sc = NULL; @@ -484,7 +490,7 @@ * XXX FIXME softc locking */ -Static int +static int ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p) { ubtbcmfw_softc_p sc = NULL; @@ -521,7 +527,7 @@ * XXX FIXME softc locking */ -Static int +static int ubtbcmfw_poll(struct cdev *dev, int events, usb_proc_ptr p) { ubtbcmfw_softc_p sc = NULL; From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:26:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A14E16A4E0; Thu, 7 Sep 2006 13:26:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7610E16A4DA for ; Thu, 7 Sep 2006 13:26:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11DEA43DA9 for ; Thu, 7 Sep 2006 13:26:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DQ0CY010642 for ; Thu, 7 Sep 2006 13:26:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DPxvA010630 for perforce@freebsd.org; Thu, 7 Sep 2006 13:25:59 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:25:59 GMT Message-Id: <200609071325.k87DPxvA010630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:26:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=105778 Change 105778 by millert@millert_g5tower on 2006/09/07 13:25:54 Add mac_task_internalize_label, mac_task_externalize_label, mac_task_copy_label and their associated entry points. This allows us to support policies where task and port labels are different. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_task.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/ipctrace/module/ipctrace.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#5 (text+ko) ==== @@ -91,8 +91,7 @@ kern_return_t kr; mac_task_init_label(&inl); - /* XXX - should be mac_task_internalize_label */ - if (mac_port_internalize_label(&inl, labelstr)) + if (mac_task_internalize_label(&inl, labelstr)) return (KERN_INVALID_ARGUMENT); kr = labelh_new_user(space, &inl, namep); @@ -141,8 +140,7 @@ lh = labelh_new(); ip_lock(lh->lh_port); mac_task_init_label(&lh->lh_label); - /* XXX - should be mac_task_copy_label */ - mac_port_copy_label(&old->lh_label, &lh->lh_label); + mac_task_copy_label(&old->lh_label, &lh->lh_label); ip_unlock(lh->lh_port); return (lh); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#3 (text+ko) ==== @@ -39,6 +39,7 @@ /* tasks */ void mac_task_init_label(struct label *); +void mac_task_copy_label(struct label *src, struct label *dest); void mac_task_destroy_label(struct label *); void mac_task_create(struct task *, struct task *, struct label *, struct label *, struct label *); @@ -70,6 +71,7 @@ int mac_port_check_hold_receive(struct label *task, struct label *port); int mac_task_externalize_label(struct label *, char *e, char *out, size_t olen, int flags); +int mac_task_internalize_label(struct label *label, char *string); int mac_port_externalize_label(struct label *, char *e, char *out, size_t olen, int flags); int mac_port_internalize_label(struct label *label, char *string); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#7 (text+ko) ==== @@ -944,6 +944,19 @@ ); /** + @brief Copy a Mach task label + @param src Source task label + @param dest Destination task label + + Copy the Mach task label information from src to dest. This is used + when duplicating label handles to implement copy-on-write semantics. +*/ +typedef void mpo_task_copy_label_t( + struct label *src, + struct label *dest +); + +/** @brief Externalize a user credential label @param label Label to be externalized @param element_name Name of the label namespace for which labels should be @@ -1013,6 +1026,28 @@ ); /** + @brief Externalize a task label + @param label Label to be externalized + @param element_name Name of the label namespace for which labels should be + externalized + @param sb String buffer to be filled with a text representation of the label + + Produce an external representation of the label on a task. An + externalized label consists of a text representation of the label + contents that can be used with user applications. Policy-agnostic + user space tools will display this externalized version. + + @return 0 on success, return non-zero if an error occurs while + externalizing the label data. + +*/ +typedef int mpo_task_externalize_label_t( + struct label *label, + char *element_name, + struct sbuf *sb +); + +/** @brief Externalize a vnode label @param label Label to be externalized @param element_name Name of the label namespace for which labels should be @@ -1161,6 +1196,32 @@ ); /** + @brief Internalize a task label + @param label Label to be internalized + @param element_name Name of the label namespace for which the label should + be internalized + @param element_data Text data to be internalized + + Produce a task label from an external representation. An + externalized label consists of a text representation of the label + contents that can be used with user applications. Policy-agnostic + user space tools will forward text version to the kernel for + processing by individual policy modules. + + The policy's internalize entry points will be called only if the + policy has registered interest in the label namespace. + + @return 0 on success, Otherwise, return non-zero if an error occurs + while internalizing the label data. + +*/ +typedef int mpo_task_internalize_label_t( + struct label *label, + char *element_name, + char *element_data +); + +/** @brief Internalize a vnode label @param label Label to be internalized @param element_name Name of the label namespace for which the label should @@ -4881,11 +4942,13 @@ mpo_port_copy_label_t *mpo_port_copy_label; mpo_socket_copy_label_t *mpo_socket_copy_label; mpo_pipe_copy_label_t *mpo_pipe_copy_label; + mpo_task_copy_label_t *mpo_task_copy_label; mpo_cred_externalize_label_t *mpo_cred_externalize_label; mpo_cred_externalize_audit_label_t *mpo_cred_externalize_audit_label; mpo_lctx_externalize_label_t *mpo_lctx_externalize_label; mpo_socket_externalize_label_t *mpo_socket_externalize_label; mpo_socket_peer_externalize_label_t *mpo_socket_peer_externalize_label; + mpo_task_externalize_label_t *mpo_task_externalize_label; mpo_vnode_externalize_label_t *mpo_vnode_externalize_label; mpo_vnode_externalize_audit_label_t *mpo_vnode_externalize_audit_label; mpo_pipe_externalize_label_t *mpo_pipe_externalize_label; @@ -4893,6 +4956,7 @@ mpo_cred_internalize_label_t *mpo_cred_internalize_label; mpo_lctx_internalize_label_t *mpo_lctx_internalize_label; mpo_socket_internalize_label_t *mpo_socket_internalize_label; + mpo_task_internalize_label_t *mpo_task_internalize_label; mpo_vnode_internalize_label_t *mpo_vnode_internalize_label; mpo_pipe_internalize_label_t *mpo_pipe_internalize_label; mpo_mount_internalize_label_t *mpo_mount_internalize_label; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_task.c#3 (text+ko) ==== @@ -54,6 +54,13 @@ } void +mac_task_copy_label(struct label *src, struct label *dest) +{ + + MAC_PERFORM(task_copy_label, src, dest); +} + +void mac_task_destroy_label(struct label *label) { @@ -88,10 +95,20 @@ if (elements[0] == '*') { int count; - MAC_EXTERNALIZE_REGISTERED_LABELS(cred, label, outbuf, + MAC_EXTERNALIZE_REGISTERED_LABELS(task, label, outbuf, outbuflen, count); } else - MAC_EXTERNALIZE_LIST(cred, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE_LIST(task, label, elements, outbuf, outbuflen); + + return (error); +} + +int +mac_task_internalize_label(struct label *label, char *string) +{ + int error; + + MAC_INTERNALIZE_LIST(task, label, string); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/policies/ipctrace/module/ipctrace.c#4 (text+ko) ==== @@ -399,6 +399,7 @@ .mpo_task_destroy_label = ipctrace_destroy_label, .mpo_port_destroy_label = ipctrace_destroy_label, .mpo_port_copy_label = ipctrace_copy_label, + .mpo_task_copy_label = ipctrace_copy_label, .mpo_cred_externalize_label = ipctrace_externalize_label, /* Labeling event operations */ ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#8 (text+ko) ==== @@ -4087,6 +4087,7 @@ .mpo_task_init_label = mac_mls_init_label, .mpo_port_destroy_label = mac_mls_destroy_label, .mpo_task_destroy_label = mac_mls_destroy_label, + .mpo_task_copy_label = mac_mls_copy_label, .mpo_port_copy_label = mac_mls_copy_label, .mpo_port_update_from_cred = mac_mls_port_update_from_cred, .mpo_cred_copy_to_task = mac_mls_cred_copy_to_task, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#12 (text+ko) ==== @@ -2985,7 +2985,7 @@ #endif static void -sebsd_port_copy_label(struct label *src, struct label *dest) +sebsd_task_copy_label(struct label *src, struct label *dest) { *(struct task_security_struct *)SLOT(dest) = *(struct task_security_struct *)SLOT(src); @@ -3477,7 +3477,8 @@ /* Copy labels */ .mpo_cred_copy_to_task = sebsd_cred_copy_to_task, - .mpo_port_copy_label = sebsd_port_copy_label, + .mpo_port_copy_label = sebsd_task_copy_label, + .mpo_task_copy_label = sebsd_task_copy_label, .mpo_vnode_copy_label = sebsd_vnode_copy_label, .mpo_pipe_copy_label = sebsd_vnode_copy_label, .mpo_socket_copy_label = copy_network_label, @@ -3501,6 +3502,9 @@ .mpo_socket_externalize_label = sebsd_network_externalize_label, .mpo_socket_peer_externalize_label = sebsd_network_externalize_label, + .mpo_task_internalize_label = sebsd_cred_internalize_label, + .mpo_task_externalize_label = sebsd_cred_externalize_label, + .mpo_cred_setlabel = sebsd_cred_setlabel, .mpo_vnode_setlabel = sebsd_vnode_setlabel, .mpo_pipe_setlabel = sebsd_pipe_setlabel, ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#6 (text+ko) ==== @@ -896,6 +896,13 @@ #endif } +static void +mac_test_task_copy_label(struct label *src, struct label *dest) +{ + USE_LABEL(src, TASKTYPE); + COPY_LABEL(src, dest, TASKTYPE); +} + static int mac_test_cred_externalize_label(struct label *label, char *element_name, struct sbuf *sb) @@ -3182,6 +3189,7 @@ .mpo_mbuf_copy_label = mac_test_mbuf_copy_label, .mpo_pipe_copy_label = mac_test_pipe_copy_label, .mpo_port_copy_label = mac_test_port_copy_label, + .mpo_task_copy_label = mac_test_task_copy_label, .mpo_socket_copy_label = mac_test_socket_copy_label, .mpo_cred_externalize_label = mac_test_cred_externalize_label, .mpo_cred_externalize_audit_label = From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:27:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3D0916A4E1; Thu, 7 Sep 2006 13:27:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A9AD16A4DD for ; Thu, 7 Sep 2006 13:27:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8AEB43D7C for ; Thu, 7 Sep 2006 13:27:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DR2oU010847 for ; Thu, 7 Sep 2006 13:27:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DR1LP010844 for perforce@freebsd.org; Thu, 7 Sep 2006 13:27:01 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:27:01 GMT Message-Id: <200609071327.k87DR1LP010844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=105779 Change 105779 by millert@millert_g5tower on 2006/09/07 13:26:42 Slightly less obfuscated label handle locking: Rename mutex in label handle from io_lock_data to lh_lock_data since it is part of the label handle and not an ipc_object struct. This means we need to define lh_lock, lh_unlock and lh_lock_init in terms of the mutex_* functions and not io_*. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#6 (text+ko) ==== @@ -71,7 +71,7 @@ /* Allocate new label handle, insert port and label. */ lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); - io_lock_init(lh); + lh_lock_init(lh); lh->lh_port = port; lh->lh_label = *inl; lh->lh_type = LABELH_TYPE_USER; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ int lh_type; struct label lh_label; ipc_port_t lh_port; - decl_mutex_data(, io_lock_data) + decl_mutex_data(, lh_lock_data) } *ipc_labelh_t; #define LABELH_TYPE_KERN 0 @@ -60,8 +60,9 @@ extern zone_t ipc_labelh_zone; -#define lh_lock io_lock -#define lh_unlock io_unlock +#define lh_lock_init(lh) mutex_init(&(lh)->lh_lock_data, 0) +#define lh_lock(lh) mutex_lock(&(lh)->lh_lock_data) +#define lh_unlock(lh) mutex_unlock(&(lh)->lh_lock_data) /* * Check the number of references the label handle has left. ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.h#2 (text+ko) ==== @@ -215,8 +215,8 @@ #ifdef MAC #define maclabel label->lh_label -#define tasklabel_lock(task) io_lock((task)->label) -#define tasklabel_unlock(task) io_unlock((task)->label) +#define tasklabel_lock(task) lh_lock((task)->label) +#define tasklabel_unlock(task) lh_unlock((task)->label) extern void tasklabel_lock2(task_t a, task_t b); extern void tasklabel_unlock2(task_t a, task_t b); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:28:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE48D16A4EB; Thu, 7 Sep 2006 13:28:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7109B16A4E5 for ; Thu, 7 Sep 2006 13:28:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E389A43D58 for ; Thu, 7 Sep 2006 13:28:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DS38M010885 for ; Thu, 7 Sep 2006 13:28:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DS3aK010882 for perforce@freebsd.org; Thu, 7 Sep 2006 13:28:03 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:28:03 GMT Message-Id: <200609071328.k87DS3aK010882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:28:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=105780 Change 105780 by millert@millert_g5tower on 2006/09/07 13:27:32 For labelh_modify(), if we need to allocate a new label handle, use a non-blocking allocator since it is not always safe to sleep where labelh_modify() is called. As a result, labelh_new() takes a "canblock" flag. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#7 (text+ko) ==== @@ -111,12 +111,12 @@ * port or the ipc_label_t structure itself. */ ipc_labelh_t -labelh_new(void) +labelh_new(int canblock) { ipc_labelh_t lh; - lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); - io_lock_init(lh); + lh = (ipc_labelh_t)zalloc_canblock(ipc_labelh_zone, canblock); + lh_lock_init(lh); lh->lh_port = ipc_port_alloc_kernel(); lh->lh_type = LABELH_TYPE_KERN; lh->lh_references = 1; @@ -137,7 +137,7 @@ { ipc_labelh_t lh; - lh = labelh_new(); + lh = labelh_new(0); ip_lock(lh->lh_port); mac_task_init_label(&lh->lh_label); mac_task_copy_label(&old->lh_label, &lh->lh_label); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#4 (text+ko) ==== @@ -46,7 +46,7 @@ void labelh_destroy(ipc_port_t port); ipc_labelh_t labelh_duplicate(ipc_labelh_t old); ipc_labelh_t labelh_modify(ipc_labelh_t old); -ipc_labelh_t labelh_new(void); +ipc_labelh_t labelh_new(int canblock); kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); void labelh_release(ipc_labelh_t lh); ipc_labelh_t labelh_reference(ipc_labelh_t lh); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#3 (text+ko) ==== @@ -429,7 +429,7 @@ #ifdef MAC /*mutex_init(&new_task->labellock, ETAP_NO_TRACE);*/ - new_task->label = labelh_new (); + new_task->label = labelh_new(1); mac_task_init_label(&new_task->maclabel); #endif From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:29:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B77FE16A4E5; Thu, 7 Sep 2006 13:29:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F5CF16A4DF for ; Thu, 7 Sep 2006 13:29:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AF8043D60 for ; Thu, 7 Sep 2006 13:29:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DT69L011088 for ; Thu, 7 Sep 2006 13:29:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DT5DW011085 for perforce@freebsd.org; Thu, 7 Sep 2006 13:29:05 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:29:05 GMT Message-Id: <200609071329.k87DT5DW011085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:29:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=105781 Change 105781 by millert@millert_g5tower on 2006/09/07 13:28:20 Rename mac_modify_task_label() to mac_task_modify_label() for consistency with other MAC function names. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#2 (text+ko) ==== @@ -1,7 +1,7 @@ _mac_policy_register _mac_policy_unregister _sysctl__security_mac_children -_mac_modify_task_label +_mac_task_modify_label _mac_vnop_getxattr _mac_vnop_setxattr ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#4 (text+ko) ==== @@ -1699,7 +1699,7 @@ } void -mac_modify_task_label( +mac_task_modify_label( struct task *pt, void *arg, void (*f) (struct label *l, void *arg)) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#4 (text+ko) ==== @@ -44,7 +44,7 @@ void mac_task_create(struct task *, struct task *, struct label *, struct label *, struct label *); void mac_task_create_kernel(struct task *, struct label *, struct label *); -void mac_modify_task_label( struct task *pt, void *arg, +void mac_task_modify_label( struct task *pt, void *arg, void (*f)(struct label *l, void *arg)); /* ports */ From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:31:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E15A16A518; Thu, 7 Sep 2006 13:31:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41ED516A4E9 for ; Thu, 7 Sep 2006 13:31:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF02643E4A for ; Thu, 7 Sep 2006 13:31:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DV9be011342 for ; Thu, 7 Sep 2006 13:31:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DV94f011339 for perforce@freebsd.org; Thu, 7 Sep 2006 13:31:09 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:31:09 GMT Message-Id: <200609071331.k87DV94f011339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:31:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=105783 Change 105783 by millert@millert_g5tower on 2006/09/07 13:30:49 Start labelling Mach threads. When a thread is created it gets a reference to the label handle of the task that created it. Note that one task can create threads in another task. Changes to the task label to propagate to its own threads that contain a reference to its label. Changes will *not* be propagated to threads created in another task. Those threads will retain the label of the task that created them (which will not change). This is considered a feature (but I could be convinced otherwise). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#5 (text+ko) ==== @@ -1686,29 +1686,78 @@ void mac_task_update_label( struct label *pl, - struct task *t) + struct task *task) { + thread_t thread; + ipc_labelh_t oldlabel; + + tasklabel_lock(task); + oldlabel = task->label; - tasklabel_lock(t); - t->label = labelh_modify(t->label); - mac_cred_copy_to_task(pl, &t->maclabel); - tasklabel_unlock(t); - ip_lock(t->itk_self); - mac_port_update_from_cred(pl, &t->itk_self->ip_label); - ip_unlock(t->itk_self); + /* + * For each thread in the task, release a reference to the label + * handle in the thread if it matches the parent's. + * XXX - do we need to hold the task while this is going on? + */ + queue_iterate(&task->threads, thread, thread_t, task_threads) { + if (thread->label == oldlabel) + lh_release(oldlabel); + } + task->label = labelh_modify(task->label, 0); + mac_cred_copy_to_task(pl, &task->maclabel); + /* + * Replace the old label in the task's threads with the new one. + */ + queue_iterate(&task->threads, thread, thread_t, task_threads) { + if (thread->label == oldlabel) { + thread->label = task->label; + lh_reference(task->label); + } + } + /* Free old label if it is no longer in use. */ + if (task->label != oldlabel) + lh_check_unlock(oldlabel); + tasklabel_unlock(task); + ip_lock(task->itk_self); + mac_port_update_from_cred(pl, &task->itk_self->ip_label); + ip_unlock(task->itk_self); } void mac_task_modify_label( - struct task *pt, + struct task *task, void *arg, void (*f) (struct label *l, void *arg)) { + thread_t thread; + ipc_labelh_t oldlabel; - tasklabel_lock(pt); - pt->label = labelh_modify(pt->label); - (*f)(&pt->maclabel, arg); - tasklabel_unlock(pt); + tasklabel_lock(task); + oldlabel = task->label; + + /* + * For each thread in the task, release a reference to the label + * handle in the thread if it matches the parent's. + * XXX - do we need to hold the task while this is going on? + */ + queue_iterate(&task->threads, thread, thread_t, task_threads) { + if (thread->label == oldlabel) + lh_release(oldlabel); + } + task->label = labelh_modify(task->label, 0); + (*f)(&task->maclabel, arg); + /* + * Replace the old label in the task's threads with the new one. + */ + queue_iterate(&task->threads, thread, thread_t, task_threads) { + if (thread->label == oldlabel) { + thread->label = task->label; + lh_reference(task->label); + } + } + /* Free old label if it is no longer in use. */ + if (task->label != oldlabel) + lh_check_unlock(oldlabel); + tasklabel_unlock(task); } - #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.c#2 (text+ko) ==== @@ -383,6 +383,10 @@ machine_thread_destroy(thread); +#ifdef MAC + labelh_release(task->label); +#endif + zfree(thread_zone, thread); } @@ -657,6 +661,11 @@ new_thread->pri_shift = new_thread->processor_set->pri_shift; compute_priority(new_thread, FALSE); +#ifdef MAC + labelh_reference(parent_task->label); + new_thread->label = parent_task->label; +#endif + new_thread->active = TRUE; *out_thread = new_thread; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.h#2 (text+ko) ==== @@ -114,7 +114,9 @@ #include #include #include +#include +#include #include #include @@ -347,6 +349,10 @@ #ifdef MACH_BSD void *uthread; #endif + +#ifdef MAC + ipc_labelh_t label; +#endif }; #define ith_state saved.receive.state From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:31:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ED9C16A505; Thu, 7 Sep 2006 13:31:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44CE516A4EF for ; Thu, 7 Sep 2006 13:31:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 572BD43E49 for ; Thu, 7 Sep 2006 13:31:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DV9tB011336 for ; Thu, 7 Sep 2006 13:31:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DV92G011333 for perforce@freebsd.org; Thu, 7 Sep 2006 13:31:09 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:31:09 GMT Message-Id: <200609071331.k87DV92G011333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=105782 Change 105782 by millert@millert_g5tower on 2006/09/07 13:30:14 Add a keepold argument to labelh_modify() that tells it not to free the old label handle. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 (text+ko) ==== @@ -150,7 +150,7 @@ * Returned label handle is locked. */ ipc_labelh_t -labelh_modify(ipc_labelh_t old) +labelh_modify(ipc_labelh_t old, int keepold) { ipc_labelh_t lh; @@ -163,7 +163,8 @@ return (old); lh = labelh_duplicate(old); lh_release(old); - lh_check_unlock(old); + if (!keepold) + lh_check_unlock(old); lh_lock(lh); return (lh); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#5 (text+ko) ==== @@ -45,7 +45,7 @@ void labelh_destroy(ipc_port_t port); ipc_labelh_t labelh_duplicate(ipc_labelh_t old); -ipc_labelh_t labelh_modify(ipc_labelh_t old); +ipc_labelh_t labelh_modify(ipc_labelh_t old, int keepold); ipc_labelh_t labelh_new(int canblock); kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); void labelh_release(ipc_labelh_t lh); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:35:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A38FB16A4EF; Thu, 7 Sep 2006 13:35:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E7E116A4E8 for ; Thu, 7 Sep 2006 13:35:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64E8E43E85 for ; Thu, 7 Sep 2006 13:34:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DYE9F011826 for ; Thu, 7 Sep 2006 13:34:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DYDvd011823 for perforce@freebsd.org; Thu, 7 Sep 2006 13:34:13 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:34:13 GMT Message-Id: <200609071334.k87DYDvd011823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:35:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=105784 Change 105784 by millert@millert_g5tower on 2006/09/07 13:33:39 Add a mach_ prefix to the the Mach IPC entry points. Rename mpo_syscall to mpo_policy_syscall. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_msg.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/ipctrace/module/ipctrace.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#13 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_msg.c#3 (text+ko) ==== @@ -314,7 +314,7 @@ #ifdef MAC if (kmsg->ikm_sender != NULL && IP_VALID(kmsg->ikm_header->msgh_remote_port) && - mac_ipc_check_method(&kmsg->ikm_sender->lh_label, + mac_mach_ipc_check_method(&kmsg->ikm_sender->lh_label, &((ipc_port_t)kmsg->ikm_header->msgh_remote_port)->ip_label, kmsg->ikm_header->msgh_id) == 0) trailer->msgh_ad = 1; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#4 (text+ko) ==== @@ -283,7 +283,7 @@ goto errout; mac_port_init_label(&outl); - rc = mac_request_object_label(subl, objl, serv, &outl); + rc = mac_mach_request_object_label(subl, objl, serv, &outl); io_unlocklabel(subp); io_unlock(subp); io_unlocklabel(objp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#7 (text+ko) ==== @@ -998,12 +998,12 @@ } int -mac_request_object_label(struct label *subj, struct label *obj, +mac_mach_request_object_label(struct label *subj, struct label *obj, const char *s, struct label *out) { int error; - MAC_CHECK(request_object_label, subj, obj, s, out); + MAC_CHECK(mach_request_object_label, subj, obj, s, out); return error; } @@ -1636,8 +1636,8 @@ continue; if (strcmp(mpc->mpc_name, target) == 0 && - mpc->mpc_ops->mpo_syscall != NULL) { - error = mpc->mpc_ops->mpo_syscall(p, + mpc->mpc_ops->mpo_policy_syscall != NULL) { + error = mpc->mpc_ops->mpo_policy_syscall(p, uap->call, uap->arg); break; } @@ -1649,8 +1649,8 @@ continue; if (strcmp(mpc->mpc_name, target) == 0 && - mpc->mpc_ops->mpo_syscall != NULL) { - error = mpc->mpc_ops->mpo_syscall(p, + mpc->mpc_ops->mpo_policy_syscall != NULL) { + error = mpc->mpc_ops->mpo_policy_syscall(p, uap->call, uap->arg); break; } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#5 (text+ko) ==== @@ -29,9 +29,10 @@ int mac_task_check_service_access(task_t self, task_t obj, const char *perm); void mac_task_update_label(struct label *pl, struct task *t); -int mac_request_object_label(struct label *subj, struct label *obj, +int mac_mach_request_object_label(struct label *subj, struct label *obj, const char *serv, struct label *out); -int mac_ipc_check_method(struct label *task, struct label *port, int msgid); +int mac_mach_ipc_check_method(struct label *task, struct label *port, + int msgid); #ifdef MAC void mac_policy_init(void); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#8 (text+ko) ==== @@ -252,7 +252,7 @@ @return In the event of an error, an appropriate value for errno should be returned, otherwise return 0 upon success. */ -typedef int mpo_syscall_t( +typedef int mpo_policy_syscall_t( struct proc *p, int call, user_addr_t arg @@ -2213,7 +2213,7 @@ @return 0 on success, or an errno value for failure. */ -typedef int mpo_request_object_label_t( +typedef int mpo_mach_request_object_label_t( struct label *subj, struct label *obj, const char *serv, @@ -2741,7 +2741,7 @@ @return 0 for access granted, nonzero for access denied. */ -typedef int mpo_ipc_check_method_t( +typedef int mpo_mach_ipc_check_method_t( struct label *task, struct label *port, int msgid @@ -4881,7 +4881,7 @@ mpo_policy_destroy_t *mpo_policy_destroy; mpo_policy_init_t *mpo_policy_init; mpo_policy_initbsd_t *mpo_policy_initbsd; - mpo_syscall_t *mpo_syscall; + mpo_policy_syscall_t *mpo_policy_syscall; /* * Audit operations @@ -5024,7 +5024,7 @@ mpo_proc_create_init_t *mpo_proc_create_init; mpo_cred_setlabel_t *mpo_cred_setlabel; - mpo_request_object_label_t *mpo_request_object_label; + mpo_mach_request_object_label_t *mpo_mach_request_object_label; /* * Labeling event operations: Pipe objects. @@ -5062,7 +5062,7 @@ mpo_file_check_fcntl_t *mpo_file_check_fcntl; mpo_check_get_fd_t *mpo_check_get_fd; mpo_check_ioctl_t *mpo_check_ioctl; - mpo_ipc_check_method_t *mpo_ipc_check_method; + mpo_mach_ipc_check_method_t *mpo_mach_ipc_check_method; mpo_posixsem_check_create_t *mpo_posixsem_check_create; mpo_posixsem_check_open_t *mpo_posixsem_check_open; mpo_posixsem_check_post_t *mpo_posixsem_check_post; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#4 (text+ko) ==== @@ -242,11 +242,11 @@ } int -mac_ipc_check_method(struct label *task, struct label *port, int msgid) +mac_mach_ipc_check_method(struct label *task, struct label *port, int msgid) { int error; - MAC_CHECK(ipc_check_method, task, port, msgid); + MAC_CHECK(mach_ipc_check_method, task, port, msgid); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/policies/ipctrace/module/ipctrace.c#5 (text+ko) ==== @@ -391,7 +391,7 @@ { .mpo_policy_init = ipctrace_policy_init, .mpo_policy_destroy = ipctrace_policy_destroy, - .mpo_syscall = ipctrace_syscall, + .mpo_policy_syscall = ipctrace_syscall, .mpo_cred_init_label = ipctrace_init_label, .mpo_task_init_label = ipctrace_init_label, .mpo_port_init_label = ipctrace_init_label, ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#9 (text+ko) ==== @@ -1919,11 +1919,11 @@ } static int -mac_mls_request_object_label (struct label *subj, struct label *obj, +mac_mls_mach_request_object_label (struct label *subj, struct label *obj, const char *serv, struct label *out) { -#warning Implement mac_mls_request_object_label() +#warning Implement mac_mls_mach_request_object_label() return (0); } @@ -3074,7 +3074,7 @@ } static int -mac_mls_ipc_check_method(struct label *task, struct label *port, int msgid) +mac_mls_mach_ipc_check_method(struct label *task, struct label *port, int msgid) { struct mac_mls *subj, *obj; @@ -4045,9 +4045,9 @@ .mpo_policy_destroy = mac_mls_policy_destroy, .mpo_policy_init = mac_mls_policy_init, .mpo_policy_initbsd = mac_mls_policy_initbsd, - .mpo_syscall = mac_mls_syscall, + .mpo_policy_syscall = mac_mls_syscall, - .mpo_request_object_label = mac_mls_request_object_label, + .mpo_mach_request_object_label = mac_mls_mach_request_object_label, .mpo_mach_check_service_access = mac_mls_mach_check_service_access, .mpo_cred_check_setlabel = mac_mls_cred_check_setlabel, .mpo_cred_check_visible = mac_mls_cred_check_visible, @@ -4093,7 +4093,7 @@ .mpo_cred_copy_to_task = mac_mls_cred_copy_to_task, .mpo_port_create = mac_mls_port_create, .mpo_port_create_kernel = mac_mls_port_create_kernel, - .mpo_ipc_check_method = mac_mls_ipc_check_method, + .mpo_mach_ipc_check_method = mac_mls_mach_ipc_check_method, .mpo_port_check_setlabel = mac_mls_port_check_setlabel, .mpo_port_check_send = mac_mls_port_check_send, .mpo_port_check_hold_send = mac_mls_port_check_hold_send, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#13 (text+ko) ==== @@ -1477,7 +1477,7 @@ } static int -sebsd_ipc_check_method(struct label *subj, struct label *obj, int msgid) +sebsd_mach_ipc_check_method(struct label *subj, struct label *obj, int msgid) { struct task_security_struct *tsec, *psec; @@ -3533,7 +3533,7 @@ .mpo_devfs_vnode_associate = sebsd_devfs_vnode_associate, .mpo_devfs_update = sebsd_devfs_update, - .mpo_request_object_label = sebsd_request_label, + .mpo_mach_request_object_label = sebsd_request_label, /* Transition */ .mpo_vnode_execve_will_transition = sebsd_vnode_execve_will_transition, @@ -3677,7 +3677,7 @@ .mpo_sysvshm_check_shmctl = sebsd_sysvshm_check_shmctl, .mpo_sysvshm_check_shmget = sebsd_sysvshm_check_shmget, - .mpo_ipc_check_method = sebsd_ipc_check_method, + .mpo_mach_ipc_check_method = sebsd_mach_ipc_check_method, /* POSIX IPC Entry Points */ .mpo_posixsem_init_label = sebsd_init_ipc_label, @@ -3703,7 +3703,7 @@ .mpo_socket_peer_set_from_mbuf = sebsd_socket_peer_set_from_mbuf, .mpo_socket_peer_set_from_socket = sebsd_socket_peer_set_from_socket, - .mpo_syscall = sebsd_syscall + .mpo_policy_syscall = sebsd_syscall }; static const char *labelnamespaces[SEBSD_MAC_LABEL_NAME_COUNT] = ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#7 (text+ko) ==== @@ -1316,7 +1316,7 @@ } static int -mac_test_ipc_check_method(struct label *task, struct label *port, int msgid) +mac_test_mach_ipc_check_method(struct label *task, struct label *port, int msgid) { USE_LABEL(task, TASKTYPE); USE_LABEL(port, PORTTYPE); @@ -1603,7 +1603,7 @@ } static int -mac_test_request_object_label (struct label *subj, struct label *obj, +mac_test_mach_request_object_label (struct label *subj, struct label *obj, const char *serv, struct label *out) { @@ -3130,7 +3130,7 @@ .mpo_policy_destroy = mac_test_policy_destroy, .mpo_policy_init = mac_test_policy_init, .mpo_policy_initbsd = mac_test_policy_initbsd, - .mpo_syscall = mac_test_syscall, + .mpo_policy_syscall = mac_test_syscall, /* * Audit selection functions. @@ -3294,7 +3294,7 @@ .mpo_file_check_fcntl = mac_test_file_check_fcntl, .mpo_check_get_fd = mac_test_check_get_fd, .mpo_check_ioctl = mac_test_check_ioctl, - .mpo_ipc_check_method = mac_test_ipc_check_method, + .mpo_mach_ipc_check_method = mac_test_mach_ipc_check_method, .mpo_lctx_check_setlabel = mac_test_lctx_check_setlabel, .mpo_mount_check_getattr = mac_test_mount_check_getattr, .mpo_mount_check_setattr = mac_test_mount_check_setattr, @@ -3328,7 +3328,7 @@ .mpo_proc_check_setlcid = mac_test_proc_check_setlcid, .mpo_proc_check_signal = mac_test_proc_check_signal, .mpo_proc_check_wait = mac_test_proc_check_wait, - .mpo_request_object_label = mac_test_request_object_label, + .mpo_mach_request_object_label = mac_test_mach_request_object_label, .mpo_mach_check_service_access = mac_test_mach_check_service_access, .mpo_check_set_fd = mac_test_check_set_fd, .mpo_pipe_check_kqfilter = mac_test_pipe_check_kqfilter, From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:39:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7EF716A4DE; Thu, 7 Sep 2006 13:39:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B23216A4DA for ; Thu, 7 Sep 2006 13:39:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 489E143D80 for ; Thu, 7 Sep 2006 13:39:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DdLPt013626 for ; Thu, 7 Sep 2006 13:39:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DdKbs013614 for perforce@freebsd.org; Thu, 7 Sep 2006 13:39:20 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:39:20 GMT Message-Id: <200609071339.k87DdKbs013614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:39:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=105785 Change 105785 by millert@millert_g5tower on 2006/09/07 13:38:33 Update to libselinux_1_30_27 from sourceforge svn Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fgetfilecon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/file_path_suffixes.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfilecon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfscreatecon.c#3 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getkeycreatecon.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getprocattrcon.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lgetfilecon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_policy.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/procattr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux.py#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_config.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_internal.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig.i#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig_wrap.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setexeccon.c#3 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfscreatecon.c#3 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setkeycreatecon.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setprocattrcon.c#2 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,21 @@ +1.30.27 2006-08-24 + * Merged patch to not log avc stats upon a reset from Steve Grubb. + * Applied patch to revert compat_net setting upon policy load. + +1.30.26 2006-08-11 + * Merged file context homedir and local path functions from + Chris PeBenito. + +1.30.25 2006-08-11 + * Rework functions that access /proc/pid/attr to access the + per-thread nodes, and unify the code to simplify maintenance. + +1.30.24 2006-08-10 + * Merged return value fix for *getfilecon() from Dan Walsh. + +1.30.23 2006-08-10 + * Merged sockcreate interfaces from Eric Paris. + 1.30.22 2006-08-03 * Merged no-tls-direct-seg-refs patch from Jeremy Katz. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.22 +1.30.27 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#3 (text+ko) ==== @@ -87,6 +87,17 @@ extern int setkeycreatecon(security_context_t context); extern int setkeycreatecon_raw(security_context_t context); +/* Get sockcreate context, and set *con to refer to it. + Sets *con to NULL if no socket create context has been set, i.e. using default. + If non-NULL, caller must free via freecon. */ + extern int getsockcreatecon(security_context_t * con); + extern int getsockcreatecon_raw(security_context_t * con); + +/* Set the sockcreate security context for subsequent socket creations. + Call with NULL if you want to reset to the default. */ + extern int setsockcreatecon(security_context_t context); + extern int setsockcreatecon_raw(security_context_t context); + /* Wrappers for the xattr API. */ /* Get file context, and set *con to refer to it. @@ -409,6 +420,8 @@ extern const char *selinux_default_context_path(void); extern const char *selinux_user_contexts_path(void); extern const char *selinux_file_context_path(void); + extern const char *selinux_file_context_homedir_path(void); + extern const char *selinux_file_context_local_path(void); extern const char *selinux_homedir_context_path(void); extern const char *selinux_media_context_path(void); extern const char *selinux_contexts_path(void); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#5 (text+ko) ==== @@ -20,8 +20,7 @@ #OBJS += getfscreatecon.o setfscreatecon.o setexeccon.o # The following are Linux-specific -#OBJS += getkeycreatecon.o getprocattrcon.o rpm.o \ -# setkeycreatecon.o setprocattrcon.o +#OBJS += procattr.c rpm.o AR = ar cq RANLIB = ranlib ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#4 (text+ko) ==== @@ -1199,8 +1199,6 @@ { int rc; - avc_av_stats(); - rc = avc_reset(); avc_get_lock(avc_lock); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fgetfilecon.c#3 (text+ko) ==== @@ -42,5 +42,8 @@ freecon(rcontext); } + if (ret >= 0 && *context) + return strlen(*context) + 1; + return ret; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/file_path_suffixes.h#3 (text+ko) ==== @@ -15,3 +15,5 @@ S_(SEUSERS, "/seusers") S_(TRANSLATIONS, "/setrans.conf") S_(NETFILTER_CONTEXTS, "/contexts/netfilter_contexts") + S_(FILE_CONTEXTS_HOMEDIR, "/contexts/files/file_contexts.homedir") + S_(FILE_CONTEXTS_LOCAL, "/contexts/files/file_contexts.local") ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfilecon.c#3 (text+ko) ==== @@ -40,6 +40,8 @@ ret = selinux_raw_to_trans_context(rcontext, context); freecon(rcontext); } + if (ret >= 0 && *context) + return strlen(*context) + 1; return ret; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lgetfilecon.c#3 (text+ko) ==== @@ -40,5 +40,7 @@ freecon(rcontext); } + if (ret >= 0 && *context) + return strlen(*context) + 1; return ret; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_policy.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ struct stat sb; size_t size; void *map, *data; - int fd, rc = -1, *values, len, i, prot, compat_net; + int fd, rc = -1, *values, len, i, prot; sepol_policydb_t *policydb; sepol_policy_file_t *pf; @@ -69,23 +69,20 @@ if (map == MAP_FAILED) goto close; - if (sepol_policy_file_create(&pf)) - goto unmap; - if (sepol_policydb_create(&policydb)) { - sepol_policy_file_free(pf); - goto unmap; - } - sepol_policy_file_set_mem(pf, data, size); - if (sepol_policydb_read(policydb, pf)) { - sepol_policy_file_free(pf); - sepol_policydb_free(policydb); - goto unmap; - } - - compat_net = sepol_policydb_compat_net(policydb); - if (vers > kernvers) { /* Need to downgrade to kernel-supported version. */ + if (sepol_policy_file_create(&pf)) + goto unmap; + if (sepol_policydb_create(&policydb)) { + sepol_policy_file_free(pf); + goto unmap; + } + sepol_policy_file_set_mem(pf, data, size); + if (sepol_policydb_read(policydb, pf)) { + sepol_policy_file_free(pf); + sepol_policydb_free(policydb); + goto unmap; + } if (sepol_policydb_set_vers(policydb, kernvers) || sepol_policydb_to_image(NULL, policydb, &data, &size)) { /* Downgrade failed, keep searching. */ @@ -96,11 +93,10 @@ vers--; goto search; } + sepol_policy_file_free(pf); + sepol_policydb_free(policydb); } - sepol_policy_file_free(pf); - sepol_policydb_free(policydb); - if (load_setlocaldefs) { void *olddata = data; size_t oldsize = size; @@ -140,20 +136,6 @@ rc = security_load_policy(data, size); -#ifdef __linux__ - if (!rc && selinux_mnt) { - int fd2; - char buf[2]; - snprintf(path, sizeof path, "%s/compat_net", selinux_mnt); - fd2 = open(path, O_RDWR); - if (fd2 < 0) - goto unmap; - buf[0] = compat_net ? '1' : '0'; - buf[1] = '\0'; - (void)write(fd2, buf, 2); - close(fd2); - } -#endif unmap: if (data != map) free(data); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#3 (text+ko) ==== @@ -8,26 +8,28 @@ #include "dso.h" /* Indices for file paths arrays. */ -#define BASEDIR 0 -#define POLICYDIR 1 -#define BINPOLICY 2 -#define MIGSCS 3 -#define CONTEXTS_DIR 4 -#define FILE_CONTEXTS 5 -#define HOMEDIR_CONTEXTS 6 -#define DEFAULT_CONTEXTS 7 -#define USER_CONTEXTS 8 -#define FAILSAFE_CONTEXT 9 -#define DEFAULT_TYPE 10 -#define BOOLEANS 11 -#define MEDIA_CONTEXTS 12 -#define REMOVABLE_CONTEXT 13 -#define CUSTOMIZABLE_TYPES 14 -#define USERS_DIR 15 -#define SEUSERS 16 -#define TRANSLATIONS 17 -#define NETFILTER_CONTEXTS 18 -#define NEL 19 +#define BASEDIR 0 +#define POLICYDIR 1 +#define BINPOLICY 2 +#define MIGSCS 3 +#define CONTEXTS_DIR 4 +#define FILE_CONTEXTS 5 +#define HOMEDIR_CONTEXTS 6 +#define DEFAULT_CONTEXTS 7 +#define USER_CONTEXTS 8 +#define FAILSAFE_CONTEXT 9 +#define DEFAULT_TYPE 10 +#define BOOLEANS 11 +#define MEDIA_CONTEXTS 12 +#define REMOVABLE_CONTEXT 13 +#define CUSTOMIZABLE_TYPES 14 +#define USERS_DIR 15 +#define SEUSERS 16 +#define TRANSLATIONS 17 +#define NETFILTER_CONTEXTS 18 +#define FILE_CONTEXTS_HOMEDIR 19 +#define FILE_CONTEXTS_LOCAL 20 +#define NEL 21 static char *file_paths[NEL]; static char *file_suffixes[NEL] = { @@ -221,14 +223,14 @@ { return (file_paths[BINPOLICY]); } -hidden_def(selinux_binary_policy_path) +hidden_def(selinux_binary_policy_path) const char * selinux_migscs_path(void) { return (file_paths[MIGSCS]); } -hidden_def(selinux_migscs_path) +hidden_def(selinux_migscs_path) const char * selinux_file_context_path(void) @@ -252,7 +254,7 @@ hidden_def(selinux_media_context_path) const char * -selinux_customizable_types_path(void) +selinux_customizable_types_path(void) { return (file_paths[CUSTOMIZABLE_TYPES]); } @@ -262,7 +264,7 @@ selinux_contexts_path(void) { return (file_paths[CONTEXTS_DIR]); -} +} const char * selinux_user_contexts_path(void) @@ -293,7 +295,7 @@ hidden_def(selinux_usersconf_path) const char * -selinux_translations_path() +selinux_translations_path() { return (file_paths[TRANSLATIONS]); } @@ -304,3 +306,15 @@ return (file_paths[NETFILTER_CONTEXTS]); } hidden_def(selinux_netfilter_context_path) + +const char *selinux_file_context_homedir_path() +{ + return (file_paths[FILE_CONTEXTS_HOMEDIR]); +} +hidden_def(selinux_file_context_homedir_path) + +const char *selinux_file_context_local_path() +{ + return (file_paths[FILE_CONTEXTS_LOCAL]); +} +hidden_def(selinux_file_context_local_path) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux.py#3 (text+ko) ==== @@ -54,6 +54,8 @@ setfscreatecon = _selinux.setfscreatecon getkeycreatecon = _selinux.getkeycreatecon setkeycreatecon = _selinux.setkeycreatecon +getsockcreatecon = _selinux.getsockcreatecon +setsockcreatecon = _selinux.setsockcreatecon getfilecon = _selinux.getfilecon lgetfilecon = _selinux.lgetfilecon fgetfilecon = _selinux.fgetfilecon @@ -89,6 +91,8 @@ selinux_default_context_path = _selinux.selinux_default_context_path selinux_user_contexts_path = _selinux.selinux_user_contexts_path selinux_file_context_path = _selinux.selinux_file_context_path +selinux_file_context_homedir_path = _selinux.selinux_file_context_homedir_path +selinux_file_context_local_path = _selinux.selinux_file_context_local_path selinux_homedir_context_path = _selinux.selinux_homedir_context_path selinux_media_context_path = _selinux.selinux_media_context_path selinux_contexts_path = _selinux.selinux_contexts_path ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_config.c#3 (text+ko) ==== @@ -36,7 +36,9 @@ #define SEUSERS 13 #define TRANSLATIONS 14 #define NETFILTER_CONTEXTS 15 -#define NEL 16 +#define FILE_CONTEXTS_HOMEDIR 16 +#define FILE_CONTEXTS_LOCAL 17 +#define NEL 18 /* New layout is relative to SELINUXDIR/policytype. */ static char *file_paths[NEL]; @@ -392,3 +394,17 @@ } hidden_def(selinux_netfilter_context_path) + +const char *selinux_file_context_homedir_path() +{ + return get_path(FILE_CONTEXTS_HOMEDIR); +} + +hidden_def(selinux_file_context_homedir_path) + +const char *selinux_file_context_local_path() +{ + return get_path(FILE_CONTEXTS_LOCAL); +} + +hidden_def(selinux_file_context_local_path) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_internal.h#3 (text+ko) ==== @@ -44,8 +44,10 @@ hidden_proto(setexeccon_raw) hidden_proto(getfscreatecon_raw) hidden_proto(getkeycreatecon_raw) + hidden_proto(getsockcreatecon_raw) hidden_proto(setfscreatecon_raw) hidden_proto(setkeycreatecon_raw) + hidden_proto(setsockcreatecon_raw) hidden_proto(security_getenforce) hidden_proto(security_setenforce) hidden_proto(selinux_binary_policy_path) @@ -54,6 +56,8 @@ hidden_proto(selinux_failsafe_context_path) hidden_proto(selinux_removable_context_path) hidden_proto(selinux_file_context_path) + hidden_proto(selinux_file_context_homedir_path) + hidden_proto(selinux_file_context_local_path) hidden_proto(selinux_netfilter_context_path) hidden_proto(selinux_homedir_context_path) hidden_proto(selinux_user_contexts_path) @@ -75,11 +79,3 @@ extern int require_seusers hidden; extern int selinux_page_size hidden; extern int cache_trans hidden; - -/* Generic /proc pid attr handlers. These will either get or set the context - from or into the proc location passed to them. */ -extern int hidden getprocattrcon(security_context_t * con, const char *path); -extern int hidden getprocattrcon_raw(security_context_t * con, - const char *path); -extern int hidden setprocattrcon(security_context_t con, const char *path); -extern int hidden setprocattrcon_raw(security_context_t con, const char *path); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig.i#3 (text+ko) ==== @@ -54,6 +54,8 @@ extern int setfscreatecon(security_context_t context); extern int getkeycreatecon(security_context_t *con); extern int setkeycreatecon(security_context_t context); +extern int getsockcreatecon(security_context_t *con); +extern int setsockcreatecon(security_context_t context); extern int getfilecon(const char *path, security_context_t *con); extern int lgetfilecon(const char *path, security_context_t *con); extern int fgetfilecon(int fd, security_context_t *con); @@ -99,6 +101,8 @@ extern const char *selinux_default_context_path(void); extern const char *selinux_user_contexts_path(void); extern const char *selinux_file_context_path(void); +extern const char *selinux_file_context_homedir_path(void); +extern const char *selinux_file_context_local_path(void); extern const char *selinux_homedir_context_path(void); extern const char *selinux_media_context_path(void); extern const char *selinux_contexts_path(void); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig_wrap.c#3 (text+ko) ==== @@ -3064,6 +3064,50 @@ } +SWIGINTERN PyObject *_wrap_getsockcreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; + security_context_t temp1 ; + char *temp10 ; + + { + arg1 = &temp1; + } + if (!PyArg_ParseTuple(args,(char *)":getsockcreatecon")) SWIG_fail; + result = (int)getsockcreatecon(arg1); + resultobj = SWIG_From_int((int)(result)); + { + if (*arg1) + temp10 = *arg1; + else + temp10 = ""; + resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10)); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_setsockcreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + security_context_t arg1 ; + int result; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:setsockcreatecon",&obj0)) SWIG_fail; + { + arg1 = (security_context_t)PyString_AsString(obj0); + } + result = (int)setsockcreatecon(arg1); + resultobj = SWIG_From_int((int)(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_getfilecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -3878,6 +3922,32 @@ } +SWIGINTERN PyObject *_wrap_selinux_file_context_homedir_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)":selinux_file_context_homedir_path")) SWIG_fail; + result = (char *)selinux_file_context_homedir_path(); + resultobj = SWIG_FromCharPtr(result); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_selinux_file_context_local_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)":selinux_file_context_local_path")) SWIG_fail; + result = (char *)selinux_file_context_local_path(); + resultobj = SWIG_FromCharPtr(result); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_selinux_homedir_context_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *result = 0 ; @@ -4285,6 +4355,8 @@ { (char *)"setfscreatecon", _wrap_setfscreatecon, METH_VARARGS, NULL}, { (char *)"getkeycreatecon", _wrap_getkeycreatecon, METH_VARARGS, NULL}, { (char *)"setkeycreatecon", _wrap_setkeycreatecon, METH_VARARGS, NULL}, + { (char *)"getsockcreatecon", _wrap_getsockcreatecon, METH_VARARGS, NULL}, + { (char *)"setsockcreatecon", _wrap_setsockcreatecon, METH_VARARGS, NULL}, { (char *)"getfilecon", _wrap_getfilecon, METH_VARARGS, NULL}, { (char *)"lgetfilecon", _wrap_lgetfilecon, METH_VARARGS, NULL}, { (char *)"fgetfilecon", _wrap_fgetfilecon, METH_VARARGS, NULL}, @@ -4318,6 +4390,8 @@ { (char *)"selinux_default_context_path", _wrap_selinux_default_context_path, METH_VARARGS, NULL}, { (char *)"selinux_user_contexts_path", _wrap_selinux_user_contexts_path, METH_VARARGS, NULL}, { (char *)"selinux_file_context_path", _wrap_selinux_file_context_path, METH_VARARGS, NULL}, + { (char *)"selinux_file_context_homedir_path", _wrap_selinux_file_context_homedir_path, METH_VARARGS, NULL}, + { (char *)"selinux_file_context_local_path", _wrap_selinux_file_context_local_path, METH_VARARGS, NULL}, { (char *)"selinux_homedir_context_path", _wrap_selinux_homedir_context_path, METH_VARARGS, NULL}, { (char *)"selinux_media_context_path", _wrap_selinux_media_context_path, METH_VARARGS, NULL}, { (char *)"selinux_contexts_path", _wrap_selinux_contexts_path, METH_VARARGS, NULL}, From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:46:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B07E16A4EE; Thu, 7 Sep 2006 13:46:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1C8916A4DD for ; Thu, 7 Sep 2006 13:46:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10A5A43D8D for ; Thu, 7 Sep 2006 13:45:30 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DjTqV016642 for ; Thu, 7 Sep 2006 13:45:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DjTW9016639 for perforce@freebsd.org; Thu, 7 Sep 2006 13:45:29 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:45:29 GMT Message-Id: <200609071345.k87DjTW9016639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:46:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=105786 Change 105786 by millert@millert_g5tower on 2006/09/07 13:44:32 Update to libsepol_1_12_26 from sourceforge svn Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avtab.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/context.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/expand.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/mls_types.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avrule_block.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/users.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/write.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/debug.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/helpers.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/helpers.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/libsepol-tests.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/refpolicy-base.conf#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/support/misc_macros.spt#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-cond/refpolicy-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/base-metreq.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/base-notmetreq.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-attr-global.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-attr-opt.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-bool-global.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-bool-opt.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-obj-global.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-obj-opt.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-perm-global.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-perm-opt.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-role-global.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-role-opt.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-type-global.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/modreq-type-opt.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/module.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-deps/small-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/alias-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/alias-module.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/base-base-only.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/module.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/role-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/role-module.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/small-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/user-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-expander/user-module.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-hooks/cmp_policy.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-hooks/module_add_role_allow_trans.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-hooks/module_add_symbols.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-hooks/small-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-linker/module1.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-linker/module2.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/test-linker/small-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-common.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-common.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-deps.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-deps.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander-attr-map.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander-attr-map.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander-roles.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander-roles.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander-users.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander-users.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-expander.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker-cond-map.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker-cond-map.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker-roles.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker-roles.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker-types.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker-types.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-linker.h#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,14 @@ +1.12.26 2006-09-05 + * Merged range transition enhancements and user format changes + Darrel Goeddel + +1.12.25 2006-08-24 + * Merged conditionally expand neverallows patch from Jeremy Mowery. + * Merged refactor expander patch from Jeremy Mowery. + +1.12.24 2006-08-03 + * Merged libsepol unit tests from Joshua Brindle. + 1.12.23 2006-08-03 * Merged symtab datum patch from Karl MacMillan. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12.23 +1.12.26 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avtab.h#3 (text+ko) ==== @@ -45,6 +45,7 @@ #define AVTAB_ALLOWED 1 #define AVTAB_AUDITALLOW 2 #define AVTAB_AUDITDENY 4 +#define AVTAB_NEVERALLOW 128 #define AVTAB_AV (AVTAB_ALLOWED | AVTAB_AUDITALLOW | AVTAB_AUDITDENY) #define AVTAB_TRANSITION 16 #define AVTAB_MEMBER 32 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/context.h#3 (text+ko) ==== @@ -36,8 +36,7 @@ static inline void mls_context_init(context_struct_t * c) { - mls_level_init(&c->range.level[0]); - mls_level_init(&c->range.level[1]); + mls_range_init(&c->range); } static inline int mls_context_cpy(context_struct_t * dst, @@ -62,8 +61,7 @@ if (c == NULL) return; - mls_level_destroy(&c->range.level[0]); - mls_level_destroy(&c->range.level[1]); + mls_range_destroy(&c->range); mls_context_init(c); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/expand.h#3 (text+ko) ==== @@ -29,6 +29,24 @@ #include #include +/* + * Expand only the avrules for a module. It is valid for this function to + * expand base into itself (i.e. base == out); the typemap for this special + * case should map type[i] to i+1. This function optionally expands neverallow + * rules. If neverallow rules are expanded, there is no need to copy them and + * doing so could cause duplicate entries when base == out. If the neverallow + * rules are not expanded, they are just copied to the destination policy so + * that assertion checking can be performed after expand. No assertion or + * hierarchy checking is performed by this function. + */ +extern int expand_module_avrules(sepol_handle_t * handle, policydb_t * base, + policydb_t * out, uint32_t * typemap, + int verbose, int expand_neverallow); +/* + * Expand all parts of a module. Neverallow rules are not expanded (only + * copied). It is not valid to expand base into itself. If check is non-zero, + * performs hierarchy and assertion checking. + */ extern int expand_module(sepol_handle_t * handle, policydb_t * base, policydb_t * out, int verbose, int check); @@ -40,6 +58,10 @@ extern int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p, unsigned char alwaysexpand); extern int role_set_expand(role_set_t * x, ebitmap_t * r, policydb_t * p); +extern int mls_semantic_level_expand(mls_semantic_level_t *sl, mls_level_t *l, + policydb_t *p, sepol_handle_t *h); +extern int mls_semantic_range_expand(mls_semantic_range_t *sr, mls_range_t *r, + policydb_t *p, sepol_handle_t *h); extern int expand_rule(sepol_handle_t * handle, policydb_t * source_pol, avrule_t * source_rule, avtab_t * dest_avtab, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/mls_types.h#3 (text+ko) ==== @@ -32,6 +32,7 @@ #define _SEPOL_POLICYDB_MLS_TYPES_H_ #include +#include #include #include @@ -107,4 +108,46 @@ return -1; } +static inline void mls_range_init(struct mls_range *r) +{ + mls_level_init(&r->level[0]); + mls_level_init(&r->level[1]); +} + +static inline void mls_range_destroy(struct mls_range *r) +{ + mls_level_destroy(&r->level[0]); + mls_level_destroy(&r->level[1]); +} + +static inline int mls_range_eq(struct mls_range *r1, struct mls_range *r2) +{ + return (mls_level_eq(&r1->level[0], &r2->level[0]) && + mls_level_eq(&r1->level[1], &r2->level[1])); +} + +typedef struct mls_semantic_cat { + uint32_t low; /* first bit this struct represents */ + uint32_t high; /* last bit represented - equals low for a single cat */ + struct mls_semantic_cat *next; +} mls_semantic_cat_t; + +typedef struct mls_semantic_level { + uint32_t sens; + mls_semantic_cat_t *cat; +} mls_semantic_level_t; + +typedef struct mls_semantic_range { + mls_semantic_level_t level[2]; +} mls_semantic_range_t; + +extern void mls_semantic_cat_init(mls_semantic_cat_t *c); +extern void mls_semantic_cat_destroy(mls_semantic_cat_t *c); +extern void mls_semantic_level_init(mls_semantic_level_t *l); +extern void mls_semantic_level_destroy(mls_semantic_level_t *l); +extern int mls_semantic_level_cpy(mls_semantic_level_t *dst, mls_semantic_level_t *src); +extern void mls_semantic_range_init(mls_semantic_range_t *r); +extern void mls_semantic_range_destroy(mls_semantic_range_t *r); +extern int mls_semantic_range_cpy(mls_semantic_range_t *dst, mls_semantic_range_t *src); + #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#3 (text+ko) ==== @@ -65,6 +65,10 @@ #define ERRMSG_LEN 1024 +#define POLICYDB_SUCCESS 0 +#define POLICYDB_ERROR -1 +#define POLICYDB_UNSUPPORTED -2 + /* * A datum type is defined for each kind of symbol * in the configuration data: individual permissions, @@ -145,9 +149,11 @@ typedef struct user_datum { symtab_datum_t s; role_set_t roles; /* set of authorized roles for user */ - mls_range_t range; /* MLS range (min. - max.) for user */ - mls_level_t dfltlevel; /* default login MLS level for user */ + mls_semantic_range_t range; /* MLS range (min. - max.) for user */ + mls_semantic_level_t dfltlevel; /* default login MLS level for user */ ebitmap_t cache; /* This is an expanded set used for context validation during parsing */ + mls_range_t exp_range; /* expanded range used for validation */ + mls_level_t exp_dfltlevel; /* expanded range used for validation */ } user_datum_t; /* Sensitivity attributes */ @@ -164,9 +170,10 @@ } cat_datum_t; typedef struct range_trans { - uint32_t dom; /* current process domain */ - uint32_t type; /* program executable type */ - mls_range_t range; /* new range */ + uint32_t source_type; + uint32_t target_type; + uint32_t target_class; + mls_range_t target_range; struct range_trans *next; } range_trans_t; @@ -194,12 +201,12 @@ #define AVRULE_AUDITALLOW 2 #define AVRULE_AUDITDENY 4 #define AVRULE_DONTAUDIT 8 -#define AVRULE_AV (AVRULE_ALLOWED | AVRULE_AUDITALLOW | AVRULE_AUDITDENY | AVRULE_DONTAUDIT) +#define AVRULE_NEVERALLOW 128 +#define AVRULE_AV (AVRULE_ALLOWED | AVRULE_AUDITALLOW | AVRULE_AUDITDENY | AVRULE_DONTAUDIT | AVRULE_NEVERALLOW) #define AVRULE_TRANSITION 16 #define AVRULE_MEMBER 32 #define AVRULE_CHANGE 64 #define AVRULE_TYPE (AVRULE_TRANSITION | AVRULE_MEMBER | AVRULE_CHANGE) -#define AVRULE_NEVERALLOW 128 uint32_t specified; #define RULE_SELF 1 uint32_t flags; @@ -224,6 +231,14 @@ struct role_allow_rule *next; } role_allow_rule_t; +typedef struct range_trans_rule { + type_set_t stypes; + type_set_t ttypes; + ebitmap_t tclasses; + mls_semantic_range_t trange; + struct range_trans_rule *next; +} range_trans_rule_t; + /* * The configuration data includes security contexts for * initial SIDs, unlabeled file systems, TCP and UDP port numbers, @@ -321,6 +336,7 @@ avrule_t *avrules; role_trans_rule_t *role_tr_rules; role_allow_rule_t *role_allow_rules; + range_trans_rule_t *range_tr_rules; scope_index_t required; /* symbols needed to activate this block */ scope_index_t declared; /* symbols declared within this block */ @@ -371,6 +387,9 @@ char *name; char *version; + /* Set when the policydb is modified such that writing is unsupported */ + int unsupported_format; + /* Whether this policydb is mls, should always be set */ int mls; @@ -506,6 +525,9 @@ extern void role_allow_rule_init(role_allow_rule_t * x); extern void role_allow_rule_destroy(role_allow_rule_t * x); extern void role_allow_rule_list_destroy(role_allow_rule_t * x); +extern void range_trans_rule_init(range_trans_rule_t *x); +extern void range_trans_rule_destroy(range_trans_rule_t *x); +extern void range_trans_rule_list_destroy(range_trans_rule_t *x); extern void type_datum_init(type_datum_t * x); extern void type_datum_destroy(type_datum_t * x); extern void user_datum_init(user_datum_t * x); @@ -555,18 +577,21 @@ #define POLICYDB_VERSION_VALIDATETRANS 19 #define POLICYDB_VERSION_MLS 19 #define POLICYDB_VERSION_AVTAB 20 +#define POLICYDB_VERSION_RANGETRANS 21 /* Range of policy versions we understand*/ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE -#define POLICYDB_VERSION_MAX POLICYDB_VERSION_AVTAB +#define POLICYDB_VERSION_MAX POLICYDB_VERSION_RANGETRANS /* Module versions and specific changes*/ #define MOD_POLICYDB_VERSION_BASE 4 #define MOD_POLICYDB_VERSION_VALIDATETRANS 5 #define MOD_POLICYDB_VERSION_MLS 5 +#define MOD_POLICYDB_VERSION_RANGETRANS 6 +#define MOD_POLICYDB_VERSION_MLS_USERS 6 #define MOD_POLICYDB_VERSION_MIN MOD_POLICYDB_VERSION_BASE -#define MOD_POLICYDB_VERSION_MAX MOD_POLICYDB_VERSION_MLS +#define MOD_POLICYDB_VERSION_MAX MOD_POLICYDB_VERSION_MLS_USERS #define POLICYDB_CONFIG_MLS 1 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avrule_block.c#3 (text+ko) ==== @@ -99,6 +99,7 @@ avrule_list_destroy(x->avrules); role_trans_rule_list_destroy(x->role_tr_rules); role_allow_rule_list_destroy(x->role_allow_rules); + range_trans_rule_list_destroy(x->range_tr_rules); scope_index_destroy(&x->required); scope_index_destroy(&x->declared); symtabs_destroy(x->symtab); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#3 (text+ko) ==== @@ -41,8 +41,14 @@ policydb_t *base; policydb_t *out; sepol_handle_t *handle; + int expand_neverallow; } expand_state_t; +static void expand_state_init(expand_state_t * state) +{ + memset(state, 0, sizeof(expand_state_t)); +} + static int type_copy_callback(hashtab_key_t key, hashtab_datum_t datum, void *data) { @@ -574,12 +580,64 @@ return 0; } -static int mls_level_clone(mls_level_t * dst, mls_level_t * src) +int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l, + policydb_t * p, sepol_handle_t * h) +{ + mls_semantic_cat_t *cat; + level_datum_t *levdatum; + unsigned int i; + + mls_level_init(l); + + if (!p->mls) + return 0; + + l->sens = sl->sens; + levdatum = (level_datum_t *) hashtab_search(p->p_levels.table, + p->p_sens_val_to_name[l-> + sens - + 1]); + for (cat = sl->cat; cat; cat = cat->next) { + if (cat->low > cat->high) { + ERR(h, "Category range is not valid %s.%s", + p->p_cat_val_to_name[cat->low - 1], + p->p_cat_val_to_name[cat->high - 1]); + return -1; + } + for (i = cat->low - 1; i < cat->high; i++) { + if (!ebitmap_get_bit(&levdatum->level->cat, i)) { + ERR(h, "Category %s can not be associate with " + "level %s", + p->p_cat_val_to_name[i], + p->p_sens_val_to_name[l->sens - 1]); + } + if (ebitmap_set_bit(&l->cat, i, 1)) { + ERR(h, "Out of memory!"); + return -1; + } + } + } + + return 0; +} + +int mls_semantic_range_expand(mls_semantic_range_t * sr, mls_range_t * r, + policydb_t * p, sepol_handle_t * h) { - dst->sens = src->sens; - if (ebitmap_cpy(&dst->cat, &src->cat)) { + if (mls_semantic_level_expand(&sr->level[0], &r->level[0], p, h) < 0) + return -1; + + if (mls_semantic_level_expand(&sr->level[1], &r->level[1], p, h) < 0) { + mls_semantic_level_destroy(&sr->level[0]); + return -1; + } + + if (!mls_level_dom(&r->level[1], &r->level[0])) { + mls_range_destroy(r); + ERR(h, "MLS range high level does not dominate low level"); return -1; } + return 0; } @@ -634,16 +692,46 @@ return -1; } - /* clone MLS stuff */ - if (mls_level_clone - (&new_user->range.level[0], &user->range.level[0]) == -1 - || mls_level_clone(&new_user->range.level[1], - &user->range.level[1]) == -1 - || mls_level_clone(&new_user->dfltlevel, - &user->dfltlevel) == -1) { - ERR(state->handle, "Out of memory!"); + /* expand the semantic MLS info */ + if (mls_semantic_range_expand(&user->range, + &new_user->exp_range, + state->out, state->handle)) { + return -1; + } + if (mls_semantic_level_expand(&user->dfltlevel, + &new_user->exp_dfltlevel, + state->out, state->handle)) { + return -1; + } + if (!mls_level_between(&new_user->exp_dfltlevel, + &new_user->exp_range.level[0], + &new_user->exp_range.level[1])) { + ERR(state->handle, "default level not within user " + "range"); + return -1; + } + } else { + /* require that the MLS info match */ + mls_range_t tmp_range; + mls_level_t tmp_level; + + if (mls_semantic_range_expand(&user->range, &tmp_range, + state->out, state->handle)) { + return -1; + } + if (mls_semantic_level_expand(&user->dfltlevel, &tmp_level, + state->out, state->handle)) { + mls_range_destroy(&tmp_range); + return -1; + } + if (!mls_range_eq(&new_user->exp_range, &tmp_range) || + !mls_level_eq(&new_user->exp_dfltlevel, &tmp_level)) { + mls_range_destroy(&tmp_range); + mls_level_destroy(&tmp_level); return -1; } + mls_range_destroy(&tmp_range); + mls_level_destroy(&tmp_level); } ebitmap_init(&tmp_union); @@ -733,7 +821,7 @@ } if (state->verbose) - INFO(state->handle, "copying senitivity level %s", id); + INFO(state->handle, "copying sensitivity level %s", id); if ((new_level = (level_datum_t *) calloc(1, sizeof(*new_level))) == NULL @@ -743,7 +831,7 @@ goto out_of_mem; } - if (mls_level_clone(new_level->level, level->level)) { + if (mls_level_cpy(new_level->level, level->level)) { goto out_of_mem; } new_level->isalias = level->isalias; @@ -958,6 +1046,131 @@ return 0; } +static int exp_rangetr_helper(uint32_t stype, uint32_t ttype, uint32_t tclass, + mls_semantic_range_t * trange, + expand_state_t * state) +{ + range_trans_t *rt, *check_rt = state->out->range_tr; + mls_range_t exp_range; + int rc = -1; + + if (mls_semantic_range_expand(trange, &exp_range, state->out, + state->handle)) + goto out; + + /* check for duplicates/conflicts */ + while (check_rt) { + if ((check_rt->source_type == stype) && + (check_rt->target_type == ttype) && + (check_rt->target_class == tclass)) { + if (mls_range_eq(&check_rt->target_range, &exp_range)) { + /* duplicate */ + break; + } else { + /* conflict */ + ERR(state->handle, + "Conflicting range trans rule %s %s : %s", + state->out->p_type_val_to_name[stype - 1], + state->out->p_type_val_to_name[ttype - 1], + state->out->p_class_val_to_name[tclass - + 1]); + goto out; + } + } + check_rt = check_rt->next; + } + if (check_rt) { + /* this is a dup - skip */ + rc = 0; + goto out; + } + + rt = (range_trans_t *) calloc(1, sizeof(range_trans_t)); + if (!rt) { + ERR(state->handle, "Out of memory!"); + goto out; + } + + rt->next = state->out->range_tr; + state->out->range_tr = rt; + + rt->source_type = stype; + rt->target_type = ttype; + rt->target_class = tclass; + if (mls_range_cpy(&rt->target_range, &exp_range)) { + ERR(state->handle, "Out of memory!"); + goto out; + } + + rc = 0; + + out: + mls_range_destroy(&exp_range); + return rc; +} + +static int expand_range_trans(expand_state_t * state, + range_trans_rule_t * rules) +{ + unsigned int i, j, k; + range_trans_rule_t *rule; + + ebitmap_t stypes, ttypes; + ebitmap_node_t *snode, *tnode, *cnode; + + if (state->verbose) + INFO(state->handle, "expanding range transitions"); + + for (rule = rules; rule; rule = rule->next) { + ebitmap_init(&stypes); + ebitmap_init(&ttypes); + + /* expand the type sets */ + if (expand_convert_type_set(state->out, state->typemap, + &rule->stypes, &stypes, 1)) { + ERR(state->handle, "Out of memory!"); + return -1; + } + if (expand_convert_type_set(state->out, state->typemap, + &rule->ttypes, &ttypes, 1)) { + ebitmap_destroy(&stypes); + ERR(state->handle, "Out of memory!"); + return -1; + } + + /* loop on source type */ + ebitmap_for_each_bit(&stypes, snode, i) { + if (!ebitmap_node_get_bit(snode, i)) + continue; + /* loop on target type */ + ebitmap_for_each_bit(&ttypes, tnode, j) { + if (!ebitmap_node_get_bit(tnode, j)) + continue; + /* loop on target class */ + ebitmap_for_each_bit(&rule->tclasses, cnode, k) { + if (!ebitmap_node_get_bit(cnode, k)) + continue; + + if (exp_rangetr_helper(i + 1, + j + 1, + k + 1, + &rule->trange, + state)) { + ebitmap_destroy(&stypes); + ebitmap_destroy(&ttypes); + return -1; + } + } + } + } + + ebitmap_destroy(&stypes); + ebitmap_destroy(&ttypes); + } + + return 0; +} + /* Search for an AV tab node within a hash table with the given key. * If the node does not exist, create it and return it; otherwise * return the pre-existing one. @@ -1007,6 +1220,10 @@ return node; } +#define EXPAND_RULE_SUCCESS 1 +#define EXPAND_RULE_CONFLICT 0 +#define EXPAND_RULE_ERROR -1 + static int expand_terule_helper(sepol_handle_t * handle, policydb_t * p, uint32_t * typemap, uint32_t specified, cond_av_list_t ** cond, @@ -1069,7 +1286,7 @@ * or in same conditional then ignore it */ if ((conflict == 1 && cond == NULL) || node->parse_context == cond) - return 1; + return EXPAND_RULE_SUCCESS; ERR(handle, "duplicate TE rule for %s %s:%s %s", p->p_type_val_to_name[avkey.source_type - 1], @@ -1078,7 +1295,7 @@ p->p_class_val_to_name[avkey.target_class - 1], p->p_type_val_to_name[oldtype - 1]); - return 0; + return EXPAND_RULE_CONFLICT; } ERR(handle, "conflicting TE rule for (%s, %s:%s): old was %s, new is %s", @@ -1087,7 +1304,7 @@ p->p_class_val_to_name[avkey.target_class - 1], p->p_type_val_to_name[oldtype - 1], p->p_type_val_to_name[remapped_data - 1]); - return 0; + return EXPAND_RULE_CONFLICT; } node = find_avtab_node(handle, avtab, &avkey, cond); @@ -1113,7 +1330,7 @@ cur = cur->next; } - return 1; + return EXPAND_RULE_SUCCESS; } static int expand_avrule_helper(sepol_handle_t * handle, @@ -1137,6 +1354,8 @@ spec = AVTAB_AUDITDENY; } else if (specified & AVRULE_DONTAUDIT) { spec = AVTAB_AUDITDENY; + } else if (specified & AVRULE_NEVERALLOW) { + spec = AVTAB_NEVERALLOW; } else { assert(0); /* unreachable */ } @@ -1150,7 +1369,7 @@ node = find_avtab_node(handle, avtab, &avkey, cond); if (!node) - return -1; + return EXPAND_RULE_ERROR; if (enabled) { node->key.specified |= AVTAB_ENABLED; } else { @@ -1162,6 +1381,8 @@ avdatump->data |= cur->data; } else if (specified & AVRULE_AUDITALLOW) { avdatump->data |= cur->data; + } else if (specified & AVRULE_NEVERALLOW) { + avdatump->data |= cur->data; } else if (specified & AVRULE_AUDITDENY) { /* Since a '0' in an auditdeny mask represents * a permission we do NOT want to audit @@ -1182,7 +1403,7 @@ cur = cur->next; } - return 1; + return EXPAND_RULE_SUCCESS; } static int expand_rule_helper(sepol_handle_t * handle, @@ -1207,7 +1428,8 @@ specified, cond, i, i, source_rule->perms, dest_avtab, - enabled)) != 1) { + enabled)) != + EXPAND_RULE_SUCCESS) { return retval; } } else { @@ -1219,7 +1441,8 @@ other, i, i, source_rule->perms, dest_avtab, - enabled)) != 1) { + enabled)) != + EXPAND_RULE_SUCCESS) { return retval; } } @@ -1234,7 +1457,8 @@ specified, cond, i, j, source_rule->perms, dest_avtab, - enabled)) != 1) { + enabled)) != + EXPAND_RULE_SUCCESS) { return retval; } } else { @@ -1246,32 +1470,36 @@ other, i, j, source_rule->perms, dest_avtab, - enabled)) != 1) { + enabled)) != + EXPAND_RULE_SUCCESS) { return retval; } } } } - return 1; + return EXPAND_RULE_SUCCESS; } -/* Expand a rule into a given avtab - checking for conflicting type - * rules in the destination policy. Return 1 on success, 0 if the - * rule conflicts with something (and hence was not added), or -1 on - * error. */ +/* + * Expand a rule into a given avtab - checking for conflicting type + * rules in the destination policy. Return EXPAND_RULE_SUCCESS on + * success, EXPAND_RULE_CONFLICT if the rule conflicts with something + * (and hence was not added), or EXPAND_RULE_ERROR on error. + */ static int convert_and_expand_rule(sepol_handle_t * handle, policydb_t * dest_pol, uint32_t * typemap, avrule_t * source_rule, avtab_t * dest_avtab, cond_av_list_t ** cond, - cond_av_list_t ** other, int enabled) + cond_av_list_t ** other, int enabled, + int do_neverallow) { int retval; ebitmap_t stypes, ttypes; unsigned char alwaysexpand; - if (source_rule->specified & AVRULE_NEVERALLOW) - return 1; + if (!do_neverallow && source_rule->specified & AVRULE_NEVERALLOW) + return EXPAND_RULE_SUCCESS; ebitmap_init(&stypes); ebitmap_init(&ttypes); @@ -1282,10 +1510,10 @@ if (expand_convert_type_set (dest_pol, typemap, &source_rule->stypes, &stypes, alwaysexpand)) - return -1; + return EXPAND_RULE_ERROR; if (expand_convert_type_set (dest_pol, typemap, &source_rule->ttypes, &ttypes, alwaysexpand)) - return -1; + return EXPAND_RULE_ERROR; retval = expand_rule_helper(handle, dest_pol, typemap, source_rule, dest_avtab, @@ -1306,7 +1534,8 @@ while (cur) { if (convert_and_expand_rule(state->handle, dest_pol, typemap, cur, dest_avtab, - list, other, enabled) != 1) { + list, other, enabled, + 0) != EXPAND_RULE_SUCCESS) { return -1; } @@ -1486,49 +1715,6 @@ return 0; } -static int range_trans_clone(expand_state_t * state) -{ - range_trans_t *range = state->base->range_tr, *last_new_range = NULL, - *new_range = NULL; - state->out->range_tr = NULL; - - if (state->verbose) - INFO(state->handle, "copying range transitions"); - - while (range != NULL) { - if ((new_range = malloc(sizeof(*new_range))) == NULL) { - goto out_of_mem; - } - memset(new_range, 0, sizeof(*new_range)); - new_range->dom = state->typemap[range->dom - 1]; - new_range->type = state->typemap[range->type - 1]; - if (mls_level_clone - (&new_range->range.level[0], &range->range.level[0]) == -1 - || mls_level_clone(&new_range->range.level[1], - &range->range.level[1])) { - goto out_of_mem; - } - new_range->next = NULL; - if (last_new_range == NULL) { - state->out->range_tr = last_new_range = new_range; - } else { - last_new_range->next = new_range; - last_new_range = new_range; - } - range = range->next; - } - return 0; - - out_of_mem: - ERR(state->handle, "Out of memory!"); - if (new_range) { - ebitmap_destroy(&new_range->range.level[0].cat); - ebitmap_destroy(&new_range->range.level[1].cat); - free(new_range); - } - return -1; -} - static int type_attr_map(hashtab_key_t key __attribute__ ((unused)), hashtab_datum_t datum, void *ptr) @@ -1884,6 +2070,97 @@ return -1; } +/* + * Expands the avrule blocks for a policy. RBAC rules are copied. Neverallow + * rules are copied or expanded as per the settings in the state object; all + * other AV rules are expanded. If neverallow rules are expanded, they are not + * copied, otherwise they are copied for later use by the assertion checker. + */ +static int copy_and_expand_avrule_block(expand_state_t * state) +{ + avrule_block_t *curblock; + int retval = -1; + + for (curblock = state->base->global; curblock != NULL; + curblock = curblock->next) { + avrule_decl_t *decl = curblock->enabled; + avrule_t *cur_avrule; + + if (decl == NULL) { + /* nothing was enabled within this block */ + continue; + } + + /* copy role allows and role trans */ + if (copy_role_allows(state, decl->role_allow_rules) != 0 || + copy_role_trans(state, decl->role_tr_rules) != 0) { + goto cleanup; + } + + /* expand the range transition rules */ + if (expand_range_trans(state, decl->range_tr_rules)) + goto cleanup; + + /* copy rules */ + cur_avrule = decl->avrules; + while (cur_avrule != NULL) { + if (!(state->expand_neverallow) + && cur_avrule->specified & AVRULE_NEVERALLOW) { + /* copy this over directly so that assertions are checked later */ + if (copy_neverallow + (state->out, state->typemap, cur_avrule)) + ERR(state->handle, + "Error while copying neverallow."); + } else { + if (cur_avrule->specified & AVRULE_NEVERALLOW) { + state->out->unsupported_format = 1; + } + if (convert_and_expand_rule + (state->handle, state->out, state->typemap, + cur_avrule, &state->out->te_avtab, NULL, + NULL, 0, + state->expand_neverallow) != + EXPAND_RULE_SUCCESS) { + goto cleanup; + } + } + cur_avrule = cur_avrule->next; + } + + /* copy conditional rules */ + if (cond_node_copy(state, decl->cond_list)) + goto cleanup; + } + + retval = 0; + + cleanup: + return retval; +} + +/* + * This function allows external users of the library (such as setools) to + * expand only the avrules and optionally perform expansion of neverallow rules + * or expand into the same policy for analysis purposes. + */ +int expand_module_avrules(sepol_handle_t * handle, policydb_t * base, + policydb_t * out, uint32_t * typemap, int verbose, + int expand_neverallow) +{ + expand_state_t state; + + expand_state_init(&state); + + state.base = base; + state.out = out; + state.typemap = typemap; + state.handle = handle; + state.verbose = verbose; + state.expand_neverallow = expand_neverallow; + + return copy_and_expand_avrule_block(&state); +} + /* Linking should always be done before calling expand, even if * there is only a base since all optionals are dealt with at link time * the base passed in should be indexed and avrule blocks should be @@ -1897,6 +2174,8 @@ expand_state_t state; avrule_block_t *curblock; + expand_state_init(&state); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:55:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 357F116A4FA; Thu, 7 Sep 2006 13:55:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8D0B16A4F5 for ; Thu, 7 Sep 2006 13:55:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2898143D78 for ; Thu, 7 Sep 2006 13:55:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DthX9017167 for ; Thu, 7 Sep 2006 13:55:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DtgZh017164 for perforce@freebsd.org; Thu, 7 Sep 2006 13:55:42 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:55:42 GMT Message-Id: <200609071355.k87DtgZh017164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:55:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=105787 Change 105787 by millert@millert_g5tower on 2006/09/07 13:54:49 Update to libsemanage_1_6_15 from sourceforge svn Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/policy_components.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,9 @@ +1.6.15 2006-08-11 + * Merged separate local file contexts patch from Chris PeBenito. + +1.6.14 2006-08-11 + * Merged patch to make most copy errors non-fatal from Dan Walsh. + 1.6.13 2006-08-03 * Merged netfilter contexts support from Chris PeBenito. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.6.13 +1.6.15 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/policy_components.c#3 (text+ko) ==== @@ -132,9 +132,6 @@ {semanage_bool_dbase_local(handle), semanage_bool_dbase_policy(handle), MODE_SET}, - {semanage_fcontext_dbase_local(handle), - semanage_fcontext_dbase_policy(handle), MODE_MODIFY}, - {semanage_seuser_dbase_local(handle), semanage_seuser_dbase_policy(handle), MODE_MODIFY}, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#3 (text+ko) ==== @@ -1005,6 +1005,8 @@ const char *active_kernel = semanage_path(SEMANAGE_ACTIVE, SEMANAGE_KERNEL); const char *active_fc = semanage_path(SEMANAGE_ACTIVE, SEMANAGE_FC); + const char *active_fc_loc = + semanage_path(SEMANAGE_ACTIVE, SEMANAGE_FC_LOCAL); const char *active_hd = semanage_path(SEMANAGE_ACTIVE, SEMANAGE_HOMEDIR_TMPL); const char *active_seusers = @@ -1012,6 +1014,7 @@ const char *active_nc = semanage_path(SEMANAGE_ACTIVE, SEMANAGE_NC); const char *running_fc = selinux_file_context_path(); + const char *running_fc_loc = selinux_file_context_local_path(); const char *running_hd = selinux_homedir_context_path(); const char *running_policy = selinux_binary_policy_path(); const char *running_seusers = selinux_usersconf_path(); @@ -1022,6 +1025,7 @@ * building code in libselinux so that you can get paths for a given * POLICYTYPE and should probably be done in the future. */ char store_fc[PATH_MAX]; + char store_fc_loc[PATH_MAX]; char store_hd[PATH_MAX]; char store_pol[PATH_MAX]; char store_seusers[PATH_MAX]; @@ -1029,6 +1033,7 @@ len = strlen(really_active_store); running_fc += len; + running_fc_loc += len; running_hd += len; running_policy += len; running_seusers += len; @@ -1051,14 +1056,23 @@ snprintf(store_hd, PATH_MAX, "%s%s", storepath, running_hd); if (semanage_copy_file(active_hd, store_hd, sh->conf->file_mode) == -1) { - ERR(sh, "Could not copy %s to %s.", active_hd, store_hd); - goto cleanup; + INFO(sh, "Non-fatal error: Could not copy %s to %s.", + active_hd, store_hd); + /* Non-fatal; fall through */ } snprintf(store_fc, PATH_MAX, "%s%s", storepath, running_fc); if (semanage_copy_file(active_fc, store_fc, sh->conf->file_mode) == -1) { - ERR(sh, "Could not copy %s to %s.", active_fc, store_fc); - goto cleanup; + INFO(sh, "Non-fatal error: Could not copy %s to %s.", + active_fc, store_fc); + /* Non-fatal; fall through */ + } + + snprintf(store_fc_loc, PATH_MAX, "%s%s", storepath, running_fc_loc); + if (semanage_copy_file(active_fc_loc, store_fc_loc, sh->conf->file_mode) == -1) { + INFO(sh, "Non-fatal error: Could not copy %s to %s.", + active_fc_loc, store_fc_loc); + /* Non-fatal; fall through */ } snprintf(store_seusers, PATH_MAX, "%s%s", storepath, running_seusers); @@ -1071,8 +1085,8 @@ snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc); if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) { - ERR(sh, "Could not copy %s to %s.", active_nc, store_nc); - goto cleanup; + INFO(sh, "Non-fatal error: Could not copy %s to %s.", active_nc, store_nc); + /* Non-fatal; fall through */ } if (!sh->do_reload) From owner-p4-projects@FreeBSD.ORG Thu Sep 7 13:57:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EF8F16A4E9; Thu, 7 Sep 2006 13:57:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E36716A4DD for ; Thu, 7 Sep 2006 13:57:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 896E643D6E for ; Thu, 7 Sep 2006 13:57:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DvkLj017316 for ; Thu, 7 Sep 2006 13:57:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87Dvk2T017312 for perforce@freebsd.org; Thu, 7 Sep 2006 13:57:46 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:57:46 GMT Message-Id: <200609071357.k87Dvk2T017312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 13:57:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=105788 Change 105788 by millert@millert_g5tower on 2006/09/07 13:56:45 Update to checkpolicy_1_30_11 from sourceforge svn Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,7 @@ +1.30.11 2006-09-05 + * merged range_transition enhancements and user module format + changes from Darrel Goeddel + 1.30.10 2006-08-03 * Merged symtab datum patch from Karl MacMillan. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.10 +1.30.11 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.c#3 (text+ko) ==== @@ -138,8 +138,9 @@ SCOPE_DECL, decl->decl_id, dest_value); if (retval == 1) { symtab_datum_t *s = - (symtab_datum_t *)hashtab_search(policydbp->symtab[symbol_type]. - table, key); + (symtab_datum_t *) hashtab_search(policydbp-> + symtab[symbol_type].table, + key); assert(s != NULL); *dest_value = s->value; } else if (retval == -2) { @@ -491,8 +492,9 @@ SCOPE_REQ, decl->decl_id, dest_value); if (retval == 1) { symtab_datum_t *s = - (symtab_datum_t *) hashtab_search(policydbp->symtab[symbol_type]. - table, key); + (symtab_datum_t *) hashtab_search(policydbp-> + symtab[symbol_type].table, + key); assert(s != NULL); *dest_value = s->value; } else if (retval == -2) { @@ -1018,7 +1020,8 @@ if (perdatum == NULL) { return 1; } - return is_perm_in_stack(perdatum->s.value, cladatum->s.value, stack_top); + return is_perm_in_stack(perdatum->s.value, cladatum->s.value, + stack_top); } cond_list_t *get_current_cond_list(cond_list_t * cond) @@ -1097,6 +1100,18 @@ decl->role_allow_rules = role_allow_rules; } +/* this doesn't actually append, but really prepends it */ +void append_range_trans(range_trans_rule_t * range_tr_rules) +{ + avrule_decl_t *decl = stack_top->decl; + + /* range transitions are not allowed within conditionals */ + assert(stack_top->type == 1); + + range_tr_rules->next = decl->range_tr_rules; + decl->range_tr_rules = range_tr_rules; +} + int begin_optional(int pass) { avrule_block_t *block = NULL; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.h#3 (text+ko) ==== @@ -77,6 +77,7 @@ void append_avrule(avrule_t * avrule); void append_role_trans(role_trans_rule_t * role_tr_rules); void append_role_allow(role_allow_rule_t * role_allow_rules); +void append_range_trans(range_trans_rule_t * range_tr_rules); /* Create a new optional block and add it to the global policy. * During the second pass resolve the block's requirements. Return 0 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#3 (text+ko) ==== @@ -101,7 +101,7 @@ static role_datum_t *merge_roles_dom(role_datum_t *r1,role_datum_t *r2); static role_datum_t *define_role_dom(role_datum_t *r); static int define_role_trans(void); -static int define_range_trans(void); +static int define_range_trans(int class_specified); static int define_role_allow(void); static int define_constraint(constraint_expr_t *expr); static int define_validatetrans(constraint_expr_t *expr); @@ -436,7 +436,9 @@ {if (define_compute_type(AVRULE_CHANGE)) return -1;} ; range_trans_def : RANGE_TRANSITION names names mls_range_def ';' - { if (define_range_trans()) return -1; } + { if (define_range_trans(0)) return -1; } + | RANGE_TRANSITION names names ':' names mls_range_def ';' + { if (define_range_trans(1)) return -1; } ; te_avtab_def : allow_def | auditallow_def @@ -3614,6 +3616,65 @@ return 0; } +static int +parse_semantic_categories(char *id, level_datum_t * levdatum, + mls_semantic_cat_t ** cats) +{ + cat_datum_t *cdatum; + mls_semantic_cat_t *newcat; + unsigned int range_start, range_end; + + if (id_has_dot(id)) { + char *id_start = id; + char *id_end = strchr(id, '.'); + + *(id_end++) = '\0'; + + cdatum = (cat_datum_t *) hashtab_search(policydbp->p_cats.table, + (hashtab_key_t) + id_start); + if (!cdatum) { + sprintf(errormsg, "unknown category %s", id_start); + yyerror(errormsg); + return -1; + } + range_start = cdatum->s.value; + + cdatum = (cat_datum_t *) hashtab_search(policydbp->p_cats.table, + (hashtab_key_t) id_end); + if (!cdatum) { + sprintf(errormsg, "unknown category %s", id_end); + yyerror(errormsg); + return -1; + } + range_end = cdatum->s.value; + } else { + cdatum = (cat_datum_t *) hashtab_search(policydbp->p_cats.table, + (hashtab_key_t) id); + if (!cdatum) { + sprintf(errormsg, "unknown category %s", id); + yyerror(errormsg); + return -1; + } + range_start = range_end = cdatum->s.value; + } + + newcat = (mls_semantic_cat_t *) malloc(sizeof(mls_semantic_cat_t)); + if (!newcat) { + yyerror("out of memory"); + return -1; + } + + mls_semantic_cat_init(newcat); + newcat->next = *cats; + newcat->low = range_start; + newcat->high = range_end; + + *cats = newcat; + + return 0; +} + static int define_user(void) { char *id; @@ -3676,11 +3737,10 @@ free(id); usrdatum->dfltlevel.sens = levdatum->level->sens; - ebitmap_init(&usrdatum->dfltlevel.cat); while ((id = queue_remove(id_queue))) { - if (parse_categories(id, levdatum, - &usrdatum->dfltlevel.cat)) { + if (parse_semantic_categories(id, levdatum, + &usrdatum->dfltlevel.cat)) { free(id); return -1; } @@ -3702,13 +3762,12 @@ return -1; } free(id); + usrdatum->range.level[l].sens = levdatum->level->sens; - ebitmap_init(&usrdatum->range.level[l].cat); while ((id = queue_remove(id_queue))) { - if (parse_categories(id, levdatum, - &usrdatum->range.level[l]. - cat)) { + if (parse_semantic_categories(id, levdatum, + &usrdatum->range.level[l].cat)) { free(id); return -1; } @@ -3721,33 +3780,14 @@ } if (l == 0) { - usrdatum->range.level[1].sens = - usrdatum->range.level[0].sens; - if (ebitmap_cpy(&usrdatum->range.level[1].cat, - &usrdatum->range.level[0].cat)) { + if (mls_semantic_level_cpy(&usrdatum->range.level[1], + &usrdatum->range.level[0])) { yyerror("out of memory"); - goto out; + return -1; } } - if (!mls_level_dom(&usrdatum->range.level[1], - &usrdatum->range.level[0])) { - yyerror("high level does not dominate low level"); - goto out; - } - if (!mls_level_between(&usrdatum->dfltlevel, - &usrdatum->range.level[0], - &usrdatum->range.level[1])) { - yyerror("default level not within user range"); - goto out; - } } return 0; - - out: - ebitmap_destroy(&usrdatum->dfltlevel.cat); - ebitmap_destroy(&usrdatum->range.level[0].cat); - ebitmap_destroy(&usrdatum->range.level[1].cat); - return -1; } static int parse_security_context(context_struct_t * c) @@ -4472,15 +4512,12 @@ return define_genfs_context_helper(queue_remove(id_queue), has_type); } -static int define_range_trans(void) +static int define_range_trans(int class_specified) { char *id; level_datum_t *levdatum = 0; - mls_range_t range; - type_set_t doms, types; - ebitmap_node_t *snode, *tnode; - range_trans_t *rt = 0; - unsigned int i, j; + class_datum_t *cladatum; + range_trans_rule_t *rule; int l, add = 1; if (!mlspol) { @@ -4493,6 +4530,9 @@ free(id); while ((id = queue_remove(id_queue))) free(id); + if (class_specified) + while ((id = queue_remove(id_queue))) + free(id); id = queue_remove(id_queue); free(id); for (l = 0; l < 2; l++) { @@ -4507,43 +4547,79 @@ return 0; } - type_set_init(&doms); - type_set_init(&types); + rule = malloc(sizeof(struct range_trans_rule)); + if (!rule) { + yyerror("out of memory"); + return -1; + } + range_trans_rule_init(rule); while ((id = queue_remove(id_queue))) { - if (set_types(&doms, id, &add, 0)) - return -1; + if (set_types(&rule->stypes, id, &add, 0)) + goto out; } add = 1; while ((id = queue_remove(id_queue))) { - if (set_types(&types, id, &add, 0)) - return -1; + if (set_types(&rule->ttypes, id, &add, 0)) + goto out; + } + + if (class_specified) { + while ((id = queue_remove(id_queue))) { + if (!is_id_in_scope(SYM_CLASSES, id)) { + yyerror2("class %s is not within scope", id); + free(id); + goto out; + } + cladatum = hashtab_search(policydbp->p_classes.table, + id); + if (!cladatum) { + sprintf(errormsg, "unknown class %s", id); + yyerror(errormsg); + goto out; + } + + ebitmap_set_bit(&rule->tclasses, cladatum->s.value - 1, + TRUE); + free(id); + } + } else { + cladatum = hashtab_search(policydbp->p_classes.table, + "process"); + if (!cladatum) { + sprintf(errormsg, "could not find process class for " + "legacy range_transition statement\n"); + yyerror(errormsg); + goto out; + } + + ebitmap_set_bit(&rule->tclasses, cladatum->s.value - 1, TRUE); } id = (char *)queue_remove(id_queue); if (!id) { yyerror("no range in range_transition definition?"); - return -1; + goto out; } for (l = 0; l < 2; l++) { levdatum = hashtab_search(policydbp->p_levels.table, id); if (!levdatum) { sprintf(errormsg, - "unknown level %s used in range_transition definition", - id); + "unknown level %s used in range_transition " + "definition", id); yyerror(errormsg); free(id); - return -1; + goto out; } free(id); - range.level[l].sens = levdatum->level->sens; - ebitmap_init(&range.level[l].cat); + rule->trange.level[l].sens = levdatum->level->sens; while ((id = queue_remove(id_queue))) { - if (parse_categories(id, levdatum, &range.level[l].cat)) { + if (parse_semantic_categories(id, levdatum, + &rule->trange.level[l].cat)) { free(id); - return -1; + goto out; } free(id); } @@ -4553,73 +4629,19 @@ break; } if (l == 0) { - range.level[1].sens = range.level[0].sens; - if (ebitmap_cpy(&range.level[1].cat, &range.level[0].cat)) { + if (mls_semantic_level_cpy(&rule->trange.level[1], + &rule->trange.level[0])) { yyerror("out of memory"); - return -1; + goto out; } } - if (!mls_level_dom(&range.level[1], &range.level[0])) { - yyerror - ("range_transition high level does not dominate low level"); - return -1; - } + append_range_trans(rule); + return 0; - /* FIXME: this expands type_sets at compile time which is inappropriate, the type_sets - * should be stored which is a format change */ - ebitmap_for_each_bit(&doms.types, snode, i) { - if (!ebitmap_node_get_bit(snode, i)) - continue; - ebitmap_for_each_bit(&types.types, tnode, j) { - if (!ebitmap_node_get_bit(tnode, j)) - continue; - - for (rt = policydbp->range_tr; rt; rt = rt->next) { - if (rt->dom == (i + 1) && rt->type == (j + 1)) { - sprintf(errormsg, - "duplicate range_transition defined for (%s,%s)", - policydbp-> - p_type_val_to_name[i], - policydbp-> - p_type_val_to_name[j]); - yyerror(errormsg); - return -1; - } - } - - rt = malloc(sizeof(range_trans_t)); - if (!rt) { - yyerror("out of memory"); - return -1; - } - memset(rt, 0, sizeof(range_trans_t)); - rt->dom = i + 1; - rt->type = j + 1; - rt->range.level[0].sens = range.level[0].sens; - if (ebitmap_cpy(&rt->range.level[0].cat, - &range.level[0].cat)) { - yyerror("out of memory"); - free(rt); - return -1; - } - rt->range.level[1].sens = range.level[1].sens; - if (ebitmap_cpy(&rt->range.level[1].cat, - &range.level[1].cat)) { - yyerror("out of memory"); - free(rt); - return -1; - } - rt->next = policydbp->range_tr; - policydbp->range_tr = rt; - } - } - - type_set_destroy(&doms); - type_set_destroy(&types); - ebitmap_destroy(&range.level[0].cat); - ebitmap_destroy(&range.level[1].cat); - return 0; +out: + range_trans_rule_destroy(rule); + return -1; } From owner-p4-projects@FreeBSD.ORG Thu Sep 7 14:00:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F49016A4EA; Thu, 7 Sep 2006 14:00:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 164B116A4E1 for ; Thu, 7 Sep 2006 14:00:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4A2643D45 for ; Thu, 7 Sep 2006 13:59:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DxoEL017590 for ; Thu, 7 Sep 2006 13:59:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87Dxnm4017572 for perforce@freebsd.org; Thu, 7 Sep 2006 13:59:49 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:59:49 GMT Message-Id: <200609071359.k87Dxnm4017572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 14:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=105789 Change 105789 by millert@millert_g5tower on 2006/09/07 13:59:14 Update to policycoreutils_1_30_28 from sourceforge svn Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/af.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/am.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ar.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/be.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bg.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn_IN.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ca.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cs.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cy.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/da.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/de.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/el.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/en_GB.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/es.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/et.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/eu_ES.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fa.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fi.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fr.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gl.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gu.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/he.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hi.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hr.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hu.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hy.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/id.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/is.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/it.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ja.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ka.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/kn.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ko.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ku.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lo.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lt.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lv.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mk.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ml.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mr.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ms.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/my.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nb.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nl.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nn.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/no.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nso.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/or.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pa.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pl.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt_BR.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ro.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ru.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/si.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sk.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sq.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sr.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sv.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ta.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/te.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/th.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/tr.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/uk.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ur.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/vi.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_CN.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_TW.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zu.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/seobject.py#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,13 @@ +1.30.28 2006-09-01 + * Merged fix for restorecon // handling from Erich Schubert. + * Merged translations update and fixfiles fix from Dan Walsh. + +1.30.27 2006-08-24 + * Merged fix for restorecon symlink handling from Erich Schubert. + +1.30.26 2006-08-11 + * Merged semanage local file contexts patch from Chris PeBenito. + 1.30.25 2006-08-03 * Merged patch from Dan Walsh with: * audit2allow: process MAC_POLICY_LOAD events ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.25 +1.30.28 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/af.po#2 (text+ko) ==== @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-26 13:48-0400\n" +"POT-Creation-Date: 2006-06-29 15:53-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgid "usage: %s [-bq]\n" msgstr "" -#: ../load_policy/load_policy.c:62 +#: ../load_policy/load_policy.c:66 #, c-format msgid "%s: Can't load policy: %s\n" msgstr "" @@ -31,26 +31,26 @@ msgid "Out of memory!\n" msgstr "" -#: ../newrole/newrole.c:201 ../run_init/run_init.c:126 +#: ../newrole/newrole.c:199 ../run_init/run_init.c:126 #, c-format msgid "failed to initialize PAM\n" msgstr "" -#: ../newrole/newrole.c:212 +#: ../newrole/newrole.c:210 #, c-format msgid "failed to set PAM_TTY\n" msgstr "" -#: ../newrole/newrole.c:250 ../run_init/run_init.c:155 +#: ../newrole/newrole.c:246 ../run_init/run_init.c:154 msgid "Password:" msgstr "" -#: ../newrole/newrole.c:282 ../run_init/run_init.c:187 +#: ../newrole/newrole.c:281 ../run_init/run_init.c:189 #, c-format msgid "Cannot find your entry in the shadow passwd file.\n" msgstr "" -#: ../newrole/newrole.c:288 ../run_init/run_init.c:193 +#: ../newrole/newrole.c:287 ../run_init/run_init.c:195 #, c-format msgid "getpass cannot open /dev/tty\n" msgstr "" @@ -60,187 +60,187 @@ msgid "Error initing capabilities, aborting.\n" msgstr "" -#: ../newrole/newrole.c:367 +#: ../newrole/newrole.c:368 #, c-format msgid "Error dropping capabilities, aborting\n" msgstr "" -#: ../newrole/newrole.c:374 +#: ../newrole/newrole.c:375 #, c-format msgid "Error changing uid, aborting.\n" msgstr "" -#: ../newrole/newrole.c:380 +#: ../newrole/newrole.c:382 #, c-format msgid "Error resetting KEEPCAPS, aborting\n" msgstr "" -#: ../newrole/newrole.c:386 +#: ../newrole/newrole.c:390 #, c-format msgid "Error dropping SETUID capability, aborting\n" msgstr "" -#: ../newrole/newrole.c:459 +#: ../newrole/newrole.c:463 #, c-format msgid "Sorry, newrole may be used only on a SELinux kernel.\n" msgstr "" -#: ../newrole/newrole.c:464 +#: ../newrole/newrole.c:468 #, c-format msgid "Could not determine enforcing mode.\n" msgstr "" -#: ../newrole/newrole.c:481 +#: ../newrole/newrole.c:488 #, c-format msgid "Error: multiple roles specified\n" msgstr "" -#: ../newrole/newrole.c:490 +#: ../newrole/newrole.c:498 #, c-format msgid "Error: multiple types specified\n" msgstr "" -#: ../newrole/newrole.c:498 +#: ../newrole/newrole.c:508 #, c-format msgid "Sorry, -l may be used with SELinux MLS support.\n" msgstr "" -#: ../newrole/newrole.c:503 +#: ../newrole/newrole.c:515 #, c-format msgid "Error: multiple levels specified\n" msgstr "" -#: ../newrole/newrole.c:527 +#: ../newrole/newrole.c:537 #, c-format msgid "Couldn't get default type.\n" msgstr "" -#: ../newrole/newrole.c:549 +#: ../newrole/newrole.c:559 #, c-format msgid "failed to get old_context.\n" msgstr "" -#: ../newrole/newrole.c:563 +#: ../newrole/newrole.c:572 #, c-format msgid "failed to get new context.\n" msgstr "" -#: ../newrole/newrole.c:586 +#: ../newrole/newrole.c:596 #, c-format msgid "cannot find your entry in the passwd file.\n" msgstr "" -#: ../newrole/newrole.c:596 +#: ../newrole/newrole.c:606 #, c-format msgid "Error! Shell is not valid.\n" msgstr "" -#: ../newrole/newrole.c:603 +#: ../newrole/newrole.c:614 #, c-format msgid "Error! Could not retrieve tty information.\n" msgstr "" -#: ../newrole/newrole.c:607 +#: ../newrole/newrole.c:618 #, c-format msgid "Authenticating %s.\n" msgstr "" -#: ../newrole/newrole.c:621 +#: ../newrole/newrole.c:632 #, c-format msgid "newrole: incorrect password for %s\n" msgstr "" -#: ../newrole/newrole.c:645 +#: ../newrole/newrole.c:657 #, c-format msgid "failed to set new role %s\n" msgstr "" -#: ../newrole/newrole.c:657 +#: ../newrole/newrole.c:671 #, c-format msgid "failed to set new type %s\n" msgstr "" -#: ../newrole/newrole.c:670 +#: ../newrole/newrole.c:688 #, c-format msgid "failed to build new range with level %s\n" msgstr "" -#: ../newrole/newrole.c:674 +#: ../newrole/newrole.c:693 #, c-format msgid "failed to set new range %s\n" msgstr "" -#: ../newrole/newrole.c:688 +#: ../newrole/newrole.c:708 #, c-format msgid "failed to convert new context to string\n" msgstr "" -#: ../newrole/newrole.c:698 +#: ../newrole/newrole.c:717 #, c-format msgid "%s is not a valid context\n" msgstr "" -#: ../newrole/newrole.c:711 +#: ../newrole/newrole.c:730 #, c-format msgid "Error! Could not open %s.\n" msgstr "" -#: ../newrole/newrole.c:717 +#: ../newrole/newrole.c:738 #, c-format msgid "%s! Could not get current context for %s, not relabeling tty.\n" msgstr "" -#: ../newrole/newrole.c:728 +#: ../newrole/newrole.c:757 #, c-format msgid "%s! Could not get new context for %s, not relabeling tty.\n" msgstr "" -#: ../newrole/newrole.c:740 +#: ../newrole/newrole.c:771 #, c-format msgid "%s! Could not set new context for %s\n" msgstr "" -#: ../newrole/newrole.c:752 +#: ../newrole/newrole.c:784 #, c-format msgid "newrole: failure forking: %s" msgstr "" -#: ../newrole/newrole.c:754 +#: ../newrole/newrole.c:789 #, c-format msgid "Warning! Could not restore context for %s\n" msgstr "" -#: ../newrole/newrole.c:774 +#: ../newrole/newrole.c:810 #, c-format msgid "%s changed labels.\n" msgstr "" -#: ../newrole/newrole.c:798 +#: ../newrole/newrole.c:834 #, c-format msgid "Could not close descriptors.\n" msgstr "" -#: ../newrole/newrole.c:832 ../run_init/run_init.c:390 +#: ../newrole/newrole.c:869 ../run_init/run_init.c:397 #, c-format msgid "Could not set exec context to %s.\n" msgstr "" -#: ../newrole/newrole.c:842 +#: ../newrole/newrole.c:881 #, c-format msgid "Error connecting to audit system.\n" msgstr "" -#: ../newrole/newrole.c:847 +#: ../newrole/newrole.c:886 #, c-format msgid "Error allocating memory.\n" msgstr "" -#: ../newrole/newrole.c:853 +#: ../newrole/newrole.c:892 #, c-format msgid "Error sending audit message.\n" msgstr "" -#: ../newrole/newrole.c:864 +#: ../newrole/newrole.c:903 msgid "failed to exec shell\n" msgstr "" @@ -251,27 +251,27 @@ " are the arguments to that script." msgstr "" -#: ../run_init/run_init.c:264 +#: ../run_init/run_init.c:267 #, c-format msgid "run_init: incorrect password for %s\n" msgstr "" -#: ../run_init/run_init.c:295 +#: ../run_init/run_init.c:301 #, c-format msgid "Could not open file %s\n" msgstr "" -#: ../run_init/run_init.c:322 +#: ../run_init/run_init.c:328 #, c-format msgid "No context in file %s\n" msgstr "" -#: ../run_init/run_init.c:345 +#: ../run_init/run_init.c:353 #, c-format msgid "Sorry, run_init may be used only on a SELinux kernel.\n" msgstr "" -#: ../run_init/run_init.c:364 +#: ../run_init/run_init.c:372 #, c-format msgid "authentication failed.\n" msgstr "" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/am.po#2 (text+ko) ==== @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-26 13:48-0400\n" +"POT-Creation-Date: 2006-06-29 15:53-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgid "usage: %s [-bq]\n" msgstr "" -#: ../load_policy/load_policy.c:62 +#: ../load_policy/load_policy.c:66 #, c-format msgid "%s: Can't load policy: %s\n" msgstr "" @@ -31,26 +31,26 @@ msgid "Out of memory!\n" msgstr "" -#: ../newrole/newrole.c:201 ../run_init/run_init.c:126 +#: ../newrole/newrole.c:199 ../run_init/run_init.c:126 #, c-format msgid "failed to initialize PAM\n" msgstr "" -#: ../newrole/newrole.c:212 +#: ../newrole/newrole.c:210 #, c-format msgid "failed to set PAM_TTY\n" msgstr "" -#: ../newrole/newrole.c:250 ../run_init/run_init.c:155 +#: ../newrole/newrole.c:246 ../run_init/run_init.c:154 msgid "Password:" msgstr "" -#: ../newrole/newrole.c:282 ../run_init/run_init.c:187 +#: ../newrole/newrole.c:281 ../run_init/run_init.c:189 #, c-format msgid "Cannot find your entry in the shadow passwd file.\n" msgstr "" -#: ../newrole/newrole.c:288 ../run_init/run_init.c:193 +#: ../newrole/newrole.c:287 ../run_init/run_init.c:195 #, c-format msgid "getpass cannot open /dev/tty\n" msgstr "" @@ -60,187 +60,187 @@ msgid "Error initing capabilities, aborting.\n" msgstr "" -#: ../newrole/newrole.c:367 +#: ../newrole/newrole.c:368 #, c-format msgid "Error dropping capabilities, aborting\n" msgstr "" -#: ../newrole/newrole.c:374 +#: ../newrole/newrole.c:375 #, c-format msgid "Error changing uid, aborting.\n" msgstr "" -#: ../newrole/newrole.c:380 +#: ../newrole/newrole.c:382 #, c-format msgid "Error resetting KEEPCAPS, aborting\n" msgstr "" -#: ../newrole/newrole.c:386 +#: ../newrole/newrole.c:390 #, c-format msgid "Error dropping SETUID capability, aborting\n" msgstr "" -#: ../newrole/newrole.c:459 +#: ../newrole/newrole.c:463 #, c-format msgid "Sorry, newrole may be used only on a SELinux kernel.\n" msgstr "" -#: ../newrole/newrole.c:464 +#: ../newrole/newrole.c:468 #, c-format msgid "Could not determine enforcing mode.\n" msgstr "" -#: ../newrole/newrole.c:481 +#: ../newrole/newrole.c:488 #, c-format msgid "Error: multiple roles specified\n" msgstr "" -#: ../newrole/newrole.c:490 +#: ../newrole/newrole.c:498 #, c-format msgid "Error: multiple types specified\n" msgstr "" -#: ../newrole/newrole.c:498 +#: ../newrole/newrole.c:508 #, c-format msgid "Sorry, -l may be used with SELinux MLS support.\n" msgstr "" -#: ../newrole/newrole.c:503 +#: ../newrole/newrole.c:515 #, c-format msgid "Error: multiple levels specified\n" msgstr "" -#: ../newrole/newrole.c:527 +#: ../newrole/newrole.c:537 #, c-format msgid "Couldn't get default type.\n" msgstr "" -#: ../newrole/newrole.c:549 +#: ../newrole/newrole.c:559 #, c-format msgid "failed to get old_context.\n" msgstr "" -#: ../newrole/newrole.c:563 +#: ../newrole/newrole.c:572 #, c-format msgid "failed to get new context.\n" msgstr "" -#: ../newrole/newrole.c:586 +#: ../newrole/newrole.c:596 #, c-format msgid "cannot find your entry in the passwd file.\n" msgstr "" -#: ../newrole/newrole.c:596 +#: ../newrole/newrole.c:606 #, c-format msgid "Error! Shell is not valid.\n" msgstr "" -#: ../newrole/newrole.c:603 +#: ../newrole/newrole.c:614 #, c-format msgid "Error! Could not retrieve tty information.\n" msgstr "" -#: ../newrole/newrole.c:607 +#: ../newrole/newrole.c:618 #, c-format msgid "Authenticating %s.\n" msgstr "" -#: ../newrole/newrole.c:621 +#: ../newrole/newrole.c:632 #, c-format msgid "newrole: incorrect password for %s\n" msgstr "" -#: ../newrole/newrole.c:645 +#: ../newrole/newrole.c:657 #, c-format msgid "failed to set new role %s\n" msgstr "" -#: ../newrole/newrole.c:657 +#: ../newrole/newrole.c:671 #, c-format msgid "failed to set new type %s\n" msgstr "" -#: ../newrole/newrole.c:670 +#: ../newrole/newrole.c:688 #, c-format msgid "failed to build new range with level %s\n" msgstr "" -#: ../newrole/newrole.c:674 +#: ../newrole/newrole.c:693 #, c-format msgid "failed to set new range %s\n" msgstr "" -#: ../newrole/newrole.c:688 +#: ../newrole/newrole.c:708 #, c-format msgid "failed to convert new context to string\n" msgstr "" -#: ../newrole/newrole.c:698 +#: ../newrole/newrole.c:717 #, c-format msgid "%s is not a valid context\n" msgstr "" -#: ../newrole/newrole.c:711 +#: ../newrole/newrole.c:730 #, c-format msgid "Error! Could not open %s.\n" msgstr "" -#: ../newrole/newrole.c:717 +#: ../newrole/newrole.c:738 #, c-format msgid "%s! Could not get current context for %s, not relabeling tty.\n" msgstr "" -#: ../newrole/newrole.c:728 +#: ../newrole/newrole.c:757 #, c-format msgid "%s! Could not get new context for %s, not relabeling tty.\n" msgstr "" -#: ../newrole/newrole.c:740 +#: ../newrole/newrole.c:771 #, c-format msgid "%s! Could not set new context for %s\n" msgstr "" -#: ../newrole/newrole.c:752 +#: ../newrole/newrole.c:784 #, c-format msgid "newrole: failure forking: %s" msgstr "" -#: ../newrole/newrole.c:754 +#: ../newrole/newrole.c:789 #, c-format msgid "Warning! Could not restore context for %s\n" msgstr "" -#: ../newrole/newrole.c:774 +#: ../newrole/newrole.c:810 #, c-format msgid "%s changed labels.\n" msgstr "" -#: ../newrole/newrole.c:798 +#: ../newrole/newrole.c:834 #, c-format msgid "Could not close descriptors.\n" msgstr "" -#: ../newrole/newrole.c:832 ../run_init/run_init.c:390 +#: ../newrole/newrole.c:869 ../run_init/run_init.c:397 #, c-format msgid "Could not set exec context to %s.\n" msgstr "" -#: ../newrole/newrole.c:842 +#: ../newrole/newrole.c:881 #, c-format msgid "Error connecting to audit system.\n" msgstr "" -#: ../newrole/newrole.c:847 +#: ../newrole/newrole.c:886 #, c-format msgid "Error allocating memory.\n" msgstr "" -#: ../newrole/newrole.c:853 +#: ../newrole/newrole.c:892 #, c-format msgid "Error sending audit message.\n" msgstr "" -#: ../newrole/newrole.c:864 +#: ../newrole/newrole.c:903 msgid "failed to exec shell\n" msgstr "" @@ -251,27 +251,27 @@ " are the arguments to that script." msgstr "" -#: ../run_init/run_init.c:264 +#: ../run_init/run_init.c:267 #, c-format msgid "run_init: incorrect password for %s\n" msgstr "" -#: ../run_init/run_init.c:295 +#: ../run_init/run_init.c:301 #, c-format msgid "Could not open file %s\n" msgstr "" -#: ../run_init/run_init.c:322 +#: ../run_init/run_init.c:328 #, c-format msgid "No context in file %s\n" msgstr "" -#: ../run_init/run_init.c:345 +#: ../run_init/run_init.c:353 #, c-format msgid "Sorry, run_init may be used only on a SELinux kernel.\n" msgstr "" -#: ../run_init/run_init.c:364 +#: ../run_init/run_init.c:372 #, c-format msgid "authentication failed.\n" msgstr "" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ar.po#2 (text+ko) ==== @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-26 13:48-0400\n" +"POT-Creation-Date: 2006-06-29 15:53-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgid "usage: %s [-bq]\n" msgstr "" -#: ../load_policy/load_policy.c:62 +#: ../load_policy/load_policy.c:66 #, c-format msgid "%s: Can't load policy: %s\n" msgstr "" @@ -31,26 +31,26 @@ msgid "Out of memory!\n" msgstr "" -#: ../newrole/newrole.c:201 ../run_init/run_init.c:126 +#: ../newrole/newrole.c:199 ../run_init/run_init.c:126 #, c-format msgid "failed to initialize PAM\n" msgstr "" -#: ../newrole/newrole.c:212 +#: ../newrole/newrole.c:210 #, c-format msgid "failed to set PAM_TTY\n" msgstr "" -#: ../newrole/newrole.c:250 ../run_init/run_init.c:155 +#: ../newrole/newrole.c:246 ../run_init/run_init.c:154 msgid "Password:" msgstr "" -#: ../newrole/newrole.c:282 ../run_init/run_init.c:187 +#: ../newrole/newrole.c:281 ../run_init/run_init.c:189 #, c-format msgid "Cannot find your entry in the shadow passwd file.\n" msgstr "" -#: ../newrole/newrole.c:288 ../run_init/run_init.c:193 +#: ../newrole/newrole.c:287 ../run_init/run_init.c:195 #, c-format msgid "getpass cannot open /dev/tty\n" msgstr "" @@ -60,187 +60,187 @@ msgid "Error initing capabilities, aborting.\n" msgstr "" -#: ../newrole/newrole.c:367 +#: ../newrole/newrole.c:368 #, c-format msgid "Error dropping capabilities, aborting\n" msgstr "" -#: ../newrole/newrole.c:374 +#: ../newrole/newrole.c:375 #, c-format msgid "Error changing uid, aborting.\n" msgstr "" -#: ../newrole/newrole.c:380 +#: ../newrole/newrole.c:382 #, c-format msgid "Error resetting KEEPCAPS, aborting\n" msgstr "" -#: ../newrole/newrole.c:386 +#: ../newrole/newrole.c:390 #, c-format msgid "Error dropping SETUID capability, aborting\n" msgstr "" -#: ../newrole/newrole.c:459 +#: ../newrole/newrole.c:463 #, c-format msgid "Sorry, newrole may be used only on a SELinux kernel.\n" msgstr "" -#: ../newrole/newrole.c:464 +#: ../newrole/newrole.c:468 #, c-format msgid "Could not determine enforcing mode.\n" msgstr "" -#: ../newrole/newrole.c:481 +#: ../newrole/newrole.c:488 #, c-format msgid "Error: multiple roles specified\n" msgstr "" -#: ../newrole/newrole.c:490 +#: ../newrole/newrole.c:498 #, c-format msgid "Error: multiple types specified\n" msgstr "" -#: ../newrole/newrole.c:498 +#: ../newrole/newrole.c:508 #, c-format msgid "Sorry, -l may be used with SELinux MLS support.\n" msgstr "" -#: ../newrole/newrole.c:503 +#: ../newrole/newrole.c:515 #, c-format msgid "Error: multiple levels specified\n" msgstr "" -#: ../newrole/newrole.c:527 +#: ../newrole/newrole.c:537 #, c-format msgid "Couldn't get default type.\n" msgstr "" -#: ../newrole/newrole.c:549 +#: ../newrole/newrole.c:559 #, c-format msgid "failed to get old_context.\n" msgstr "" -#: ../newrole/newrole.c:563 +#: ../newrole/newrole.c:572 #, c-format msgid "failed to get new context.\n" msgstr "" -#: ../newrole/newrole.c:586 +#: ../newrole/newrole.c:596 #, c-format msgid "cannot find your entry in the passwd file.\n" msgstr "" -#: ../newrole/newrole.c:596 +#: ../newrole/newrole.c:606 #, c-format msgid "Error! Shell is not valid.\n" msgstr "" -#: ../newrole/newrole.c:603 +#: ../newrole/newrole.c:614 #, c-format msgid "Error! Could not retrieve tty information.\n" msgstr "" -#: ../newrole/newrole.c:607 +#: ../newrole/newrole.c:618 #, c-format msgid "Authenticating %s.\n" msgstr "" -#: ../newrole/newrole.c:621 +#: ../newrole/newrole.c:632 #, c-format msgid "newrole: incorrect password for %s\n" msgstr "" -#: ../newrole/newrole.c:645 +#: ../newrole/newrole.c:657 #, c-format msgid "failed to set new role %s\n" msgstr "" -#: ../newrole/newrole.c:657 +#: ../newrole/newrole.c:671 #, c-format msgid "failed to set new type %s\n" msgstr "" -#: ../newrole/newrole.c:670 +#: ../newrole/newrole.c:688 #, c-format msgid "failed to build new range with level %s\n" msgstr "" -#: ../newrole/newrole.c:674 +#: ../newrole/newrole.c:693 #, c-format msgid "failed to set new range %s\n" msgstr "" -#: ../newrole/newrole.c:688 +#: ../newrole/newrole.c:708 #, c-format msgid "failed to convert new context to string\n" msgstr "" -#: ../newrole/newrole.c:698 +#: ../newrole/newrole.c:717 #, c-format msgid "%s is not a valid context\n" msgstr "" -#: ../newrole/newrole.c:711 +#: ../newrole/newrole.c:730 #, c-format msgid "Error! Could not open %s.\n" msgstr "" -#: ../newrole/newrole.c:717 +#: ../newrole/newrole.c:738 #, c-format msgid "%s! Could not get current context for %s, not relabeling tty.\n" msgstr "" -#: ../newrole/newrole.c:728 +#: ../newrole/newrole.c:757 #, c-format msgid "%s! Could not get new context for %s, not relabeling tty.\n" msgstr "" -#: ../newrole/newrole.c:740 +#: ../newrole/newrole.c:771 #, c-format msgid "%s! Could not set new context for %s\n" msgstr "" -#: ../newrole/newrole.c:752 +#: ../newrole/newrole.c:784 #, c-format msgid "newrole: failure forking: %s" msgstr "" -#: ../newrole/newrole.c:754 +#: ../newrole/newrole.c:789 #, c-format msgid "Warning! Could not restore context for %s\n" msgstr "" -#: ../newrole/newrole.c:774 +#: ../newrole/newrole.c:810 #, c-format msgid "%s changed labels.\n" msgstr "" -#: ../newrole/newrole.c:798 +#: ../newrole/newrole.c:834 #, c-format msgid "Could not close descriptors.\n" msgstr "" -#: ../newrole/newrole.c:832 ../run_init/run_init.c:390 +#: ../newrole/newrole.c:869 ../run_init/run_init.c:397 #, c-format msgid "Could not set exec context to %s.\n" msgstr "" -#: ../newrole/newrole.c:842 +#: ../newrole/newrole.c:881 #, c-format msgid "Error connecting to audit system.\n" msgstr "" -#: ../newrole/newrole.c:847 +#: ../newrole/newrole.c:886 #, c-format msgid "Error allocating memory.\n" msgstr "" -#: ../newrole/newrole.c:853 +#: ../newrole/newrole.c:892 #, c-format msgid "Error sending audit message.\n" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 7 14:01:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 359BD16A4DE; Thu, 7 Sep 2006 14:01:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10D2A16A4DA for ; Thu, 7 Sep 2006 14:01:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D03ED43D46 for ; Thu, 7 Sep 2006 14:01:53 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87E1r5j017956 for ; Thu, 7 Sep 2006 14:01:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87E1rav017953 for perforce@freebsd.org; Thu, 7 Sep 2006 14:01:53 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 14:01:53 GMT Message-Id: <200609071401.k87E1rav017953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 14:01:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=105790 Change 105790 by millert@millert_g5tower on 2006/09/07 14:01:08 Use WTERMSIG macro instead of doing it by hand. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#14 (text+ko) ==== @@ -1760,12 +1760,11 @@ static int sebsd_proc_check_wait(struct ucred *cred, struct proc *proc) { - u_int32_t perm, exit_status; + u_int32_t perm; + int signum; - exit_status = proc->p_xstat; // (promote to 32 btis) - exit_status &= 0177; - - perm = signal_to_av(exit_status); + signum = WTERMSIG(proc->p_xstat); + perm = signal_to_av(signum); return (cred_has_perm(cred, proc, perm)); } From owner-p4-projects@FreeBSD.ORG Thu Sep 7 14:03:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4161416A4E1; Thu, 7 Sep 2006 14:03:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CF6116A4DD for ; Thu, 7 Sep 2006 14:03:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDE0B43D45 for ; Thu, 7 Sep 2006 14:03:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87E3uBM019249 for ; Thu, 7 Sep 2006 14:03:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87E3uhC019246 for perforce@freebsd.org; Thu, 7 Sep 2006 14:03:56 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 14:03:56 GMT Message-Id: <200609071403.k87E3uhC019246@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 14:03:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=105791 Change 105791 by millert@millert_g5tower on 2006/09/07 14:03:21 Fix boolean logic inversion that caused the blocking allocator to be used when we wanted the non-blocking one (and vice versa). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#4 (text+ko) ==== @@ -274,7 +274,7 @@ lck_mtx_unlock(so_cache_mtx); - if (waitok) + if (waitok == M_WAITOK) *so = (struct socket *) zalloc(so_cache_zone); else *so = (struct socket *) zalloc_noblock(so_cache_zone); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 14:51:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E7D316A4E2; Thu, 7 Sep 2006 14:51:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2325A16A4DA for ; Thu, 7 Sep 2006 14:51:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BE2743D7E for ; Thu, 7 Sep 2006 14:50:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87Eot0S021518 for ; Thu, 7 Sep 2006 14:50:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87EosIr021512 for perforce@freebsd.org; Thu, 7 Sep 2006 14:50:54 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 14:50:54 GMT Message-Id: <200609071450.k87EosIr021512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 14:51:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=105792 Change 105792 by millert@millert_g5tower on 2006/09/07 14:50:23 Add support for label and multilabel options to mount_msdos. Build and install modified mount_msdos as part of SEDarwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/msdosfs/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/msdosfs/mount_msdos.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/msdosfs/mount_msdos.tproj/mount_msdos.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#2 (text+ko) ==== @@ -14,6 +14,7 @@ $(MAKE) -C adv_cmds/ps.tproj all $(MAKE) -C file_cmds/ls all bsdmake -C diskdev_cmds -f Makefile.mac all + $(MAKE) -C msdosfs/mount_msdos.tproj $(MAKE) -C pam_modules/pam_lctx $(MAKE) -C pam_modules/pam_mac_console $(MAKE) -C etc @@ -33,6 +34,7 @@ $(MAKE) -C adv_cmds/ps.tproj DSTROOT=$(DESTDIR) install $(MAKE) -C file_cmds/ls install bsdmake -C diskdev_cmds -f Makefile.mac DSTROOT=$(DESTDIR) install + $(MAKE) -C msdosfs/mount_msdos.tproj install $(MAKE) -C pam_modules/pam_lctx DSTROOT=$(DESTDIR) install $(MAKE) -C pam_modules/pam_mac_console DSTROOT=$(DESTDIR) install $(MAKE) -C etc install @@ -51,6 +53,7 @@ $(MAKE) -C adv_cmds/ps.tproj clean $(MAKE) -C file_cmds/ls clean bsdmake -C diskdev_cmds -f Makefile.mac clean + $(MAKE) -C msdosfs/mount_msdos.tproj clean $(MAKE) -C pam_modules/pam_lctx clean $(MAKE) -C pam_modules/pam_mac_console clean $(MAKE) -C etc clean ==== //depot/projects/trustedbsd/sedarwin8/darwin/msdosfs/mount_msdos.tproj/mount_msdos.c#2 (text+ko) ==== @@ -53,6 +53,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #ifndef lint static const char rcsid[] = @@ -72,6 +78,8 @@ #include #include +#include + #include "../msdosfs.kextproj/msdosfs.kmodproj/msdosfsmount.h" #include @@ -94,7 +102,7 @@ /* bek 5/20/98 - [2238317] - mntopts.h needs to be installed in a public place */ -#define Radar_2238317 1 +// #define Radar_2238317 1 #if ! Radar_2238317 @@ -158,6 +166,7 @@ #define MOPT_BROWSE { "browse", 1, MNT_DONTBROWSE, 0 } #define MOPT_AUTOMOUNTED { "automounted",0, MNT_AUTOMOUNTED, 0 } #define MOPT_DEFWRITE { "defwrite", 0, MNT_DEFWRITE, 0} +#define MOPT_LABEL { "label=", 0, MNT_LABEL, 0 } /* Control flags. */ #define MOPT_FORCE { "force", 0, MNT_FORCE, 0 } @@ -184,6 +193,8 @@ MOPT_RDONLY, \ MOPT_UNION, \ MOPT_PERMISSIONS, \ + MOPT_LABEL, \ + MOPT_MULTILABEL, \ MOPT_BROWSE void getmntopts __P((const char *, const struct mntopt *, int *, int *)); @@ -234,12 +245,21 @@ char *dev, *dir, mntpath[MAXPATHLEN]; // struct vfsconf vfc; struct timezone local_tz; + mac_t mlabel = NULL; + struct mac mac; + char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; + char *p; mntflags = set_gid = set_uid = set_mask = 0; (void)memset(&args, '\0', sizeof(args)); args.magic = MSDOSFS_ARGSMAGIC; progname = argv[0]; + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; + while ((c = getopt(argc, argv, "sl9u:g:m:o:")) != -1) { switch (c) { case 'u': @@ -256,6 +276,13 @@ break; case 'o': getmntopts(optarg, mopts, &mntflags, &args.flags); + if (mntflags & MNT_LABEL) { + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(p, &mac) != 0) + usage(); + } + } break; case '?': default: @@ -264,6 +291,9 @@ } } + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (optind + 2 != argc) usage(); @@ -308,7 +338,7 @@ if (load_kmod()) /* Load it in */ errx(EX_OSERR, "msdos filesystem is not available"); - if (mount("msdos", mntpath, mntflags, &args) < 0) + if (mac_mount("msdos", mntpath, mntflags, &args, mlabel) < 0) err(EX_OSERR, "%s on %s", dev, mntpath); exit (0); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 14:58:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC4616A50C; Thu, 7 Sep 2006 14:58:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5370416A500 for ; Thu, 7 Sep 2006 14:58:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02F2643D5E for ; Thu, 7 Sep 2006 14:58:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87Ew4m7021830 for ; Thu, 7 Sep 2006 14:58:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87Ew4bk021827 for perforce@freebsd.org; Thu, 7 Sep 2006 14:58:04 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 14:58:04 GMT Message-Id: <200609071458.k87Ew4bk021827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 14:58:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=105793 Change 105793 by millert@millert_g5tower on 2006/09/07 14:57:46 Audit updates Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_event#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kernel.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kevents.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_audit.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_audit.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_klib.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_event#2 (text+ko) ==== @@ -283,6 +283,36 @@ 359:AUE_PIDFORTASK:pid_for_task():pc 360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot 361:AUE_COPYFILE:copyfile():fr,fw +400:AUE_MAC_GET_PROC:mac_get_proc(2):pc +401:AUE_MAC_SET_PROC:mac_set_proc(2):pc +402:AUE_MAC_GET_PID:mac_get_pid(2):pc +403:AUE_MAC_SET_FILE:mac_set_file(2):fm +404:AUE_MAC_GET_FILE:mac_get_file(2):fa +405:AUE_MAC_SET_LINK:mac_set_link(2):fm +406:AUE_MAC_GET_LINK:mac_get_link(2):fa +407:AUE_MAC_SET_FD:mac_set_fd(2):fm +408:AUE_MAC_GET_FD:mac_get_fd(2):fa +409:AUE_MAC_EXECVE:mac_execve(2):pc,ex +410:AUE_MAC_SYSCALL:mac_syscall(2):ad +411:AUE_MAC_GET_LCID:mac_get_lcid(2):pc +412:AUE_MAC_GET_LCTX:mac_get_lctx(2):pc +413:AUE_MAC_SET_LCTX:mac_set_lctx(2):pc +414:AUE_SETLCID:setlcid(2):pc +415:AUE_GETLCID:getlcid(2):pc +416:AUE_MAC_MOUNT:mac_mount(2):ad +417:AUE_MAC_GET_MOUNT:mac_get_mount(2):fa +451:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +452:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +453:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +454:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +455:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +456:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +457:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +458:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +459:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +460:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +461:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +462:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kernel.h#3 (text+ko) ==== @@ -106,6 +106,7 @@ #define ARG_PROCESS 0x0000080000000000ULL #define ARG_MACHPORT1 0x0000100000000000ULL #define ARG_MACHPORT2 0x0000200000000000ULL +#define ARG_MAC_STRING 0x0000400000000000ULL #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL @@ -231,6 +232,7 @@ char *ar_vnode1_mac_labels; char *ar_vnode2_mac_labels; char *ar_cred_mac_labels; + char *ar_arg_mac_string; #endif char *ar_arg_text; struct au_mask ar_arg_amask; @@ -383,6 +385,7 @@ * It currently creates only text and data audit tokens. */ int audit_mac_data(int type, int len, u_char *data); +void audit_arg_mac_string(const char *string); #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kevents.h#2 (text+ko) ==== @@ -335,6 +335,7 @@ #define AUE_SYSCTL_NONADMIN 360 // BSM events for security system calls +#define AUE_MAC_GET_PROC 400 #define AUE_MAC_SET_PROC 401 #define AUE_MAC_GET_PID 402 #define AUE_MAC_SET_FILE 403 @@ -351,6 +352,7 @@ #define AUE_SETLCID 414 #define AUE_GETLCID 415 #define AUE_MAC_MOUNT 416 +#define AUE_MAC_GET_MOUNT 417 // BSM events for extended attributes #define AUE_EXTATTR_SET_FILE 451 ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_audit.c#4 (text+ko) ==== @@ -71,6 +71,8 @@ #include #include #include +#define MAC_ARG_PREFIX "arg: " +#define MAC_ARG_PREFIX_LEN 5 #endif #include @@ -258,6 +260,10 @@ if (ar->k_ar.ar_cred_mac_labels != NULL) { kfree(ar->k_ar.ar_cred_mac_labels, MAC_AUDIT_LABEL_LEN); } + if (ar->k_ar.ar_arg_mac_string != NULL) { + kfree(ar->k_ar.ar_arg_mac_string, + MAC_MAX_LABEL_BUF_LEN + MAC_ARG_PREFIX_LEN); + } /* Free the audit data from the MAC policies. */ do { @@ -1344,7 +1350,7 @@ struct nameidata nd; kauth_cred_t cred; struct vnode *vp; - int error, flags; + int error; struct vfs_context context; context.vc_proc = p; @@ -1362,15 +1368,20 @@ * validity checks, and grab another reference to the current * credential. */ - if (uap->path != 0) { + if (uap->path != USER_ADDR_NULL) { NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | AUDITVNPATH1, - (IS_64BIT_PROCESS(p) ? UIO_USERSPACE64 : UIO_USERSPACE32), - uap->path, &context); - flags = audit_open_flags; - error = vn_open(&nd, flags, 0); + UIO_USERSPACE, uap->path, &context); + error = vn_open(&nd, audit_open_flags, 0); if (error) goto out; vp = nd.ni_vp; + + if (vp->v_type != VREG) { + vn_close(vp, audit_close_flags, kauth_cred_get(), p); + vnode_put(vp); + error = EINVAL; + goto out; + } #ifdef MAC /* * Accessibility of the vnode was determined in @@ -1383,19 +1394,13 @@ * sensitivity. */ - error = mac_system_check_auditctl(kauth_cred_get(), nd.ni_vp); + error = mac_system_check_auditctl(kauth_cred_get(), vp); if (error) { - vn_close(nd.ni_vp, audit_close_flags, kauth_cred_get(), p); + vn_close(vp, audit_close_flags, kauth_cred_get(), p); vnode_put(vp); goto out; } #endif - if (vp->v_type != VREG) { - vn_close(vp, audit_close_flags, kauth_cred_get(), p); - vnode_put(vp); - error = EINVAL; - goto out; - } cred = kauth_cred_get_with_ref(); audit_suspended = 0; } @@ -2618,6 +2623,27 @@ kfree(data, len); return (ret); } + +void +audit_arg_mac_string(const char *string) +{ + struct kaudit_record *ar; + + ar = currecord(); + if (ar == NULL) + return; + + if (ar->k_ar.ar_arg_mac_string == NULL) { + ar->k_ar.ar_arg_mac_string = + (char *)kalloc(MAC_MAX_LABEL_BUF_LEN + MAC_ARG_PREFIX_LEN); + if (ar->k_ar.ar_arg_mac_string == NULL) + return; + } + strncpy(ar->k_ar.ar_arg_mac_string, MAC_ARG_PREFIX, MAC_ARG_PREFIX_LEN); + strcpy(ar->k_ar.ar_arg_mac_string + MAC_ARG_PREFIX_LEN, string); + ar->k_ar.ar_valid_arg |= ARG_MAC_STRING; + +} #endif /* MAC */ /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_audit.c#3 (text+ko) ==== @@ -341,6 +341,14 @@ } \ } while (0) \ +#define PROCESS_MAC_TOKENS \ + do { \ + if (ar->ar_valid_arg & ARG_MAC_STRING) { \ + tok = au_to_text(ar->ar_arg_mac_string); \ + kau_write(rec, tok); \ + } \ + } while (0) \ + /* * Implement auditing for the auditon() system call. The audit tokens * that are generated depend on the command that was sent into the @@ -619,7 +627,6 @@ case AUE_GETATTRLIST: case AUE_GETFH: case AUE_LSTAT: - case AUE_MAC_EXECVE: case AUE_MKFIFO: case AUE_PATHCONF: case AUE_READLINK: @@ -694,12 +701,8 @@ case AUE_EXTATTR_LIST_FD: case AUE_EXTATTR_SET_FD: case AUE_EXTATTR_DELETE_FD: -#ifdef MAC - case AUE_MAC_GET_FD: - case AUE_MAC_SET_FD: FD_KPATH1_VNODE1_TOKENS; break; -#endif case AUE_FCHOWN: tok = au_to_arg32(2, "new file uid", ar->ar_arg_uid); @@ -735,6 +738,18 @@ kau_write(rec, tok); break; + case AUE_GETLCID: + tok = au_to_arg32(1, "pid", (u_int32_t)ar->ar_arg_pid); + kau_write(rec, tok); + break; + + case AUE_SETLCID: + tok = au_to_arg32(1, "pid", (u_int32_t)ar->ar_arg_pid); + kau_write(rec, tok); + tok = au_to_arg32(2, "lcid", (u_int32_t)ar->ar_arg_value); + kau_write(rec, tok); + break; + case AUE_IOCTL: tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); kau_write(rec, tok); @@ -816,8 +831,11 @@ } break; +#ifdef MAC case AUE_MAC_MOUNT: - /* XXX Audit the label string? */ + PROCESS_MAC_TOKENS; + /* fall through */ +#endif case AUE_MOUNT: /* XXX Need to handle NFS mounts */ tok = au_to_arg32(3, "flags", ar->ar_arg_fflags); @@ -1168,12 +1186,6 @@ FD_KPATH1_VNODE1_TOKENS; break; -#ifdef MAC - case AUE_MAC_GET_FILE: - case AUE_MAC_SET_FILE: - case AUE_MAC_GET_LINK: - case AUE_MAC_SET_LINK: -#endif case AUE_EXTATTR_GET_FILE: case AUE_EXTATTR_SET_FILE: case AUE_EXTATTR_LIST_FILE: @@ -1186,8 +1198,49 @@ break; #ifdef MAC + case AUE_MAC_GET_FILE: + case AUE_MAC_SET_FILE: + case AUE_MAC_GET_LINK: + case AUE_MAC_SET_LINK: + case AUE_MAC_GET_MOUNT: + UPATH1_KPATH1_VNODE1_TOKENS; + PROCESS_MAC_TOKENS; + break; + + case AUE_MAC_GET_FD: + case AUE_MAC_SET_FD: + FD_KPATH1_VNODE1_TOKENS; + PROCESS_MAC_TOKENS; + break; + + case AUE_MAC_SYSCALL: + PROCESS_MAC_TOKENS; + tok = au_to_arg32(3, "call", ar->ar_arg_value); + kau_write(rec, tok); + break; + + case AUE_MAC_EXECVE: + UPATH1_KPATH1_VNODE1_TOKENS; + PROCESS_MAC_TOKENS; + break; + + case AUE_MAC_GET_PID: + tok = au_to_arg32(1, "pid", (u_int32_t)ar->ar_arg_pid); + kau_write(rec, tok); + PROCESS_MAC_TOKENS; + break; + + case AUE_MAC_GET_LCID: + tok = au_to_arg32(1, "lcid", (u_int32_t)ar->ar_arg_value); + kau_write(rec, tok); + PROCESS_MAC_TOKENS; + break; + + case AUE_MAC_GET_PROC: case AUE_MAC_SET_PROC: - case AUE_MAC_SYSCALL: + case AUE_MAC_GET_LCTX: + case AUE_MAC_SET_LCTX: + PROCESS_MAC_TOKENS; break; #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_klib.c#2 (text+ko) ==== @@ -448,7 +448,7 @@ AUE_MAC_SET_FILE, /* 383 = __mac_set_file */ AUE_MAC_GET_LINK, /* 384 = __mac_get_link */ AUE_MAC_SET_LINK, /* 385 = __mac_set_link */ - AUE_NULL, /* 386 = __mac_get_proc */ + AUE_MAC_GET_PROC, /* 386 = __mac_get_proc */ AUE_MAC_SET_PROC, /* 387 = __mac_set_proc */ AUE_MAC_GET_FD, /* 388 = __mac_get_fd */ AUE_MAC_SET_FD, /* 389 = __mac_set_fd */ @@ -459,6 +459,7 @@ AUE_SETLCID, /* 394 = setlcid */ AUE_GETLCID, /* 395 = getlcid */ AUE_MAC_MOUNT, /* 396 = __mac_mount */ + AUE_MAC_GET_MOUNT, /* 397 = __mac_get_mount */ }; int nsys_au_event = sizeof(sys_au_event) / sizeof(sys_au_event[0]); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#5 (text+ko) ==== @@ -1049,6 +1049,8 @@ struct lctx *l; int error; + AUDIT_ARG(pid, uap->pid); + AUDIT_ARG(value, uap->lcid); if (uap->pid == LCID_PROC_SELF) { /* Create/Join/Leave */ p = p0; } else { /* Adopt/Orphan */ @@ -1131,6 +1133,7 @@ struct proc *p; int error; + AUDIT_ARG(pid, uap->pid); if (uap->pid == LCID_PROC_SELF) { p = p0; } else { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#8 (text+ko) ==== @@ -1029,6 +1029,7 @@ int error; size_t ulen; + AUDIT_ARG(pid, uap->pid); error = copyin(CAST_USER_ADDR_T(uap->mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -1049,6 +1050,7 @@ kauth_cred_rele(tcred); return (error); } + AUDIT_ARG(mac_string, elements); MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_cred_externalize_label(tcred->cr_label, elements, @@ -1085,6 +1087,7 @@ FREE(elements, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, elements); cr = kauth_cred_proc_ref(p); @@ -1128,6 +1131,7 @@ FREE(buffer, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, buffer); intlabel = mac_cred_alloc_label(); error = mac_cred_internalize_label(intlabel, buffer); @@ -1174,6 +1178,7 @@ int error; size_t ulen; + AUDIT_ARG(value, uap->lcid); error = copyin(CAST_USER_ADDR_T(uap->mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -1193,6 +1198,7 @@ FREE(elements, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, elements); MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = mac_lctx_externalize_label(l->lc_label, elements, buffer, mac.m_buflen); @@ -1227,6 +1233,7 @@ FREE(elements, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, elements); MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); PROC_LOCK(p); @@ -1271,6 +1278,7 @@ FREE(buffer, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, buffer); intlabel = mac_lctx_alloc_label(); error = mac_lctx_internalize_label(intlabel, buffer); @@ -1349,6 +1357,7 @@ FREE(elements, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, elements); MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = fdgetf_noref(p, uap->fd, &fp); @@ -1419,6 +1428,7 @@ FREE(elements, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, elements); context.vc_proc = p; context.vc_ucred = kauth_cred_get(); @@ -1498,6 +1508,7 @@ FREE(buffer, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, buffer); error = fdgetf_noref(p, uap->fd, &fp); if (error) { @@ -1564,6 +1575,7 @@ FREE(buffer, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, buffer); intlabel = mac_vnode_alloc_label(); error = mac_vnode_internalize_label(intlabel, buffer); @@ -1627,6 +1639,8 @@ error = copyinstr(CAST_USER_ADDR_T(uap->policy), target, sizeof(target), &ulen); if (error) return (error); + AUDIT_ARG(value, uap->call); + AUDIT_ARG(mac_string, target); error = ENOSYS; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#4 (text+ko) ==== @@ -47,6 +47,12 @@ #include +#ifdef MAC_DEBUG +extern u_int nmaccreds, nmacprocs; +#endif + +#include + struct label * mac_cred_alloc_label(void) { @@ -219,6 +225,7 @@ FREE(buffer, M_MACTEMP); return (error); } + AUDIT_ARG(mac_string, buffer); error = mac_cred_internalize_label(execlabelstorage, buffer); FREE(buffer, M_MACTEMP); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 15:14:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B20916A4E2; Thu, 7 Sep 2006 15:14:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18A7B16A4DA for ; Thu, 7 Sep 2006 15:14:40 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7867643D7B for ; Thu, 7 Sep 2006 15:14:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87FEQLL023974 for ; Thu, 7 Sep 2006 15:14:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87FEPdj023971 for perforce@freebsd.org; Thu, 7 Sep 2006 15:14:25 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 15:14:25 GMT Message-Id: <200609071514.k87FEPdj023971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 15:14:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=105795 Change 105795 by millert@millert_g5tower on 2006/09/07 15:13:30 Add mac_get_mount(2), mac_getfsstat(2) and mac_getmntinfo(3). Handle union mounts properly when MNT_UPDATE is set. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_get.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_getmntinfo.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_mount.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/init_sysent.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/syscalls.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/syscalls.master#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vfsops.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/syscall.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/sysproto.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/Makefile#2 (text+ko) ==== @@ -5,7 +5,8 @@ CFLAGS+= $(DARWIN_HDRS) # -I$(MIGSOURCE) LIB= mac -OBJS = mac.o mac_exec.o mac_get.o mac_set.o mac_mount.o security.o +OBJS = mac.o mac_exec.o mac_get.o mac_set.o mac_mount.o security.o \ + mac_getmntinfo.o AR = ar cq RANLIB = ranlib INSTALL = install ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac.3#2 (text+ko) ==== @@ -76,12 +76,24 @@ and may be used to retrieve the MAC label associated with a named file. +.It Fn mac_get_mount +This function is described in +.Xr mac_get 3 , +and may be used to retrieve the +MAC label associated with +a mount point. .It Fn mac_get_proc This function is described in .Xr mac_get 3 , and may be used to retrieve the MAC label associated with the calling process. +.It Fn mac_mount +is an extended form of +.Xr mount 2 , +may be used to set the +MAC label associated with +a mount point at mount time. .It Fn mac_set_fd This function is described in .Xr mac_set 3 , ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_get.3#2 (text+ko) ==== @@ -54,6 +54,8 @@ .Ft int .Fn mac_get_lctx "mac_t label" .Ft int +.Fn mac_get_mount "const char *path" "mac_t label" +.Ft int .Fn mac_get_pid "pid_t pid" "mac_t label" .Ft int .Fn mac_get_proc "mac_t label" @@ -77,6 +79,15 @@ .Xr getsockopt 2 . .Pp The +.Fn mac_get_mount +function fills in +.Fa label +(which must first be allocated by +.Xr mac_prepare 3 ) +with the MAC label associated with the mount point referenced by +.Fa path . +.Pp +The .Fn mac_get_lctx and .Fn mac_get_lcid ==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac_mount.c#2 (text+ko) ==== @@ -29,9 +29,16 @@ #include int -mac_mount(const char *type, const char *dir, int flags, void *data, +mac_mount(const char *type, const char *path, int flags, void *data, struct mac *label) { - return ((syscall(SYS___mac_mount, type, dir, flags, data, label))); + return ((syscall(SYS___mac_mount, type, path, flags, data, label))); +} + +int +mac_get_mount(const char *path, struct mac *label) +{ + + return ((syscall(SYS___mac_get_mount, path, label))); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/init_sysent.c#2 (text+ko) ==== @@ -486,5 +486,7 @@ {AC(setlcid_args), _SYSCALL_CANCEL_NONE, KERNEL_FUNNEL, (sy_call_t *)setlcid, munge_ww, munge_dd, _SYSCALL_RET_INT_T}, /* 394 = setlcid */ {AC(getlcid_args), _SYSCALL_CANCEL_NONE, KERNEL_FUNNEL, (sy_call_t *)getlcid, munge_w, munge_d, _SYSCALL_RET_INT_T}, /* 395 = getlcid */ {AC(__mac_mount_args), _SYSCALL_CANCEL_NONE, NO_FUNNEL, (sy_call_t *)__mac_mount, munge_wwwww, munge_ddddd, _SYSCALL_RET_INT_T}, /* 396 = __mac_mount */ + {AC(__mac_get_mount_args), _SYSCALL_CANCEL_NONE, NO_FUNNEL, (sy_call_t *)__mac_get_mount, munge_ww, munge_dd, _SYSCALL_RET_INT_T}, /* 397 = __mac_get_mount */ + {AC(__mac_getfsstat_args), _SYSCALL_CANCEL_NONE, NO_FUNNEL, (sy_call_t *)__mac_getfsstat, munge_wwwww, munge_ddddd, _SYSCALL_RET_INT_T}, /* 398 = __mac_getfsstat */ }; int nsysent = sizeof(sysent) / sizeof(sysent[0]); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/syscalls.c#2 (text+ko) ==== @@ -472,4 +472,6 @@ "setlcid", /* 394 = setlcid */ "getlcid", /* 395 = getlcid */ "__mac_mount", /* 396 = __mac_mount */ + "__mac_get_mount", /* 397 = __mac_get_mount */ + "__mac_getfsstat", /* 398 = __mac_getfsstat */ }; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/syscalls.master#2 (text+ko) ==== @@ -499,3 +499,5 @@ 394 NONE KERN ALL { int setlcid(pid_t pid, pid_t lcid); } 395 NONE KERN ALL { int getlcid(pid_t pid); } 396 NONE NONE ALL { int __mac_mount(char *type, char *path, int flags, caddr_t data, struct mac *mac_p); } +397 NONE NONE ALL { int __mac_get_mount(char *path, struct mac *mac_p); } +398 NONE NONE ALL { int __mac_getfsstat(user_addr_t buf, int bufsize, user_addr_t mac, int macsize, int flags); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vfsops.c#2 (text+ko) ==== @@ -90,7 +90,7 @@ * Update is a no-op */ if (mp->mnt_flag & MNT_UPDATE) - return (ENOTSUP); + return (0); error = fdesc_allocvp(Froot, FD_ROOT, mp, &rvp, VDIR); if (error) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/syscall.h#2 (text+ko) ==== @@ -477,7 +477,9 @@ #define SYS_setlcid 394 #define SYS_getlcid 395 #define SYS___mac_mount 396 -#define SYS_MAXSYSCALL 397 +#define SYS___mac_get_mount 397 +#define SYS___mac_getfsstat 398 +#define SYS_MAXSYSCALL 399 #endif /* __APPLE_API_PRIVATE */ #endif /* !_SYS_SYSCALL_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/sysproto.h#2 (text+ko) ==== @@ -1377,6 +1377,17 @@ char data_l_[PADL_(user_addr_t)]; user_addr_t data; char data_r_[PADR_(user_addr_t)]; char mac_p_l_[PADL_(user_addr_t)]; user_addr_t mac_p; char mac_p_r_[PADR_(user_addr_t)]; }; +struct __mac_get_mount_args { + char path_l_[PADL_(user_addr_t)]; user_addr_t path; char path_r_[PADR_(user_addr_t)]; + char mac_p_l_[PADL_(user_addr_t)]; user_addr_t mac_p; char mac_p_r_[PADR_(user_addr_t)]; +}; +struct __mac_getfsstat_args { + char buf_l_[PADL_(user_addr_t)]; user_addr_t buf; char buf_r_[PADR_(user_addr_t)]; + char bufsize_l_[PADL_(int)]; int bufsize; char bufsize_r_[PADR_(int)]; + char mac_l_[PADL_(user_addr_t)]; user_addr_t mac; char mac_r_[PADR_(user_addr_t)]; + char macsize_l_[PADL_(int)]; int macsize; char macsize_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; int nosys(struct proc *, struct nosys_args *, int *); void exit(struct proc *, struct exit_args *, int *); int fork(struct proc *, struct fork_args *, int *); @@ -1680,6 +1691,8 @@ int setlcid(struct proc *, struct setlcid_args *, int *); int getlcid(struct proc *, struct getlcid_args *, int *); int __mac_mount(struct proc *, struct __mac_mount_args *, int *); +int __mac_get_mount(struct proc *, struct __mac_get_mount_args *, int *); +int __mac_getfsstat(struct proc *, struct __mac_getfsstat_args *, int *); __END_DECLS #undef PAD_ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#7 (text+ko) ==== @@ -195,7 +195,7 @@ int __mac_mount(struct proc *p, register struct __mac_mount_args *uap, __unused register_t *retval) { - struct vnode *vp; + struct vnode *vp, *uvp; struct vnode *devvp = NULLVP; struct vnode *device_vnode = NULLVP; #ifdef MAC @@ -237,12 +237,40 @@ if ((vp->v_flag & VROOT) && (vp->v_mount->mnt_flag & MNT_ROOTFS)) uap->flags |= MNT_UPDATE; + + error = copyinstr(uap->type, fstypename, MFSNAMELEN, &dummy); + if (error) + return (error); if (uap->flags & MNT_UPDATE) { if ((vp->v_flag & VROOT) == 0) { error = EINVAL; goto out1; } + + /* Handle UNION mounts */ + if (strcmp(vp->v_mount->mnt_vtable->vfc_name, + fstypename) != 0) { + uvp = vp; + /* Walk the stack, looking for our fstypename */ + while ((uvp = uvp->v_mount->mnt_vnodecovered) != NULL) { + if ((uvp->v_flag & VROOT) == 0) { + error = EINVAL; + goto out1; + } + if (strcmp(uvp->v_mount->mnt_vtable->vfc_name, + fstypename) != 0) + continue; + + if (vnode_getwithvid(uvp, uvp->v_id)) { + error = EINVAL; + goto out1; + } + vnode_put(vp); + vp = uvp; + break; + } + } mp = vp->v_mount; /* unmount in progress return error */ @@ -326,8 +354,6 @@ error = ENOTDIR; goto out1; } - if ( (error = copyinstr(uap->type, fstypename, MFSNAMELEN, &dummy)) ) - goto out1; /* XXXAUDIT: Should we capture the type on the error path as well? */ AUDIT_ARG(text, fstypename); @@ -548,6 +574,7 @@ FREE(labelstr, M_MACTEMP); goto out3; } + AUDIT_ARG(mac_string, labelstr); } #endif /* @@ -1276,6 +1303,7 @@ struct getfsstat_struct { user_addr_t sfsp; + user_addr_t *mp; int count; int maxcount; int flags; @@ -1318,6 +1346,15 @@ return(VFS_RETURNED_DONE); } fstp->sfsp += my_size; + + if (fstp->mp) { + error = mac_mount_getlabel(mp, *fstp->mp); + if (error) { + fstp->error = error; + return(VFS_RETURNED_DONE); + } + fstp->mp++; + } } fstp->count++; return(VFS_RETURNED); @@ -1329,9 +1366,25 @@ int getfsstat(__unused proc_t p, struct getfsstat_args *uap, int *retval) { + struct __mac_getfsstat_args muap; + + muap.buf = uap->buf; + muap.bufsize = uap->bufsize; + muap.mac = USER_ADDR_NULL; + muap.macsize = 0; + muap.flags = uap->flags; + + return (__mac_getfsstat(p, &muap, retval)); +} + +int +__mac_getfsstat(__unused proc_t p, struct __mac_getfsstat_args *uap, int *retval) +{ user_addr_t sfsp; + user_addr_t *mp; int count, maxcount; struct getfsstat_struct fst; + int error; if (IS_64BIT_PROCESS(p)) { maxcount = uap->bufsize / sizeof(struct user_statfs); @@ -1342,7 +1395,35 @@ sfsp = uap->buf; count = 0; + mp = NULL; + if (uap->mac != USER_ADDR_NULL) { + u_int32_t *mp0; + int i; + + count = (int)(uap->macsize / (IS_64BIT_PROCESS(p) ? 8 : 4)); + if (count != maxcount) + return (EINVAL); + + /* Copy in the array */ + MALLOC(mp0, u_int32_t *, uap->macsize, M_MACTEMP, M_WAITOK); + error = copyin(CAST_USER_ADDR_T(uap->mac), mp0, uap->macsize); + if (error) + return (error); + + /* Normalize to an array of user_addr_t */ + MALLOC(mp, user_addr_t *, count * sizeof(user_addr_t), M_MACTEMP, M_WAITOK); + for (i = 0; i < count; i++) { + if (IS_64BIT_PROCESS(p)) + mp[i] = ((user_addr_t *)mp0)[i]; + else + mp[i] = (user_addr_t)mp0[i]; + } + FREE(mp0, M_MACTEMP); + } + + fst.sfsp = sfsp; + fst.mp = mp; fst.flags = uap->flags; fst.count = 0; fst.error = 0; @@ -1351,6 +1432,9 @@ vfs_iterate(0, getfsstat_callback, &fst); + if (mp) + FREE(mp, M_MACTEMP); + if (fst.error ) { KAUTH_DEBUG("ERROR - %s gets %d", p->p_comm, fst.error); return(fst.error); @@ -5698,9 +5782,9 @@ * disk as they look huge. This change should not affect * XSAN as they should not setting these to -1.. */ - && (sfsp->f_blocks != 0xffffffffffffffff) - && (sfsp->f_bfree != 0xffffffffffffffff) - && (sfsp->f_bavail != 0xffffffffffffffff)) { + && (sfsp->f_blocks != 0xffffffffffffffffULL) + && (sfsp->f_bfree != 0xffffffffffffffffULL) + && (sfsp->f_bavail != 0xffffffffffffffffULL)) { int shift; /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#7 (text+ko) ==== @@ -89,6 +89,7 @@ int mac_get_lctx(mac_t _label); int mac_get_link(const char *_path, mac_t _label); int mac_get_peer(int fd, struct mac *label); +int mac_getmntinfo(struct statfs **mntbufp, mac_t **macp, int flags); int mac_get_pid(pid_t _pid, mac_t _label); int mac_get_proc(mac_t _label); int mac_is_present(const char *_policyname); @@ -100,8 +101,9 @@ int mac_set_file(const char *_path, mac_t _label); int mac_set_lctx(mac_t _label); int mac_set_link(const char *_path, mac_t _label); -int mac_mount(const char *type, const char *dir, int flags, void *data, +int mac_mount(const char *type, const char *path, int flags, void *data, struct mac *label); +int mac_get_mount(const char *path, struct mac *label); int mac_set_proc(const mac_t _label); int mac_syscall(const char *_policyname, int _call, void *_arg); int mac_to_text(mac_t mac, char **_text); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#9 (text+ko) ==== @@ -1675,6 +1675,70 @@ return (error); } +int +mac_mount_getlabel(struct mount *mp, user_addr_t mac_p) +{ + char *elements, *buffer; + struct label *label; + struct mac mac; + int error; + size_t ulen; + + error = copyin(CAST_USER_ADDR_T(mac_p), &mac, sizeof(mac)); + if (error) + return (error); + + error = mac_check_structmac_consistent(&mac); + if (error) + return (error); + + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); + error = copyinstr(CAST_USER_ADDR_T(mac.m_string), elements, + mac.m_buflen, &ulen); + if (error) { + FREE(elements, M_MACTEMP); + return (error); + } + AUDIT_ARG(mac_string, elements); + + label = mp->mnt_mntlabel; + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + error = mac_mount_externalize_label(label, elements, buffer, + mac.m_buflen); + FREE(elements, M_MACTEMP); + + if (error == 0) + error = copyout(buffer, CAST_USER_ADDR_T(mac.m_string), + strlen(buffer) + 1); + FREE(buffer, M_MACTEMP); + + return (error); +} + +int +__mac_get_mount(struct proc *p __unused, struct __mac_get_mount_args *uap, + register_t *ret __unused) +{ + struct nameidata nd; + struct vfs_context context; + struct mount *mp; + int error; + + context.vc_proc = p; + context.vc_ucred = kauth_cred_get(); + + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, + UIO_USERSPACE, uap->path, &context); + error = namei(&nd); + if (error) { + return (error); + } + mp = nd.ni_vp->v_mount; + nameidone(&nd); + + return mac_mount_getlabel(mp, uap->mac_p); +} + #else /* MAC */ int @@ -1804,4 +1868,12 @@ return (ENOSYS); } + +int +__mac_get_mount(struct proc *p __unused, + struct __mac_get_mount_args *uap __unused, register_t *ret __unused) +{ + + return (ENOSYS); +} #endif /* !MAC */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#4 (text+ko) ==== @@ -123,6 +123,7 @@ int mac_mount_internalize_label(struct label *, char *string); int mac_mount_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen); +int mac_mount_getlabel(struct mount *mp, user_addr_t mac_p); struct label *mac_cred_alloc_label(void); void mac_cred_free_label(struct label *label); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 15:15:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A477416A4EB; Thu, 7 Sep 2006 15:15:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C80716A4E8 for ; Thu, 7 Sep 2006 15:15:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74D9043D7C for ; Thu, 7 Sep 2006 15:15:28 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87FFSN7024344 for ; Thu, 7 Sep 2006 15:15:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87FFSfR024341 for perforce@freebsd.org; Thu, 7 Sep 2006 15:15:28 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 15:15:28 GMT Message-Id: <200609071515.k87FFSfR024341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 15:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=105796 Change 105796 by millert@millert_g5tower on 2006/09/07 15:14:35 o Enable failure messages in getmntopts(). o Enhance mac_label_opt() to support concatenation of multiple '-o label=foo' options. o Minor mount(8) modifications. o Fix label= option parsing in mount_XXX(8) help utilities. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/getmntopts.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/maclabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/maclabel.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount_ufs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_cd9660.tproj/mount_cd9660.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_devfs.tproj/mount_devfs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_fdesc.tproj/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_fdesc.tproj/mount_fdesc.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_hfs.tproj/mount_hfs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_nfs.tproj/mount_nfs.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/getmntopts.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ #include "mntopts.h" -int getmnt_silent = 1; +int getmnt_silent = 0; void getmntopts(options, m0, flagp, altflagp) ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/maclabel.c#2 (text+ko) ==== @@ -25,6 +25,7 @@ */ #include +#include #include #include @@ -35,14 +36,43 @@ * replacing the ':' delimiter with a ','. */ int -mac_label_opt(void * optarg, mac_t mac) +mac_label_opt(char *optarg, mac_t mac) { - char *lstr = NULL; + char *ch, *lstr, *ostr; + int len; + + /* Prepare for surgery */ + ostr = strdup(optarg); + if (ostr == NULL) + return (-1); + + /* Find location of first char after 'label=' */ + lstr = strcasestr(ostr, "label="); + if (lstr == NULL) { + free(ostr); + return (-1); + } + lstr += 6; + + /* Terminate after label string */ + if ((ch = strchr(ostr, ',')) != NULL) + *ch = '\0'; + /* Convert the label separator to internal form. */ - while ((lstr = strchr(optarg, ':')) != NULL) - *lstr = ','; - lstr = strchr(optarg, '=') + 1; - mac->m_buflen = strlen(lstr) + 1; - strncpy(mac->m_string, lstr, MAC_MAX_LABEL_BUF_LEN); + while ((ch = strchr(lstr, ':')) != NULL) + *ch = ','; + + /* Add separator */ + len = strlen(mac->m_string); + if (len > 0) { + strncat(mac->m_string, ",", MAC_MAX_LABEL_BUF_LEN - len); + len++; + } + + /* Concatenate new label with existing */ + strncat(mac->m_string, lstr, MAC_MAX_LABEL_BUF_LEN - len); + mac->m_buflen = strlen(mac->m_string) + 1; + + free(ostr); return (0); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/maclabel.h#2 (text+ko) ==== @@ -24,4 +24,4 @@ * SUCH DAMAGE. */ -int mac_label_opt(void * optarg, mac_t mac); +int mac_label_opt(char *optarg, mac_t mac); ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.8#2 (text+ko) ==== @@ -39,7 +39,7 @@ .Nd mount file systems .Sh SYNOPSIS .Nm mount -.Op Fl adfruvw +.Op Fl Zadfruvw .Op Fl t Ar ufs | lfs | external_type .Nm mount .Op Fl dfruvw @@ -74,6 +74,9 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl Z +Display each mount point's MAC label; see +.Xr maclabel 7 . .It Fl a All the filesystems described in .Xr fstab 5 ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.c#2 (text+ko) ==== @@ -68,9 +68,11 @@ #include #include +#include + #include "pathnames.h" -int debug, verbose; +int debug, verbose, prlabels; int checkvfsname __P((const char *, const char **)); char *catopt __P((char *, const char *)); @@ -83,7 +85,7 @@ void mangle __P((char *, int *, const char **)); int mountfs __P((const char *, const char *, const char *, int, const char *, const char *)); -void prmount __P((struct statfs *)); +void prmount __P((struct statfs *, char *)); void usage __P((void)); /* From mount_ufs.c. */ @@ -119,6 +121,7 @@ const char *mntfromname, **vfslist, *vfstype; struct fstab *fs; struct statfs *mntbuf; + mac_t *macbuf; FILE *mountdfp; pid_t pid; int all, ch, i, init_flags, mntsize, rval; @@ -129,7 +132,7 @@ options = NULL; vfslist = NULL; vfstype = "ufs"; - while ((ch = getopt(argc, argv, "adfo:rwt:uv")) != EOF) + while ((ch = getopt(argc, argv, "adfo:rwt:uvZ")) != EOF) switch (ch) { case 'a': all = 1; @@ -162,6 +165,9 @@ case 'w': init_flags &= ~MNT_RDONLY; break; + case 'Z': + prlabels = 1; + break; case '?': default: usage(); @@ -200,12 +206,21 @@ } endfsent(); } else { - if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) - err(1, "getmntinfo"); + if (prlabels) { + if ((mntsize = mac_getmntinfo(&mntbuf, &macbuf, MNT_NOWAIT)) == 0) + err(1, "mac_getmntinfo"); + } else { + if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) + err(1, "getmntinfo"); + } for (i = 0; i < mntsize; i++) { if (checkvfsname(mntbuf[i].f_fstypename, vfslist)) continue; - prmount(&mntbuf[i]); + if (prlabels) { + prmount(&mntbuf[i], macbuf[i]->m_string); + mac_free(macbuf[i]); + } else + prmount(&mntbuf[i], NULL); } } exit(rval); @@ -453,7 +468,7 @@ warn("statfs %s", name); return (1); } - prmount(&sf); + prmount(&sf, NULL); } break; } @@ -462,8 +477,9 @@ } void -prmount(sfp) +prmount(sfp, label) struct statfs *sfp; + char *label; { int flags; struct opt *o; @@ -485,6 +501,8 @@ else (void)printf("%d", sfp->f_owner); } + if (label) + (void)printf("%slabel=%s", !f++ ? " (" : ", ", label); (void)printf(f ? ")\n" : "\n"); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount_ufs.c#2 (text+ko) ==== @@ -110,6 +110,12 @@ mac_t mlabel = NULL; struct mac mac; char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; + char *p; + + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; mntflags = 0; noasync = 0; @@ -123,11 +129,11 @@ if (mntflags & MNT_SYNCHRONOUS) noasync = 1; if (mntflags & MNT_LABEL) { - mac.m_string = labelstr; - if (mac_label_opt(optarg, &mac) == 0) - mlabel = &mac; - else - usage(); + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(p, &mac) != 0) + usage(); + } } break; case '?': @@ -137,6 +143,9 @@ argc -= optind; argv += optind; + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (argc != 2) ufs_usage(); ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_cd9660.tproj/mount_cd9660.c#2 (text+ko) ==== @@ -172,13 +172,20 @@ int ch, mntflags, opts; char *dev, dir[MAXPATHLEN]; int altflg; - mac_t mlabel = NULL; + mac_t mlabel; struct mac mac; char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; + char *p; mntflags = opts = 0; memset(&args, 0, sizeof args); args.ssector = -1; + + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; + while ((ch = getopt(argc, argv, "egjo:rs:")) != EOF) switch (ch) { case 'e': @@ -193,11 +200,11 @@ case 'o': getmntopts(optarg, mopts, &mntflags, &altflg); if (mntflags & MNT_LABEL) { - mac.m_string = labelstr; - if (mac_label_opt(optarg, &mac) == 0) - mlabel = &mac; - else - usage(); + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(optarg, &mac) != 0) + usage(); + } } break; case 'r': @@ -213,6 +220,9 @@ argc -= optind; argv += optind; + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (argc != 2) usage(); ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_devfs.tproj/mount_devfs.c#2 (text+ko) ==== @@ -80,6 +80,7 @@ struct mntopt mopts[] = { MOPT_STDOPTS, + MOPT_UPDATE, { NULL } }; @@ -92,21 +93,28 @@ { int ch, mntflags; char dir[MAXPATHLEN]; - mac_t mlabel = NULL; + mac_t mlabel; struct mac mac; char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; + char *p; + + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; mntflags = 0; + while ((ch = getopt(argc, argv, "o:")) != EOF) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags, 0); if (mntflags & MNT_LABEL) { - mac.m_string = labelstr; - if (mac_label_opt(optarg, &mac) == 0) - mlabel = &mac; - else - usage(); + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(p, &mac) != 0) + usage(); + } } break; case '?': @@ -116,6 +124,9 @@ argc -= optind; argv += optind; + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (argc != 2) usage(); ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_fdesc.tproj/Makefile#2 (text+ko) ==== @@ -23,7 +23,7 @@ NEXTSTEP_INSTALLDIR = /sbin WINDOWS_INSTALLDIR = /sbin PDO_UNIX_INSTALLDIR = /sbin -LIBS = -ldisk +LIBS = -ldisk $(LIBMAC) DEBUG_LIBS = $(LIBS) PROF_LIBS = $(LIBS) ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_fdesc.tproj/mount_fdesc.c#2 (text+ko) ==== @@ -61,6 +61,8 @@ #include #include +#include + #include #include #include @@ -68,9 +70,11 @@ #include #include "mntopts.h" +#include "maclabel.h" struct mntopt mopts[] = { MOPT_STDOPTS, + MOPT_UPDATE, { NULL } }; @@ -83,12 +87,28 @@ { int ch, mntflags; char dir[MAXPATHLEN]; + mac_t mlabel; + struct mac mac; + char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; + char *p; + + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; mntflags = 0; while ((ch = getopt(argc, argv, "o:")) != EOF) switch (ch) { case 'o': getmntopts(optarg, mopts, &mntflags, 0); + if (mntflags & MNT_LABEL) { + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(p, &mac) != 0) + usage(); + } + } break; case '?': default: @@ -97,13 +117,16 @@ argc -= optind; argv += optind; + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (argc != 2) usage(); if (realpath(argv[1], dir) == NULL) err(1, "realpath %s", dir); - if (mount("fdesc", dir, mntflags, NULL)) + if (mac_mount("fdesc", dir, mntflags, NULL, mlabel)) err(1, NULL); exit(0); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_hfs.tproj/mount_hfs.c#2 (text+ko) ==== @@ -315,13 +315,18 @@ struct timeval dummy_timeval; /* gettimeofday() crashes if the first argument is NULL */ u_long localCreateTime; struct hfs_mnt_encoding *encp; - mac_t mlabel = NULL; + mac_t mlabel; struct mac mac; char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; + char *p; mntflags = 0; encp = NULL; (void)memset(&args, '\0', sizeof(struct hfs_mount_args)); + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; /* * For a mount update, the following args must be explictly @@ -394,11 +399,11 @@ #endif }; if (mntflags & MNT_LABEL) { - mac.m_string = labelstr; - if (mac_label_opt(optarg, &mac) == 0) - mlabel = &mac; - else - usage(); + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(p, &mac) != 0) + usage(); + } } } break; @@ -420,6 +425,9 @@ argc -= optind; argv += optind; + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (argc != 2) { #if DEBUG printf("mount_hfs: ERROR: argc == %d != 2\n", argc); ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_nfs.tproj/mount_nfs.c#2 (text+ko) ==== @@ -250,7 +250,7 @@ struct nfsd_cargs ncd; int mntflags, altflags, i, nfssvc_flag, num; char name[MAXPATHLEN], *p, *p2, *spec; - mac_t mlabel = NULL; + mac_t mlabel; struct mac mac; char labelstr[MAC_MAX_LABEL_BUF_LEN + 1]; #ifdef NFSKERB @@ -265,6 +265,11 @@ fprintf(stderr, "Yikes! NFSKERB structs not packed!!\n"); #endif /* NFSKERB */ + (void)memset(labelstr, '\0', sizeof(labelstr)); + (void)memset(&mac, '\0', sizeof(struct mac)); + mac.m_string = labelstr; + mlabel = NULL; + /* drop setuid root privs asap */ eff_uid = geteuid(); real_uid = getuid(); @@ -347,11 +352,11 @@ case 'o': getmntopts(optarg, mopts, &mntflags, &altflags); if (mntflags & MNT_LABEL) { - mac.m_string = labelstr; - if (mac_label_opt(optarg, &mac) == 0) - mlabel = &mac; - else - usage(); + p = strcasestr(optarg, "label="); + if (p != NULL) { + if (mac_label_opt(p, &mac) != 0) + usage(); + } } if(altflags & ALTF_BG) opflags |= BGRND; @@ -622,6 +627,9 @@ argc -= optind; argv += optind; + if (mntflags & MNT_LABEL) + mlabel = &mac; + if (argc != 2) { usage(); /* NOTREACHED */ From owner-p4-projects@FreeBSD.ORG Thu Sep 7 15:17:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C14016A4E7; Thu, 7 Sep 2006 15:17:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C9BA16A4E6 for ; Thu, 7 Sep 2006 15:17:32 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EAB643D5F for ; Thu, 7 Sep 2006 15:17:31 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87FHV6r024426 for ; Thu, 7 Sep 2006 15:17:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87FHVQn024423 for perforce@freebsd.org; Thu, 7 Sep 2006 15:17:31 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 15:17:31 GMT Message-Id: <200609071517.k87FHVQn024423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 15:17:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=105797 Change 105797 by millert@millert_g5tower on 2006/09/07 15:17:14 o Conditionalize FreeBSD bits. o Use kauth_cred_dup_add(). o Fix fallback conditionals. o Export sbuf_len, _kauth_cred_dup and _kauth_cred_dup_add. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#3 (text+ko) ==== @@ -17,6 +17,7 @@ _sbuf_printf _sbuf_putc _sbuf_vprintf +_sbuf_len _strsep _IS_64BIT_PROCESS @@ -24,6 +25,9 @@ _VNOP_SETXATTR _VNOP_GETXATTR +_kauth_cred_dup +_kauth_cred_dup_add + _mac_kalloc _mac_kfree _mac_wire ==== //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#4 (text+ko) ==== @@ -369,11 +369,9 @@ struct mac_console *mc; int error; +#if defined(__FreeBSD__) if (strcmp(MAC_CONSOLE_LABEL_NAME, element_name) != 0) -#if defined(__FreeBSD__) return (0); -#elif defined(__APPLE__) - return (EINVAL); #endif mc = SLOT(label); @@ -414,11 +412,9 @@ struct mac_console *mc; int error; +#if defined(__FreeBSD__) if (strcmp(MAC_CONSOLE_LABEL_NAME, element_name) != 0) -#if defined(__FreeBSD__) return (0); -#elif defined(__APPLE__) - return (EINVAL); #endif mc = SLOT(label); @@ -457,11 +453,9 @@ { struct mac_console *mc; +#if defined(__FreeBSD__) if (strcmp(MAC_CONSOLE_LABEL_NAME, element_name) != 0) -#if defined(__FreeBSD__) return (0); -#elif defined(__APPLE__) - return (EINVAL); #endif mc = SLOT(label); @@ -506,7 +500,7 @@ crfree(oldcred); #elif defined (__APPLE__) oldcred = proc_ucred(p); - newcred = kauth_cred_dup(oldcred); + newcred = kauth_cred_dup_add(oldcred); p->p_ucred = newcred; kauth_cred_rele(oldcred); #endif @@ -583,7 +577,7 @@ #endif /* Fall back to the fslabel. */ - if (error == ENOATTR || error == EOPNOTSUPP || blen == 0) { + if (error == ENOATTR || error == ENOTSUP || error == EPERM || blen == 0) { /* Fall back to the fslabel. */ mac_console_copy_label(fslabel, vlabel); return (0); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 16:55:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66F1D16A52D; Thu, 7 Sep 2006 16:55:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2829016A50B for ; Thu, 7 Sep 2006 16:55:52 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B572E43D79 for ; Thu, 7 Sep 2006 16:55:33 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87GtX6j039047 for ; Thu, 7 Sep 2006 16:55:33 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87GtXsW039044 for perforce@freebsd.org; Thu, 7 Sep 2006 16:55:33 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Sep 2006 16:55:33 GMT Message-Id: <200609071655.k87GtXsW039044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 16:55:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=105799 Change 105799 by mjacob@newisp on 2006/09/07 16:55:22 IFC. Affected files ... .. //depot/projects/newisp/amd64/amd64/machdep.c#2 integrate .. //depot/projects/newisp/i386/i386/machdep.c#2 integrate .. //depot/projects/newisp/netinet/tcp_input.c#3 integrate .. //depot/projects/newisp/netinet/tcp_output.c#2 integrate .. //depot/projects/newisp/netinet/tcp_subr.c#4 integrate .. //depot/projects/newisp/netinet/tcp_timer.c#3 integrate .. //depot/projects/newisp/netinet/tcp_timer.h#2 integrate .. //depot/projects/newisp/netinet/tcp_var.h#3 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -160,8 +160,10 @@ long Maxmem = 0; long realmem = 0; -vm_paddr_t phys_avail[20]; -vm_paddr_t dump_avail[20]; +#define PHYSMAP_SIZE (2 * 30) + +vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; +vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2) @@ -832,8 +834,6 @@ } #endif -#define PHYSMAP_SIZE (2 * 20) - u_int basemem; /* ==== //depot/projects/newisp/i386/i386/machdep.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.633 2006/08/09 23:37:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.634 2006/09/07 15:03:02 jhb Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -188,8 +188,10 @@ long Maxmem = 0; long realmem = 0; -vm_paddr_t phys_avail[10]; -vm_paddr_t dump_avail[10]; +#define PHYSMAP_SIZE (2 * 16) + +vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; +vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2) @@ -1614,8 +1616,6 @@ ssd->ssd_gran = sd->sd_gran; } -#define PHYSMAP_SIZE (2 * 8) - /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and ==== //depot/projects/newisp/netinet/tcp_input.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.305 2006/09/06 21:51:58 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.306 2006/09/07 13:06:00 ru Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -3187,7 +3187,7 @@ const int isipv6 = 0; #endif - /* tcbinfo lock required for tcp_twclose(), tcp_2msl_reset. */ + /* tcbinfo lock required for tcp_twclose(), tcp_timer_2msl_reset(). */ INP_INFO_WLOCK_ASSERT(&tcbinfo); INP_LOCK_ASSERT(inp); @@ -3256,7 +3256,7 @@ if (thflags & TH_FIN) { seq = th->th_seq + tlen + (thflags & TH_SYN ? 1 : 0); if (seq + 1 == tw->rcv_nxt) - tcp_timer_2msl_reset(tw, 2 * tcp_msl, 1); + tcp_timer_2msl_reset(tw, 1); } /* ==== //depot/projects/newisp/netinet/tcp_output.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.115 2006/02/23 21:14:34 qingli Exp $ + * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.116 2006/09/07 12:53:01 andre Exp $ */ #include "opt_inet.h" @@ -105,6 +105,10 @@ SYSCTL_INT(_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"); + /* * Tcp output routine: figure out what should be sent and send it. */ @@ -127,6 +131,7 @@ int i, sack_rxmit; int sack_bytes_rxmt; struct sackhole *p; + int tso = 0; #if 0 int maxburst = TCP_MAXBURST; #endif @@ -376,12 +381,34 @@ /* * len will be >= 0 after this point. Truncate to the maximum - * segment length and ensure that FIN is removed if the length - * no longer contains the last data byte. + * segment length or enable TCP Segmentation Offloading (if supported + * by hardware) and ensure that FIN is removed if the length no longer + * contains the last data byte. + * + * TSO may only be used if we are in a pure bulk sending state. The + * presence of TCP-MD5, SACK retransmits, SACK advertizements and + * IP options prevent using TSO. With TSO the TCP header is the same + * (except for the sequence number) for all generated packets. This + * makes it impossible to transmit any options which vary per generated + * segment or packet. + * + * The length of TSO bursts is limited to TCP_MAXWIN. That limit and + * removal of FIN (if not already catched here) are handled later after + * the exact length of the TCP options are known. */ if (len > tp->t_maxseg) { - len = tp->t_maxseg; - sendalot = 1; + if ((tp->t_flags & TF_TSO) && tcp_do_tso && + ((tp->t_flags & TF_SIGNATURE) == 0) && + tp->rcv_numsacks == 0 && sack_rxmit == 0 && + tp->t_inpcb->inp_options == NULL && + tp->t_inpcb->in6p_options == NULL && + tp->t_inpcb->inp_sp == NULL) { + tso = 1; + } else { + len = tp->t_maxseg; + sendalot = 1; + tso = 0; + } } if (sack_rxmit) { if (SEQ_LT(p->rxmit + len, tp->snd_una + so->so_snd.sb_cc)) @@ -397,7 +424,7 @@ * Sender silly window avoidance. We transmit under the following * conditions when len is non-zero: * - * - We have a full segment + * - We have a full segment (or more with TSO) * - This is the last buffer in a write()/send() and we are * either idle or running NODELAY * - we've timed out (e.g. persist timer) @@ -406,7 +433,7 @@ * - we need to retransmit */ if (len) { - if (len == tp->t_maxseg) + if (len >= tp->t_maxseg) goto send; /* * NOTE! on localhost connections an 'ack' from the remote @@ -702,14 +729,24 @@ * bump the packet length beyond the t_maxopd length. * Clear the FIN bit because we cut off the tail of * the segment. + * + * When doing TSO limit a burst to TCP_MAXWIN and set the + * flag to continue sending and prevent the last segment + * from being fractional thus making them all equal sized. */ if (len + optlen + ipoptlen > tp->t_maxopd) { - /* - * If there is still more to send, don't close the connection. - */ flags &= ~TH_FIN; - len = tp->t_maxopd - optlen - ipoptlen; - sendalot = 1; + if (tso) { + if (len > TCP_MAXWIN) { + len = TCP_MAXWIN - TCP_MAXWIN % + (tp->t_maxopd - optlen); + sendalot = 1; + } else if (tp->t_flags & TF_NEEDFIN) + sendalot = 1; + } else { + len = tp->t_maxopd - optlen - ipoptlen; + sendalot = 1; + } } /*#ifdef DIAGNOSTIC*/ @@ -947,6 +984,16 @@ } /* + * Enable TSO and specify the size of the segments. + * The TCP pseudo header checksum is always provided. + * XXX: Fixme: This is currently not the case for IPv6. + */ + if (tso) { + m->m_pkthdr.csum_flags = CSUM_TSO; + m->m_pkthdr.tso_segsz = tp->t_maxopd - optlen; + } + + /* * In transmit state, time the transmission and arrange for * the retransmit. In persist state, just set snd_max. */ @@ -1119,11 +1166,22 @@ } if (error == EMSGSIZE) { /* - * ip_output() will have already fixed the route - * for us. tcp_mtudisc() will, as its last action, - * initiate retransmission, so it is important to - * not do so here. + * For some reason the interface we used initially + * to send segments changed to another or lowered + * its MTU. + * + * tcp_mtudisc() will find out the new MTU and as + * its last action, initiate retransmission, so it + * is important to not do so here. + * + * If TSO was active we either got an interface + * without TSO capabilits or TSO was turned off. + * Disable it for this connection as too and + * immediatly retry with MSS sized segments generated + * by this function. */ + if (tso) + tp->t_flags &= ~TF_TSO; tcp_mtudisc(tp->t_inpcb, 0); return 0; } ==== //depot/projects/newisp/netinet/tcp_subr.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.260 2006/09/06 21:51:58 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.261 2006/09/07 13:06:00 ru Exp $ */ #include "opt_compat.h" @@ -1736,7 +1736,7 @@ { struct tcptw *tw; struct inpcb *inp; - int tw_time, acknow; + int acknow; struct socket *so; INP_INFO_WLOCK_ASSERT(&tcbinfo); /* tcp_timer_2msl_reset(). */ @@ -1781,7 +1781,6 @@ * be used for fin-wait-2 state also, then we may need * a ts_recent from the last segment. */ - tw_time = 2 * tcp_msl; acknow = tp->t_flags & TF_ACKNOW; /* @@ -1803,7 +1802,7 @@ tcp_twrespond(tw, TH_ACK); inp->inp_ppcb = tw; inp->inp_vflag |= INP_TIMEWAIT; - tcp_timer_2msl_reset(tw, tw_time, 0); + tcp_timer_2msl_reset(tw, 0); /* * If the inpcb owns the sole reference to the socket, then we can ==== //depot/projects/newisp/netinet/tcp_timer.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_timer.c,v 1.83 2006/09/06 13:56:35 glebius Exp $ + * $FreeBSD: src/sys/netinet/tcp_timer.c,v 1.85 2006/09/07 13:06:00 ru Exp $ */ #include "opt_inet6.h" @@ -230,46 +230,30 @@ } /* - * The timed wait lists contain references to each of the TCP sessions - * currently TIME_WAIT state. The list pointers, including the list pointers - * in each tcptw structure, are protected using the global tcbinfo lock, - * which must be held over list iteration and modification. + * The timed wait queue contains references to each of the TCP sessions + * currently in the TIME_WAIT state. The queue pointers, including the + * queue pointers in each tcptw structure, are protected using the global + * tcbinfo lock, which must be held over queue iteration and modification. */ -struct twlist { - LIST_HEAD(, tcptw) tw_list; - struct tcptw tw_tail; -}; -#define TWLIST_NLISTS 2 -static struct twlist twl_2msl[TWLIST_NLISTS]; -static struct twlist *tw_2msl_list[] = { &twl_2msl[0], &twl_2msl[1], NULL }; +static TAILQ_HEAD(, tcptw) twq_2msl; void tcp_timer_init(void) { - int i; - struct twlist *twl; - for (i = 0; i < TWLIST_NLISTS; i++) { - twl = &twl_2msl[i]; - LIST_INIT(&twl->tw_list); - LIST_INSERT_HEAD(&twl->tw_list, &twl->tw_tail, tw_2msl); - } + TAILQ_INIT(&twq_2msl); } void -tcp_timer_2msl_reset(struct tcptw *tw, int timeo, int rearm) +tcp_timer_2msl_reset(struct tcptw *tw, int rearm) { - int i; - struct tcptw *tw_tail; INP_INFO_WLOCK_ASSERT(&tcbinfo); INP_LOCK_ASSERT(tw->tw_inpcb); if (rearm) - LIST_REMOVE(tw, tw_2msl); - tw->tw_time = timeo + ticks; - i = timeo > tcp_msl ? 1 : 0; - tw_tail = &twl_2msl[i].tw_tail; - LIST_INSERT_BEFORE(tw_tail, tw, tw_2msl); + TAILQ_REMOVE(&twq_2msl, tw, tw_2msl); + tw->tw_time = ticks + 2 * tcp_msl; + TAILQ_INSERT_TAIL(&twq_2msl, tw, tw_2msl); } void @@ -277,31 +261,23 @@ { INP_INFO_WLOCK_ASSERT(&tcbinfo); - LIST_REMOVE(tw, tw_2msl); + TAILQ_REMOVE(&twq_2msl, tw, tw_2msl); } struct tcptw * tcp_timer_2msl_tw(int reuse) { - struct tcptw *tw, *tw_tail; - struct twlist *twl; - int i; + struct tcptw *tw; INP_INFO_WLOCK_ASSERT(&tcbinfo); - for (i = 0; i < TWLIST_NLISTS; i++) { - twl = tw_2msl_list[i]; - tw_tail = &twl->tw_tail; - - for (;;) { - tw = LIST_FIRST(&twl->tw_list); - if (tw == tw_tail || (!reuse && tw->tw_time > ticks)) - break; - INP_LOCK(tw->tw_inpcb); - tcp_twclose(tw, reuse); - if (reuse) - return (tw); - } - + for (;;) { + tw = TAILQ_FIRST(&twq_2msl); + if (tw == NULL || (!reuse && tw->tw_time > ticks)) + break; + INP_LOCK(tw->tw_inpcb); + tcp_twclose(tw, reuse); + if (reuse) + return (tw); } return (NULL); } ==== //depot/projects/newisp/netinet/tcp_timer.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/tcp_timer.h,v 1.29 2006/08/11 21:15:23 mohans Exp $ + * $FreeBSD: src/sys/netinet/tcp_timer.h,v 1.30 2006/09/07 13:06:00 ru Exp $ */ #ifndef _NETINET_TCP_TIMER_H_ @@ -156,7 +156,7 @@ void tcp_timer_2msl(void *xtp); struct tcptw * tcp_timer_2msl_tw(int _reuse); /* XXX temporary */ -void tcp_timer_2msl_reset(struct tcptw *_tw, int _timeo, int rearm); +void tcp_timer_2msl_reset(struct tcptw *_tw, int rearm); void tcp_timer_2msl_stop(struct tcptw *_tw); void tcp_timer_keep(void *xtp); void tcp_timer_persist(void *xtp); ==== //depot/projects/newisp/netinet/tcp_var.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.135 2006/09/06 21:51:58 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.136 2006/09/07 13:06:00 ru Exp $ */ #ifndef _NETINET_TCP_VAR_H_ @@ -276,7 +276,7 @@ u_long t_recent; u_long t_starttime; int tw_time; - LIST_ENTRY(tcptw) tw_2msl; + TAILQ_ENTRY(tcptw) tw_2msl; }; #define intotcpcb(ip) ((struct tcpcb *)(ip)->inp_ppcb) From owner-p4-projects@FreeBSD.ORG Thu Sep 7 19:16:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B94C216A4E8; Thu, 7 Sep 2006 19:16:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7AC8116A4DE for ; Thu, 7 Sep 2006 19:16:38 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E54043D7B for ; Thu, 7 Sep 2006 19:16:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87JGaRH052688 for ; Thu, 7 Sep 2006 19:16:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87JGaVE052685 for perforce@freebsd.org; Thu, 7 Sep 2006 19:16:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 19:16:36 GMT Message-Id: <200609071916.k87JGaVE052685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 19:16:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=105806 Change 105806 by millert@millert_macbook on 2006/09/07 19:16:02 Include sys/wait.h for WTERMSIG macro Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#15 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#15 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Sep 7 20:04:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F17D516A4ED; Thu, 7 Sep 2006 20:04:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CACB616A4EB for ; Thu, 7 Sep 2006 20:04:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12F1243D77 for ; Thu, 7 Sep 2006 20:03:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87K3iiU056509 for ; Thu, 7 Sep 2006 20:03:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87K3eu2056506 for perforce@freebsd.org; Thu, 7 Sep 2006 20:03:40 GMT (envelope-from imp@freebsd.org) Date: Thu, 7 Sep 2006 20:03:40 GMT Message-Id: <200609072003.k87K3eu2056506@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 105813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 20:04:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=105813 Change 105813 by imp@imp_paco-paco on 2006/09/07 20:03:38 IFC @105811 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#13 integrate .. //depot/projects/arm/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/version#2 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/arm/src/include/Makefile#3 integrate .. //depot/projects/arm/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/alloca.S#2 delete .. //depot/projects/arm/src/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_atfork.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#5 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#6 integrate .. //depot/projects/arm/src/share/man/man4/ddb.4#2 integrate .. //depot/projects/arm/src/share/man/man4/iic.4#2 integrate .. //depot/projects/arm/src/share/man/man5/make.conf.5#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#15 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/iic.c#6 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#22 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ehcivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/hid.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udavreg.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/kue_fw.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#7 integrate .. //depot/projects/arm/src/sys/dev/usb/sl811hs.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/uhcivar.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/umct.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_port.h#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi_util.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi_util.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdivar.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/arm/src/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/arm/src/sys/geom/gate/g_gate.h#4 integrate .. //depot/projects/arm/src/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#9 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/arm/src/sys/modules/agp/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/if.c#14 integrate .. //depot/projects/arm/src/sys/net/if.h#8 integrate .. //depot/projects/arm/src/sys/net/if_var.h#7 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#13 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#13 integrate .. //depot/projects/arm/src/usr.bin/truncate/truncate.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ppp/lcp.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ppp/ppp.8.m4#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.556 2006/09/07 16:41:30 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -11,7 +11,7 @@ # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list -# TARGET_ARCH="arch" to crossbuild world to a different arch +# TARGET="machine" to crossbuild world for a different machine type # # The intended user-driven targets are: @@ -95,14 +95,36 @@ OSRELDATE= 0 .endif .endif + +# Guess machine architecture from machine type, and vice versa. +.if !defined(TARGET_ARCH) && defined(TARGET) +TARGET_ARCH= ${TARGET:S/pc98/i386/} +.elif !defined(TARGET) && defined(TARGET_ARCH) && \ + ${TARGET_ARCH} != ${MACHINE_ARCH} +TARGET= ${TARGET_ARCH} +.endif +# Otherwise, default to current machine type and architecture. +TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == ${MACHINE_ARCH} -TARGET?= ${MACHINE} + +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +.if ${TARGET} == ${TARGET_ARCH} +_t= ${TARGET} +.else +_t= ${TARGET_ARCH}/${TARGET} +.endif +.for _t in ${_t} +.if empty(KNOWN_ARCHES:M${_t}) +.error Unknown target ${TARGET_ARCH}:${TARGET}. +.endif +.endfor + +.if ${TARGET} == ${MACHINE} TARGET_CPUTYPE?=${CPUTYPE} .else -TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif + .if !empty(TARGET_CPUTYPE) _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else ==== //depot/projects/arm/src/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,4 +1,11 @@ + --- 9.3.2-P1 released --- + +2066. [security] Handle SIG queries gracefully. [RT #16300] + +1941. [bug] ncache_adderesult() should set eresult even if no + rdataset is passed to it. [RT #15642] + --- 9.3.2 released --- --- 9.3.2rc1 released --- ==== //depot/projects/arm/src/contrib/bind9/bin/named/query.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ #include @@ -2393,7 +2393,7 @@ is_zone = ISC_FALSE; qtype = event->qtype; - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; @@ -2434,7 +2434,7 @@ /* * If it's a SIG query, we'll iterate the node. */ - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; ==== //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ #include @@ -762,7 +762,8 @@ INSIST(result != ISC_R_SUCCESS || dns_rdataset_isassociated(event->rdataset) || fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event)); } @@ -3188,7 +3189,8 @@ if (hevent != NULL) { if (!negative && !chaining && (fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig)) { + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig)) { /* * Don't bind rdatasets; the caller * will iterate the node. @@ -3306,7 +3308,8 @@ if (!ISC_LIST_EMPTY(fctx->validators)) { INSIST(!negative); INSIST(fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); /* * Don't send a response yet - we have * more rdatasets that still need to @@ -3455,14 +3458,15 @@ return (result); anodep = &event->node; /* - * If this is an ANY or SIG query, we're not going - * to return any rdatasets, unless we encountered + * If this is an ANY, SIG or RRSIG query, we're not + * going to return any rdatasets, unless we encountered * a CNAME or DNAME as "the answer". In this case, * we're going to return DNS_R_CNAME or DNS_R_DNAME * and we must set up the rdatasets. */ if ((fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) || + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) || (name->attributes & DNS_NAMEATTR_CHAINING) != 0) { ardataset = event->rdataset; asigrdataset = event->sigrdataset; @@ -3521,7 +3525,7 @@ */ if (secure_domain && rdataset->trust != dns_trust_glue) { /* - * SIGs are validated as part of validating the + * RRSIGs are validated as part of validating the * type they cover. */ if (rdataset->type == dns_rdatatype_rrsig) @@ -3591,7 +3595,8 @@ if (ANSWER(rdataset) && need_validation) { if (fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) { + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) { /* * This is The Answer. We will * validate it, but first we cache @@ -3763,23 +3768,28 @@ isc_result_t *eresultp) { isc_result_t result; + dns_rdataset_t rdataset; + + if (ardataset == NULL) { + dns_rdataset_init(&rdataset); + ardataset = &rdataset; + } result = dns_ncache_add(message, cache, node, covers, now, maxttl, ardataset); - if (result == DNS_R_UNCHANGED) { + if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) { /* - * The data in the cache are better than the negative cache - * entry we're trying to add. + * If the cache now contains a negative entry and we + * care about whether it is DNS_R_NCACHENXDOMAIN or + * DNS_R_NCACHENXRRSET then extract it. */ - if (ardataset != NULL && ardataset->type == 0) { + if (ardataset->type == 0) { /* - * The cache data is also a negative cache - * entry. + * The cache data is a negative cache entry. */ if (NXDOMAIN(ardataset)) *eresultp = DNS_R_NCACHENXDOMAIN; else *eresultp = DNS_R_NCACHENXRRSET; - result = ISC_R_SUCCESS; } else { /* * Either we don't care about the nature of the @@ -3791,14 +3801,11 @@ * XXXRTH There's a CNAME/DNAME problem here. */ *eresultp = ISC_R_SUCCESS; - result = ISC_R_SUCCESS; } - } else if (result == ISC_R_SUCCESS) { - if (NXDOMAIN(ardataset)) - *eresultp = DNS_R_NCACHENXDOMAIN; - else - *eresultp = DNS_R_NCACHENXRRSET; + result = ISC_R_SUCCESS; } + if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset)) + dns_rdataset_disassociate(ardataset); return (result); } ==== //depot/projects/arm/src/contrib/bind9/version#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.17.2.21 2005/12/14 00:43:14 marka Exp $ +# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=3 PATCHVER=2 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -66,6 +66,8 @@ .. utopia .. + vkbd + .. wi .. .. ==== //depot/projects/arm/src/include/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.262 2006/08/01 22:19:00 sobomax Exp $ +# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $ # # Doing a "make install" builds /usr/include. @@ -41,7 +41,7 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ - dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ + dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ ==== //depot/projects/arm/src/lib/libarchive/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.49 2006/05/01 01:02:19 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -35,12 +35,14 @@ INCS= archive.h archive_entry.h # Build archive.h from archive.h.in by substituting version information. +# Note: FreeBSD has inttypes.h, so enable that include in archive.h.in archive.h: archive.h.in Makefile cat ${.CURDIR}/archive.h.in | \ sed 's/@VERSION@/${VERSION}/g' | \ sed 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' | \ sed 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' | \ sed 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' | \ + sed 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include /* For int64_t */|g' | \ cat > archive.h # archive.h needs to be cleaned @@ -152,10 +154,12 @@ MLINKS+= archive_read.3 archive_read_data_skip.3 MLINKS+= archive_read.3 archive_read_extract.3 MLINKS+= archive_read.3 archive_read_extract_set_progress_callback.3 +MLINKS+= archive_read.3 archive_read_extract_set_skip_file.3 MLINKS+= archive_read.3 archive_read_finish.3 MLINKS+= archive_read.3 archive_read_new.3 MLINKS+= archive_read.3 archive_read_next_header.3 MLINKS+= archive_read.3 archive_read_open.3 +MLINKS+= archive_read.3 archive_read_open2.3 MLINKS+= archive_read.3 archive_read_open_fd.3 MLINKS+= archive_read.3 archive_read_open_file.3 MLINKS+= archive_read.3 archive_read_set_bytes_per_block.3 ==== //depot/projects/arm/src/lib/libarchive/archive.h.in#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/lib/libarchive/archive.h.in,v 1.30 2006/07/30 00:29:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.31 2006/09/05 05:59:45 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -36,7 +36,7 @@ */ #include /* Linux requires this for off_t */ -#include /* For int64_t */ +@ARCHIVE_H_INCLUDE_INTTYPES_H@ #include /* For ssize_t and size_t */ #ifdef __cplusplus @@ -267,6 +267,11 @@ void archive_read_extract_set_progress_callback(struct archive *, void (*_progress_func)(void *), void *_user_data); +/* Record the dev/ino of a file that will not be written. This is + * generally set to the dev/ino of the archive being read. */ +void archive_read_extract_set_skip_file(struct archive *, + dev_t, ino_t); + /* Close the file and release most resources. */ int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ @@ -291,9 +296,15 @@ struct archive *archive_write_new(void); int archive_write_set_bytes_per_block(struct archive *, int bytes_per_block); +int archive_write_get_bytes_per_block(struct archive *); /* XXX This is badly misnamed; suggestions appreciated. XXX */ int archive_write_set_bytes_in_last_block(struct archive *, int bytes_in_last_block); +int archive_write_get_bytes_in_last_block(struct archive *); + +/* The dev/ino of a file that won't be archived. This is used + * to avoid recursively adding an archive to itself. */ +int archive_write_set_skip_file(struct archive *, dev_t, ino_t); int archive_write_set_compression_bzip2(struct archive *); int archive_write_set_compression_gzip(struct archive *); ==== //depot/projects/arm/src/lib/libarchive/archive_private.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/lib/libarchive/archive_private.h,v 1.22 2006/07/30 00:29:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.23 2006/09/05 05:59:45 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -191,7 +191,7 @@ struct extract *extract; void (*extract_progress)(void *); void *extract_progress_user_data; - void (*cleanup_archive_extract)(struct archive *); + int (*cleanup_archive_extract)(struct archive *); int archive_error_number; const char *error; ==== //depot/projects/arm/src/lib/libarchive/archive_read.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003-2005 Tim Kientzle +.\" Copyright (c) 2003-2006 Tim Kientzle .\" 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/lib/libarchive/archive_read.3,v 1.23 2005/11/24 10:06:05 ru Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.24 2006/09/05 05:59:45 kientzle Exp $ .\" -.Dd January 8, 2005 +.Dd August 19, 2006 .Dt archive_read 3 .Os .Sh NAME @@ -41,6 +41,7 @@ .Nm archive_read_support_format_tar , .Nm archive_read_support_format_zip , .Nm archive_read_open , +.Nm archive_read_open2 , .Nm archive_read_open_fd , .Nm archive_read_open_file , .Nm archive_read_next_header , @@ -83,6 +84,8 @@ .Ft int .Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *" .Ft int +.Fn archive_read_open2 "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_skip_callback *" "archive_close_callback *" +.Ft int .Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int .Fn archive_read_open_file "struct archive *" "const char *filename" "size_t block_size" @@ -146,9 +149,14 @@ enables support for all available formats. Note that there is no default. .It Fn archive_read_open +The same as +.Fn archive_read_open2 , +except that the skip callback is assumed to be +.Dv NULL . +.It Fn archive_read_open2 Freeze the settings, open the archive, and prepare for reading entries. This is the most generic version of this call, which accepts -three callback functions. +four callback functions. Most clients will want to use .Fn archive_read_open_file or @@ -156,26 +164,20 @@ instead. The library invokes the client-provided functions to obtain raw bytes from the archive. -Note: The API permits a decompression method to fork and invoke the -callbacks from another process. -Although none of the current decompression methods use this technique, -future decompression methods may utilize this technique. -If the decompressor forks, it will ensure that the open and close -callbacks are invoked within the same process as the read callback. -In particular, clients should not attempt to use shared variables to -communicate between the open/read/close callbacks and the mainline code. .It Fn archive_read_open_fd Like .Fn archive_read_open , except that it accepts a file descriptor and block size rather than -a trio of function pointers. +a set of function pointers. Note that the file descriptor will not be automatically closed at end-of-archive. +This function is safe for use with tape drives or other blocked devices. .It Fn archive_read_open_file Like .Fn archive_read_open , except that it accepts a simple filename and a block size. A NULL filename represents standard input. +This function is safe for use with tape drives or other blocked devices. .It Fn archive_read_next_header Read the header for the next entry and return a pointer to a @@ -212,6 +214,12 @@ A convenience function that repeatedly calls .Fn archive_read_data_block to copy the entire entry to the provided file descriptor. +.It Fn archive_read_extract_set_skip_file +This function records the device and inode numbers +of a file that should not be restored. +This is a convenience that prevents +.Fn archive_read_extract +from restoring a file over the archive itself. .It Fn archive_read_extract A convenience function that recreates the specified object on disk and reads the entry data into that object. @@ -298,6 +306,9 @@ .Fn archive_read_callback "struct archive *" "void *client_data" "const void **buffer" .It .Ft typedef int +.Fn archive_skip_callback "struct archive *" "void *client_data" "size_t request" +.It +.Ft typedef int .Fn archive_open_callback "struct archive *" "void *client_data" .It .Ft typedef int @@ -333,6 +344,22 @@ to register an error code and message and return -1. .Pp +The skip callback is invoked when the +library wants to ignore a block of data. +The return value is the number of bytes actually +skipped, which may differ from the request. +If the callback cannot skip data, it should return +zero. +If the skip callback is not provided (the +function pointer is +.Dv NULL ), +the library will invoke the read function +instead and simply discard the result. +A skip callback can provide significant +performance gains when reading uncompressed +archives from slow disk drives or other media +that can skip quickly. +.Pp The close callback is invoked by archive_close when the archive processing is complete. The callback should return ==== //depot/projects/arm/src/lib/libarchive/archive_read.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.21 2006/07/30 00:29:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.22 2006/09/05 05:59:45 kientzle Exp $"); #include #include @@ -88,19 +88,16 @@ } /* - * Set the block size. + * Record the do-not-extract-to file. This belongs in archive_read_extract.c. */ -/* -int -archive_read_set_bytes_per_block(struct archive *a, int bytes_per_block) +void +archive_read_extract_set_skip_file(struct archive *a, dev_t d, ino_t i) { - __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "archive_read_set_bytes_per_block"); - if (bytes_per_block < 1) - bytes_per_block = 1; - a->bytes_per_block = bytes_per_block; - return (0); + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY, "archive_read_extract_set_skip_file"); + a->skip_file_dev = d; + a->skip_file_ino = i; } -*/ + /* * Open the archive @@ -504,19 +501,25 @@ int archive_read_close(struct archive *a) { + int r = ARCHIVE_OK, r1 = ARCHIVE_OK; + __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY, "archive_read_close"); a->state = ARCHIVE_STATE_CLOSED; /* Call cleanup functions registered by optional components. */ if (a->cleanup_archive_extract != NULL) - (a->cleanup_archive_extract)(a); + r = (a->cleanup_archive_extract)(a); /* TODO: Finish the format processing. */ /* Close the input machinery. */ - if (a->compression_finish != NULL) - (a->compression_finish)(a); - return (ARCHIVE_OK); + if (a->compression_finish != NULL) { + r1 = (a->compression_finish)(a); + if (r1 < r) + r = r1; + } + + return (r); } /* ==== //depot/projects/arm/src/lib/libarchive/archive_read_extract.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.46 2006/05/01 01:02:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.47 2006/09/05 05:59:45 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -110,7 +110,7 @@ */ #define SECURE_DIR_MODE 0700 -static void archive_extract_cleanup(struct archive *); +static int archive_extract_cleanup(struct archive *); static int extract_block_device(struct archive *, struct archive_entry *, int); static int extract_char_device(struct archive *, @@ -318,7 +318,7 @@ * name from archive_read_finish) reduces static link pollution, since * applications that don't use this API won't get this file linked in. */ -static void +static int archive_extract_cleanup(struct archive *a) { struct fixup_entry *next, *p; @@ -353,6 +353,7 @@ archive_string_free(&extract->create_parent_dir); free(a->extract); a->extract = NULL; + return (ARCHIVE_OK); } /* ==== //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.10 2006/07/30 00:29:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.11 2006/09/05 05:59:46 kientzle Exp $"); #include #include @@ -137,7 +137,7 @@ { struct read_file_data *mine = client_data; off_t old_offset, new_offset; - + /* Reduce request to the next smallest multiple of block_size */ request = (request / mine->block_size) * mine->block_size; /* ==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.42 2006/07/30 00:29:01 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.43 2006/09/05 05:59:46 kientzle Exp $"); #include #ifdef MAJOR_IN_MKDEV @@ -533,8 +533,8 @@ const void *b; /* dummy variables */ size_t s; off_t o; - - + + tar = *(a->pformat_data); if (a->compression_skip == NULL) { while (r == ARCHIVE_OK) ==== //depot/projects/arm/src/lib/libarchive/archive_write.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.17 2006/08/01 05:31:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.18 2006/09/05 05:59:46 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -88,7 +88,6 @@ return (a); } - /* * Set the block size. Returns 0 if successful. */ @@ -100,6 +99,15 @@ return (ARCHIVE_OK); } +/* + * Get the current block size. -1 if it has never been set. + */ +int +archive_write_get_bytes_per_block(struct archive *a) +{ + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_get_bytes_per_block"); + return (a->bytes_per_block); +} /* * Set the size for the last block. @@ -113,6 +121,30 @@ return (ARCHIVE_OK); } +/* + * Return the value set above. -1 indicates it has not been set. + */ +int +archive_write_get_bytes_in_last_block(struct archive *a) +{ + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_get_bytes_in_last_block"); + return (a->bytes_in_last_block); +} + + +/* + * dev/ino of a file to be rejected. Used to prevent adding + * an archive to itself recursively. + */ +int +archive_write_set_skip_file(struct archive *a, dev_t d, ino_t i) +{ + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_set_skip_file"); + a->skip_file_dev = d; + a->skip_file_ino = i; + return (ARCHIVE_OK); +} + /* * Open the archive using the current settings. @@ -149,22 +181,30 @@ int archive_write_close(struct archive *a) { + int r = ARCHIVE_OK, r1 = ARCHIVE_OK; + __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_ANY, "archive_write_close"); /* Finish the last entry. */ if (a->state & ARCHIVE_STATE_DATA) - ((a->format_finish_entry)(a)); + r = ((a->format_finish_entry)(a)); /* Finish off the archive. */ - if (a->format_finish != NULL) - (a->format_finish)(a); + if (a->format_finish != NULL) { + r1 = (a->format_finish)(a); + if (r1 < r) + r = r1; + } /* Finish the compression and close the stream. */ - if (a->compression_finish != NULL) - (a->compression_finish)(a); + if (a->compression_finish != NULL) { + r1 = (a->compression_finish)(a); + if (r1 < r) + r = r1; + } a->state = ARCHIVE_STATE_CLOSED; - return (ARCHIVE_OK); + return (r); } /* ==== //depot/projects/arm/src/lib/libc/i386/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.22 2004/08/15 16:18:03 dfr Exp $ +# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.23 2006/09/05 16:21:26 ru Exp $ -SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.S \ +SRCS+= _ctx_start.S _setjmp.S _set_tp.c fabs.S \ flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \ rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S ==== //depot/projects/arm/src/lib/libc/stdlib/alloca.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)alloca.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/alloca.3,v 1.11 2003/06/28 22:12:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/alloca.3,v 1.12 2006/09/05 16:30:11 ru Exp $ .\" -.Dd June 4, 1993 +.Dd September 5, 2006 .Dt ALLOCA 3 .Os .Sh NAME @@ -57,9 +57,6 @@ The .Fn alloca function returns a pointer to the beginning of the allocated space. -If the allocation failed, a -.Dv NULL -pointer is returned. .Sh SEE ALSO .Xr brk 2 , .Xr calloc 3 , @@ -81,3 +78,15 @@ function is machine and compiler dependent; its use is discouraged. +.Pp +The +.Fn alloca +function is slightly unsafe because it cannot ensure that the pointer +returned points to a valid and usable block of memory. +The allocation made may exceed the bounds of the stack, or even go +further into other objects in memory, and +.Fn alloca +cannot determine such an error. +Avoid +.Fn alloca +with large unbounded allocations. ==== //depot/projects/arm/src/lib/libthr/thread/thr_atfork.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_atfork.c,v 1.2 2005/04/02 01:20:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_atfork.c,v 1.3 2006/09/06 04:04:10 davidxu Exp $ */ #include @@ -50,8 +50,8 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 7 21:46:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B086B16A4DE; Thu, 7 Sep 2006 21:46:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C98A16A4E1 for ; Thu, 7 Sep 2006 21:46:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AFDF43D4C for ; Thu, 7 Sep 2006 21:46:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87Lkr1X081746 for ; Thu, 7 Sep 2006 21:46:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87LkqDL081743 for perforce@freebsd.org; Thu, 7 Sep 2006 21:46:52 GMT (envelope-from imp@freebsd.org) Date: Thu, 7 Sep 2006 21:46:52 GMT Message-Id: <200609072146.k87LkqDL081743@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 105816 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 21:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=105816 Change 105816 by imp@imp_bugs on 2006/09/07 21:46:06 Nits Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#21 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#21 (text+ko) ==== @@ -128,20 +128,16 @@ sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); - WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); - /* probe and attach the iicbus */ bus_generic_attach(dev); - out:; if (err) at91_twi_deactivate(dev); From owner-p4-projects@FreeBSD.ORG Thu Sep 7 22:01:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79CB816A4E0; Thu, 7 Sep 2006 22:01:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 552A416A4DD for ; Thu, 7 Sep 2006 22:01:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FA0C43D45 for ; Thu, 7 Sep 2006 22:01:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87M1DC6082768 for ; Thu, 7 Sep 2006 22:01:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87M1DEW082763 for perforce@freebsd.org; Thu, 7 Sep 2006 22:01:13 GMT (envelope-from imp@freebsd.org) Date: Thu, 7 Sep 2006 22:01:13 GMT Message-Id: <200609072201.k87M1DEW082763@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 105821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 22:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=105821 Change 105821 by imp@imp_paco-paco on 2006/09/07 22:00:17 IFC @105820 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#14 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#22 integrate .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#11 integrate .. //depot/projects/arm/src/usr.bin/tip/tip/cu.c#3 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.556 2006/09/07 16:41:30 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.558 2006/09/07 20:27:56 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -212,6 +212,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage @@ -487,9 +488,19 @@ WMAKE_TGTS+= build32 .endif -buildworld: ${WMAKE_TGTS} -.ORDER: ${WMAKE_TGTS} +buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue +.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue + +buildworld_prologue: + @echo "--------------------------------------------------------------" + @echo ">>> World build started on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" +buildworld_epilogue: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> World build completed on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" # # We need to have this as a target because the indirection between Makefile ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.971 2006/09/05 14:55:31 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.972 2006/09/07 18:58:19 bmah Exp $ 2000 @@ -202,6 +202,16 @@ A potential buffer overflow condition in &man.sppp.4; has been corrected. For more details, see security advisory FreeBSD-SA-06:18.ppp. &merged; + + An OpenSSL bug related to validation of PKCS#1 v1.5 + signatures has been fixed. For more details, see security + advisory + FreeBSD-SA-06:19.openssl. &merged; + + A potential denial of service attack against &man.named.8; + has been fixed. For more details, see security advisory + FreeBSD-SA-06:20.named. &merged; + @@ -1580,7 +1590,7 @@ has been updated to 20051021. BIND has been updated from 9.3.1 - to 9.3.2. &merged; + to 9.3.2-P1. &merged; BSNMPD has been updated from 1.11 to 1.12. @@ -1597,7 +1607,7 @@ included in OpenBSD 3.9. &merged; GCC has been updated from 3.4.4 - to 3.4.6. + to 3.4.6. &merged; GNU Readline library has been updated from 5.0 to 5.1. ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#22 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.3 2006/07/14 22:40:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.4 2006/09/07 21:53:28 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#11 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.2 2006/09/07 21:50:01 imp Exp $ */ #ifndef ARM_AT91_IF_ATEREG_H #define ARM_AT91_IF_ATEREG_H ==== //depot/projects/arm/src/usr.bin/tip/tip/cu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.6 2006/08/31 14:14:29 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.7 2006/09/07 19:48:52 ru Exp $"); #ifndef lint #if 0 @@ -60,7 +60,26 @@ CU = DV = NOSTR; BR = DEFBR; parity = 0; /* none */ - while ((ch = getopt(argc, argv, "a:l:s:htoe0123456789")) != -1) { + + /* + * We want to accept -# as a speed. It's easiest to look through + * the arguments, replace -# with -s#, and let getopt() handle it. + */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' && + argv[i][1] >= '0' && argv[i][1] <= '9') { + asprintf(&cp, "-s%s", argv[i] + 1); + if (cp == NULL) { + fprintf(stderr, + "%s: cannot convert -# to -s#\n", + __progname); + exit(3); + } + argv[i] = cp; + } + } + + while ((ch = getopt(argc, argv, "a:l:s:htoe")) != -1) { switch (ch) { case 'a': CU = optarg; @@ -105,13 +124,6 @@ else parity = -1; /* even */ break; - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - if (CU) - CU[strlen(CU)-1] = ch; - if (DV) - DV[strlen(DV)-1] = ch; - break; default: cuusage(); break; From owner-p4-projects@FreeBSD.ORG Thu Sep 7 23:13:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C2D816A4E9; Thu, 7 Sep 2006 23:13:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3794D16A4E0 for ; Thu, 7 Sep 2006 23:13:50 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9993643D5E for ; Thu, 7 Sep 2006 23:13:47 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87NDlX1089416 for ; Thu, 7 Sep 2006 23:13:47 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87NDkrH089413 for perforce@freebsd.org; Thu, 7 Sep 2006 23:13:46 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Sep 2006 23:13:46 GMT Message-Id: <200609072313.k87NDkrH089413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Sep 2006 23:13:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=105825 Change 105825 by mjacob@newisp on 2006/09/07 23:13:07 IFC Affected files ... .. //depot/projects/newisp/arm/at91/at91_twi.c#2 integrate .. //depot/projects/newisp/arm/at91/if_atereg.h#2 integrate .. //depot/projects/newisp/dev/drm/drmP.h#2 integrate .. //depot/projects/newisp/dev/drm/drm_drv.c#2 integrate .. //depot/projects/newisp/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/newisp/dev/drm/i915_dma.c#2 integrate .. //depot/projects/newisp/dev/drm/i915_drm.h#2 integrate .. //depot/projects/newisp/dev/drm/i915_drv.h#2 integrate .. //depot/projects/newisp/dev/drm/i915_irq.c#2 integrate .. //depot/projects/newisp/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/newisp/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/newisp/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/newisp/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/newisp/dev/drm/radeon_state.c#2 integrate .. //depot/projects/newisp/dev/mfi/mfi.c#3 integrate .. //depot/projects/newisp/dev/mfi/mfireg.h#2 integrate .. //depot/projects/newisp/dev/mpt/mpt.c#2 integrate .. //depot/projects/newisp/dev/mpt/mpt.h#2 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/newisp/netinet6/udp6_usrreq.c#2 integrate Differences ... ==== //depot/projects/newisp/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.3 2006/07/14 22:40:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.4 2006/09/07 21:53:28 imp Exp $"); #include #include @@ -128,20 +128,16 @@ sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); - WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); - /* probe and attach the iicbus */ bus_generic_attach(dev); - out:; if (err) at91_twi_deactivate(dev); @@ -228,12 +224,15 @@ } static int -at91_twi_wait_stop_done(struct at91_twi_softc *sc) +at91_twi_wait(struct at91_twi_softc *sc, uint32_t bit) { int err = 0; + int counter = 10000; - while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + while (!(RD4(sc, TWI_SR) & bit) && counter-- != 0) continue; + if (counter == 0) + err = EIO; return (err); } @@ -252,7 +251,7 @@ sc = device_get_softc(dev); if (sc->sc_started) { WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); } return (err); } @@ -345,7 +344,7 @@ if (!last) goto errout; WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); *walker = RD4(sc, TWI_RHR) & 0xff; if (read) *read = walker - buf; @@ -419,6 +418,53 @@ return (error); } +static int +at91_twi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) +{ + struct at91_twi_softc *sc; + int i, len; + uint32_t rdwr; + uint8_t *buf; + + sc = device_get_softc(dev); + for (i = 0; i < nmsgs; i++) { + /* + * The linux atmel driver doesn't use the internal device + * address feature of twi. A separate i2c message needs to + * be written to use this. + * See http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html + * for details. + */ + rdwr = (msgs[i].flags & IIC_M_RD) ? TWI_MMR_MREAD : 0; + WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); + len = msgs[i].len; + buf = msgs[i].buf; + if (len != 0 || buf == NULL) + return EINVAL; + WR4(sc, TWI_CR, TWI_CR_START); + if (msgs[i].flags & IIC_M_RD) { + while (len--) { + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_RXRDY)) + return EIO; + *buf++ = RD4(sc, TWI_RHR) & 0xff; + } + } else { + while (len--) { + WR4(sc, TWI_THR, *buf++); + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_TXRDY)) + return EIO; + } + } + if (!at91_twi_wait(sc, TWI_SR_TXCOMP)) + return EIO; + } + return 0; +} + static device_method_t at91_twi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_twi_probe), @@ -433,6 +479,7 @@ DEVMETHOD(iicbus_write, at91_twi_write), DEVMETHOD(iicbus_read, at91_twi_read), DEVMETHOD(iicbus_reset, at91_twi_rst_card), + DEVMETHOD(iicbus_transfer, at91_twi_transfer), { 0, 0 } }; ==== //depot/projects/newisp/arm/at91/if_atereg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.2 2006/09/07 21:50:01 imp Exp $ */ #ifndef ARM_AT91_IF_ATEREG_H #define ARM_AT91_IF_ATEREG_H @@ -52,15 +52,15 @@ #define ETH_DTE 0x58 /* Deferred Transmittion Frame Reg */ #define ETH_LCOL 0x5c /* Late Collision Register */ #define ETH_ECOL 0x60 /* Excessive Collision Register */ -#define ETH_CSE 0x64 /* Carrier Sense Error Register */ -#define ETH_TUE 0x68 /* Transmit Underrun Error Register */ -#define ETH_CDE 0x6c /* Code Error Register */ -#define ETH_ELR 0x70 /* Excessive Length Error Register */ -#define ETH_RJB 0x74 /* Receive Jabber Register */ -#define ETH_USF 0x78 /* Undersize Frame Register */ -#define ETH_SQEE 0x7c /* SQE Test Error Register */ -#define ETH_DRFC 0x80 /* Discarded RX Frame Register */ - /* 0x84 reserved */ +#define ETH_TUE 0x64 /* Transmit Underrun Error Register */ +#define ETH_CSE 0x68 /* Carrier Sense Error Register */ +#define ETH_DRFC 0x6c /* Discarded RX Frame Register */ +#define ETH_ROV 0x68 /* Receive Overrun Register */ +#define ETH_CDE 0x64 /* Code Error Register */ +#define ETH_ELR 0x78 /* Excessive Length Error Register */ +#define ETH_RJB 0x7c /* Receive Jabber Register */ +#define ETH_USF 0x80 /* Undersize Frame Register */ +#define ETH_SQEE 0x84 /* SQE Test Error Register */ /* 0x88 reserved */ /* 0x8c reserved */ #define ETH_HSH 0x90 /* EMAC Hash Address High [63:32] */ ==== //depot/projects/newisp/dev/drm/drmP.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.16 2006/04/18 06:14:43 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.17 2006/09/07 23:04:47 anholt Exp $"); #ifndef _DRM_P_H_ #define _DRM_P_H_ @@ -173,7 +173,7 @@ #define wait_queue_head_t atomic_t #define DRM_WAKEUP(w) wakeup((void *)w) #define DRM_WAKEUP_INT(w) wakeup(w) -#define DRM_INIT_WAITQUEUE(queue) do {} while (0) +#define DRM_INIT_WAITQUEUE(queue) do {(void)(queue);} while (0) #if defined(__FreeBSD__) && __FreeBSD_version < 502109 #define bus_alloc_resource_any(dev, type, rid, flags) \ @@ -273,6 +273,7 @@ #endif typedef unsigned long dma_addr_t; +typedef u_int64_t u64; typedef u_int32_t u32; typedef u_int16_t u16; typedef u_int8_t u8; @@ -716,6 +717,9 @@ struct drm_driver_info driver; drm_pci_id_list_t *id_entry; /* PCI ID, name, and chipset private */ + u_int16_t pci_device; /* PCI device id */ + u_int16_t pci_vendor; /* PCI vendor id */ + char *unique; /* Unique identifier: e.g., busid */ int unique_len; /* Length of unique field */ #ifdef __FreeBSD__ ==== //depot/projects/newisp/dev/drm/drm_drv.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.5 2005/12/20 22:44:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.6 2006/09/07 23:04:47 anholt Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -519,6 +519,9 @@ dev->pci_slot = pci_get_slot(dev->device); dev->pci_func = pci_get_function(dev->device); + dev->pci_vendor = pci_get_vendor(dev->device); + dev->pci_device = pci_get_device(dev->device); + TAILQ_INIT(&dev->maplist); drm_mem_init(); ==== //depot/projects/newisp/dev/drm/drm_pciids.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_pciids.h,v 1.6 2006/04/09 20:45:45 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_pciids.h,v 1.7 2006/09/07 23:04:47 anholt Exp $ */ /* This file is auto-generated from the drm_pciids.txt in the DRM CVS @@ -230,6 +230,7 @@ {0x1106, 0x3122, 0, "VIA CLE266"}, \ {0x1106, 0x7205, 0, "VIA KM400"}, \ {0x1106, 0x3108, 0, "VIA K8M800"}, \ + {0x1106, 0x3344, 0, "VIA P4VM800PRO"}, \ {0, 0, 0, NULL} #define i810_PCI_IDS \ @@ -288,6 +289,10 @@ {0x8086, 0x2592, 0, "Intel i915GM"}, \ {0x8086, 0x2772, 0, "Intel i945G"}, \ {0x8086, 0x27A2, 0, "Intel i945GM"}, \ + {0x8086, 0x2972, 0, "Intel i946GZ"}, \ + {0x8086, 0x2982, 0, "Intel i965G"}, \ + {0x8086, 0x2992, 0, "Intel i965Q"}, \ + {0x8086, 0x29A2, 0, "Intel i965G"}, \ {0, 0, 0, NULL} #define imagine_PCI_IDS \ ==== //depot/projects/newisp/dev/drm/i915_dma.c#2 (text+ko) ==== @@ -27,13 +27,19 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.3 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.4 2006/09/07 23:04:47 anholt Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/i915_drm.h" #include "dev/drm/i915_drv.h" +#define IS_I965G(dev) (dev->pci_device == 0x2972 || \ + dev->pci_device == 0x2982 || \ + dev->pci_device == 0x2992 || \ + dev->pci_device == 0x29A2) + + /* Really want an OS-independent resettable timer. Would like to have * this loop run for (eg) 3 sec, but have the timer reset every time * the head pointer changes, so that EBUSY only happens if the ring @@ -350,14 +356,15 @@ if ((dwords+1) * sizeof(int) >= dev_priv->ring.Size - 8) return DRM_ERR(EINVAL); - BEGIN_LP_RING(((dwords+1)&~1)); + BEGIN_LP_RING((dwords+1)&~1); for (i = 0; i < dwords;) { int cmd, sz; - if (DRM_COPY_FROM_USER_UNCHECKED(&cmd, &buffer[i], sizeof(cmd))) + if (DRM_COPY_FROM_USER_UNCHECKED(&cmd, &buffer[i], sizeof(cmd))) { + return DRM_ERR(EINVAL); - + } if ((sz = validate_cmd(cmd)) == 0 || i + sz > dwords) return DRM_ERR(EINVAL); @@ -398,25 +405,40 @@ return DRM_ERR(EINVAL); } - BEGIN_LP_RING(6); - OUT_RING(GFX_OP_DRAWRECT_INFO); - OUT_RING(DR1); - OUT_RING((box.x1 & 0xffff) | (box.y1 << 16)); - OUT_RING(((box.x2 - 1) & 0xffff) | ((box.y2 - 1) << 16)); - OUT_RING(DR4); - OUT_RING(0); - ADVANCE_LP_RING(); + if (IS_I965G(dev)) { + BEGIN_LP_RING(4); + OUT_RING(GFX_OP_DRAWRECT_INFO_I965); + OUT_RING((box.x1 & 0xffff) | (box.y1 << 16)); + OUT_RING(((box.x2 - 1) & 0xffff) | ((box.y2 - 1) << 16)); + OUT_RING(DR4); + ADVANCE_LP_RING(); + } else { + BEGIN_LP_RING(6); + OUT_RING(GFX_OP_DRAWRECT_INFO); + OUT_RING(DR1); + OUT_RING((box.x1 & 0xffff) | (box.y1 << 16)); + OUT_RING(((box.x2 - 1) & 0xffff) | ((box.y2 - 1) << 16)); + OUT_RING(DR4); + OUT_RING(0); + ADVANCE_LP_RING(); + } return 0; } +/* XXX: Emitting the counter should really be moved to part of the IRQ + * emit. For now, do it in both places: + */ static void i915_emit_breadcrumb(drm_device_t *dev) { drm_i915_private_t *dev_priv = dev->dev_private; RING_LOCALS; - dev_priv->sarea_priv->last_enqueue = dev_priv->counter++; + dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter; + + if (dev_priv->counter > 0x7FFFFFFFUL) + dev_priv->sarea_priv->last_enqueue = dev_priv->counter = 1; BEGIN_LP_RING(4); OUT_RING(CMD_STORE_DWORD_IDX); @@ -775,7 +797,9 @@ [DRM_IOCTL_NR(DRM_I915_FREE)] = {i915_mem_free, DRM_AUTH}, [DRM_IOCTL_NR(DRM_I915_INIT_HEAP)] = {i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}, [DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, DRM_AUTH}, - [DRM_IOCTL_NR(DRM_I915_DESTROY_HEAP)] = { i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY } + [DRM_IOCTL_NR(DRM_I915_DESTROY_HEAP)] = { i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_I915_SET_VBLANK_PIPE)] = { i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_I915_GET_VBLANK_PIPE)] = { i915_vblank_pipe_get, DRM_AUTH }, }; int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls); ==== //depot/projects/newisp/dev/drm/i915_drm.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drm.h,v 1.3 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drm.h,v 1.4 2006/09/07 23:04:47 anholt Exp $"); #ifndef _I915_DRM_H_ #define _I915_DRM_H_ @@ -100,7 +100,13 @@ int rotated_offset; int rotated_size; int rotated_pitch; - int virtualX, virtualY; + int virtualX, virtualY; + + unsigned int front_tiled; + unsigned int back_tiled; + unsigned int depth_tiled; + unsigned int rotated_tiled; + unsigned int rotated2_tiled; } drm_i915_sarea_t; /* Flags for perf_boxes @@ -127,6 +133,8 @@ #define DRM_I915_INIT_HEAP 0x0a #define DRM_I915_CMDBUFFER 0x0b #define DRM_I915_DESTROY_HEAP 0x0c +#define DRM_I915_SET_VBLANK_PIPE 0x0d +#define DRM_I915_GET_VBLANK_PIPE 0x0e #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) @@ -141,6 +149,8 @@ #define DRM_IOCTL_I915_INIT_HEAP DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t) #define DRM_IOCTL_I915_CMDBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t) #define DRM_IOCTL_I915_DESTROY_HEAP DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t) +#define DRM_IOCTL_I915_SET_VBLANK_PIPE DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t) +#define DRM_IOCTL_I915_GET_VBLANK_PIPE DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t) /* Allow drivers to submit batchbuffers directly to hardware, relying @@ -228,4 +238,13 @@ int region; } drm_i915_mem_destroy_heap_t; +/* Allow X server to configure which pipes to monitor for vblank signals + */ +#define DRM_I915_VBLANK_PIPE_A 1 +#define DRM_I915_VBLANK_PIPE_B 2 + +typedef struct drm_i915_vblank_pipe { + int pipe; +} drm_i915_vblank_pipe_t; + #endif /* _I915_DRM_H_ */ ==== //depot/projects/newisp/dev/drm/i915_drv.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drv.h,v 1.3 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drv.h,v 1.4 2006/09/07 23:04:47 anholt Exp $"); #ifndef _I915_DRV_H_ #define _I915_DRV_H_ @@ -48,9 +48,10 @@ * 1.2: Add Power Management * 1.3: Add vblank support * 1.4: Fix cmdbuffer path, add heap destroy + * 1.5: Add vblank pipe configuration */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 4 +#define DRIVER_MINOR 5 #define DRIVER_PATCHLEVEL 0 typedef struct _drm_i915_ring_buffer { @@ -99,6 +100,7 @@ int allow_batchbuffer; struct mem_block *agp_heap; unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds; + int vblank_pipe; } drm_i915_private_t; extern drm_ioctl_desc_t i915_ioctls[]; @@ -122,6 +124,8 @@ extern void i915_driver_irq_preinstall(drm_device_t * dev); extern void i915_driver_irq_postinstall(drm_device_t * dev); extern void i915_driver_irq_uninstall(drm_device_t * dev); +extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS); +extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS); /* i915_mem.c */ extern int i915_mem_alloc(DRM_IOCTL_ARGS); @@ -140,14 +144,14 @@ #define I915_VERBOSE 0 #define RING_LOCALS unsigned int outring, ringmask, outcount; \ - volatile char *virt; + volatile char *virt; #define BEGIN_LP_RING(n) do { \ if (I915_VERBOSE) \ DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \ - n, __FUNCTION__); \ - if (dev_priv->ring.space < n*4) \ - i915_wait_ring(dev, n*4, __FUNCTION__); \ + (n), __FUNCTION__); \ + if (dev_priv->ring.space < (n)*4) \ + i915_wait_ring(dev, (n)*4, __FUNCTION__); \ outcount = 0; \ outring = dev_priv->ring.tail; \ ringmask = dev_priv->ring.tail_mask; \ @@ -156,8 +160,8 @@ #define OUT_RING(n) do { \ if (I915_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \ - *(volatile unsigned int *)(virt + outring) = n; \ - outcount++; \ + *(volatile unsigned int *)(virt + outring) = (n); \ + outcount++; \ outring += 4; \ outring &= ringmask; \ } while (0) @@ -253,6 +257,8 @@ #define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0) #define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3)) +#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2) + #define MI_BATCH_BUFFER ((0x30<<23)|1) #define MI_BATCH_BUFFER_START (0x31<<23) #define MI_BATCH_BUFFER_END (0xA<<23) ==== //depot/projects/newisp/dev/drm/i915_irq.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_irq.c,v 1.3 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_irq.c,v 1.4 2006/09/07 23:04:47 anholt Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -48,7 +48,7 @@ temp = I915_READ16(I915REG_INT_IDENTITY_R); - temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG); + temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG); DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp); @@ -62,7 +62,7 @@ if (temp & USER_INT_FLAG) DRM_WAKEUP(&dev_priv->irq_queue); - if (temp & VSYNC_PIPEA_FLAG) { + if (temp & (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) { atomic_inc(&dev->vbl_received); DRM_WAKEUP(&dev->vbl_queue); drm_vbl_send_signals(dev); @@ -73,22 +73,32 @@ static int i915_emit_irq(drm_device_t * dev) { + drm_i915_private_t *dev_priv = dev->dev_private; - u32 ret; RING_LOCALS; i915_kernel_lost_context(dev); DRM_DEBUG("%s\n", __FUNCTION__); - ret = dev_priv->counter; + dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter; + + if (dev_priv->counter > 0x7FFFFFFFUL) + dev_priv->sarea_priv->last_enqueue = dev_priv->counter = 1; + + BEGIN_LP_RING(6); + OUT_RING(CMD_STORE_DWORD_IDX); + OUT_RING(20); + OUT_RING(dev_priv->counter); - BEGIN_LP_RING(2); + OUT_RING(0); OUT_RING(0); OUT_RING(GFX_OP_USER_INTERRUPT); ADVANCE_LP_RING(); - return ret; + return dev_priv->counter; + + } static int i915_wait_irq(drm_device_t * dev, int irq_nr) @@ -185,6 +195,68 @@ return i915_wait_irq(dev, irqwait.irq_seq); } +static int i915_enable_interrupt (drm_device_t *dev) +{ + drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; + u16 flag; + + flag = 0; + if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A) + flag |= VSYNC_PIPEA_FLAG; + if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B) + flag |= VSYNC_PIPEB_FLAG; + if (dev_priv->vblank_pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) { + DRM_ERROR("%s called with invalid pipe 0x%x\n", + __FUNCTION__, dev_priv->vblank_pipe); + return DRM_ERR(EINVAL); + } + I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag); + return 0; +} + +/* Set the vblank monitor pipe + */ +int i915_vblank_pipe_set(DRM_IOCTL_ARGS) +{ + DRM_DEVICE; + drm_i915_private_t *dev_priv = dev->dev_private; + drm_i915_vblank_pipe_t pipe; + + if (!dev_priv) { + DRM_ERROR("%s called with no initialization\n", __FUNCTION__); + return DRM_ERR(EINVAL); + } + + DRM_COPY_FROM_USER_IOCTL(pipe, (drm_i915_vblank_pipe_t __user *) data, + sizeof(pipe)); + + dev_priv->vblank_pipe = pipe.pipe; + return i915_enable_interrupt (dev); +} + +int i915_vblank_pipe_get(DRM_IOCTL_ARGS) +{ + DRM_DEVICE; + drm_i915_private_t *dev_priv = dev->dev_private; + drm_i915_vblank_pipe_t pipe; + u16 flag; + + if (!dev_priv) { + DRM_ERROR("%s called with no initialization\n", __FUNCTION__); + return DRM_ERR(EINVAL); + } + + flag = I915_READ(I915REG_INT_ENABLE_R); + pipe.pipe = 0; + if (flag & VSYNC_PIPEA_FLAG) + pipe.pipe |= DRM_I915_VBLANK_PIPE_A; + if (flag & VSYNC_PIPEB_FLAG) + pipe.pipe |= DRM_I915_VBLANK_PIPE_B; + DRM_COPY_TO_USER_IOCTL((drm_i915_vblank_pipe_t __user *) data, pipe, + sizeof(pipe)); + return 0; +} + /* drm_dma.h hooks */ void i915_driver_irq_preinstall(drm_device_t * dev) @@ -200,7 +272,7 @@ { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; - I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | VSYNC_PIPEA_FLAG); + i915_enable_interrupt(dev); DRM_INIT_WAITQUEUE(&dev_priv->irq_queue); } ==== //depot/projects/newisp/dev/drm/mach64_drm.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drm.h,v 1.2 2005/11/28 23:13:53 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drm.h,v 1.3 2006/09/07 23:04:47 anholt Exp $"); #ifndef __MACH64_DRM_H__ #define __MACH64_DRM_H__ @@ -71,7 +71,7 @@ /* Max number of swaps allowed on the ring * before the client must wait */ -#define MACH64_MAX_QUEUED_FRAMES 3 +#define MACH64_MAX_QUEUED_FRAMES 3U /* Byte offsets for host blit buffer data */ ==== //depot/projects/newisp/dev/drm/radeon_cp.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.18 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.19 2006/09/07 23:04:47 anholt Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -42,7 +42,7 @@ static int radeon_do_cleanup_cp(drm_device_t * dev); /* CP microcode (from ATI) */ -static u32 R200_cp_microcode[][2] = { +static const u32 R200_cp_microcode[][2] = { {0x21007000, 0000000000}, {0x20007000, 0000000000}, {0x000000ab, 0x00000004}, @@ -301,7 +301,7 @@ {0000000000, 0000000000}, }; -static u32 radeon_cp_microcode[][2] = { +static const u32 radeon_cp_microcode[][2] = { {0x21007000, 0000000000}, {0x20007000, 0000000000}, {0x000000b4, 0x00000004}, @@ -560,7 +560,7 @@ {0000000000, 0000000000}, }; -static u32 R300_cp_microcode[][2] = { +static const u32 R300_cp_microcode[][2] = { { 0x4200e000, 0000000000 }, { 0x4000e000, 0000000000 }, { 0x000000af, 0x00000008 }, @@ -867,13 +867,13 @@ dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE; - tmp = RADEON_READ(RADEON_RB2D_DSTCACHE_CTLSTAT); - tmp |= RADEON_RB2D_DC_FLUSH_ALL; - RADEON_WRITE(RADEON_RB2D_DSTCACHE_CTLSTAT, tmp); + tmp = RADEON_READ(RADEON_RB3D_DSTCACHE_CTLSTAT); + tmp |= RADEON_RB3D_DC_FLUSH_ALL; + RADEON_WRITE(RADEON_RB3D_DSTCACHE_CTLSTAT, tmp); for (i = 0; i < dev_priv->usec_timeout; i++) { - if (!(RADEON_READ(RADEON_RB2D_DSTCACHE_CTLSTAT) - & RADEON_RB2D_DC_BUSY)) { + if (!(RADEON_READ(RADEON_RB3D_DSTCACHE_CTLSTAT) + & RADEON_RB3D_DC_BUSY)) { return 0; } DRM_UDELAY(1); @@ -1261,6 +1261,12 @@ dev_priv->writeback_works = 0; DRM_INFO("writeback forced off\n"); } + + if (!dev_priv->writeback_works) { + /* Disable writeback to avoid unnecessary bus master transfers */ + RADEON_WRITE(RADEON_CP_RB_CNTL, RADEON_READ(RADEON_CP_RB_CNTL) | RADEON_RB_NO_UPDATE); + RADEON_WRITE(RADEON_SCRATCH_UMSK, 0); + } } /* Enable or disable PCI-E GART on the chip */ @@ -1348,6 +1354,12 @@ DRM_DEBUG("Forcing AGP card to PCI mode\n"); dev_priv->flags &= ~CHIP_IS_AGP; } + else if (!(dev_priv->flags & (CHIP_IS_AGP | CHIP_IS_PCI | CHIP_IS_PCIE)) + && !init->is_pci) + { + DRM_DEBUG("Restoring AGP flag\n"); + dev_priv->flags |= CHIP_IS_AGP; + } if ((!(dev_priv->flags & CHIP_IS_AGP)) && !dev->sg) { DRM_ERROR("PCI GART memory not allocated!\n"); @@ -2202,9 +2214,10 @@ if (drm_device_is_agp(dev)) dev_priv->flags |= CHIP_IS_AGP; - - if (drm_device_is_pcie(dev)) + else if (drm_device_is_pcie(dev)) dev_priv->flags |= CHIP_IS_PCIE; + else + dev_priv->flags |= CHIP_IS_PCI; DRM_DEBUG("%s card detected\n", ((dev_priv->flags & CHIP_IS_AGP) ? "AGP" : (((dev_priv->flags & CHIP_IS_PCIE) ? "PCIE" : "PCI")))); ==== //depot/projects/newisp/dev/drm/radeon_drm.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drm.h,v 1.13 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drm.h,v 1.14 2006/09/07 23:04:47 anholt Exp $"); #ifndef __RADEON_DRM_H__ #define __RADEON_DRM_H__ @@ -164,7 +164,8 @@ #define R200_EMIT_PP_TXCTLALL_3 91 #define R200_EMIT_PP_TXCTLALL_4 92 #define R200_EMIT_PP_TXCTLALL_5 93 -#define RADEON_MAX_STATE_PACKETS 94 +#define R200_EMIT_VAP_PVS_CNTL 94 +#define RADEON_MAX_STATE_PACKETS 95 /* Commands understood by cmd_buffer ioctl. More can be added but * obviously these can't be removed or changed: @@ -179,6 +180,7 @@ #define RADEON_CMD_WAIT 8 /* emit hw wait commands -- note: * doesn't make the cpu wait, just * the graphics hardware */ +#define RADEON_CMD_VECLINEAR 9 /* another r200 stopgap */ typedef union { int i; @@ -195,6 +197,9 @@ unsigned char cmd_type, offset, stride, count; } vectors; struct { + unsigned char cmd_type, addr_lo, addr_hi, count; + } veclinear; + struct { unsigned char cmd_type, buf_idx, pad0, pad1; } dma; struct { ==== //depot/projects/newisp/dev/drm/radeon_drv.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.15 2006/04/09 20:45:45 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.16 2006/09/07 23:04:47 anholt Exp $"); #ifndef __RADEON_DRV_H__ #define __RADEON_DRV_H__ @@ -41,7 +41,7 @@ #define DRIVER_NAME "radeon" #define DRIVER_DESC "ATI Radeon" -#define DRIVER_DATE "20060225" +#define DRIVER_DATE "20060524" /* Interface history: * @@ -96,10 +96,12 @@ * 1.22- Add support for texture cache flushes (R300_TX_CNTL) * 1.23- Add new radeon memory map work from benh * 1.24- Add general-purpose packet for manipulating scratch registers (r300) + * 1.25- Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, + * new packet type) */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 24 +#define DRIVER_MINOR 25 #define DRIVER_PATCHLEVEL 0 /* @@ -144,6 +146,7 @@ CHIP_HAS_HIERZ = 0x00100000UL, CHIP_IS_PCIE = 0x00200000UL, CHIP_NEW_MEMMAP = 0x00400000UL, + CHIP_IS_PCI = 0x00800000UL, }; #define GET_RING_HEAD(dev_priv) (dev_priv->writeback_works ? \ @@ -544,6 +547,11 @@ # define RADEON_RB3D_ZC_FREE (1 << 2) # define RADEON_RB3D_ZC_FLUSH_ALL 0x5 # define RADEON_RB3D_ZC_BUSY (1 << 31) +#define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c +# define RADEON_RB3D_DC_FLUSH (3 << 0) +# define RADEON_RB3D_DC_FREE (3 << 2) +# define RADEON_RB3D_DC_FLUSH_ALL 0xf +# define RADEON_RB3D_DC_BUSY (1 << 31) #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c # define RADEON_Z_TEST_MASK (7 << 4) # define RADEON_Z_TEST_ALWAYS (7 << 4) @@ -680,6 +688,7 @@ #define RADEON_CP_RB_BASE 0x0700 #define RADEON_CP_RB_CNTL 0x0704 # define RADEON_BUF_SWAP_32BIT (2 << 16) +# define RADEON_RB_NO_UPDATE (1 << 27) #define RADEON_CP_RB_RPTR_ADDR 0x070c #define RADEON_CP_RB_RPTR 0x0710 #define RADEON_CP_RB_WPTR 0x0714 @@ -885,6 +894,8 @@ #define RADEON_PP_CUBIC_OFFSET_T1_0 0x1e00 #define RADEON_PP_CUBIC_OFFSET_T2_0 0x1e14 +#define RADEON_SE_TCL_STATE_FLUSH 0x2284 + #define SE_VAP_CNTL__TCL_ENA_MASK 0x00000001 #define SE_VAP_CNTL__FORCE_W_TO_ONE_MASK 0x00010000 #define SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT 0x00000012 @@ -906,6 +917,8 @@ #define R200_PP_AFS_0 0x2f80 #define R200_PP_AFS_1 0x2f00 /* same as txcblend_0 */ +#define R200_VAP_PVS_CNTL_1 0x22D0 + /* MPEG settings from VHA code */ #define RADEON_VHA_SETTO16_1 0x2694 #define RADEON_VHA_SETTO16_2 0x2680 @@ -1011,13 +1024,13 @@ } while (0) #define RADEON_FLUSH_CACHE() do { \ - OUT_RING( CP_PACKET0( RADEON_RB2D_DSTCACHE_CTLSTAT, 0 ) ); \ - OUT_RING( RADEON_RB2D_DC_FLUSH ); \ + OUT_RING( CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \ + OUT_RING( RADEON_RB3D_DC_FLUSH ); \ } while (0) #define RADEON_PURGE_CACHE() do { \ - OUT_RING( CP_PACKET0( RADEON_RB2D_DSTCACHE_CTLSTAT, 0 ) ); \ - OUT_RING( RADEON_RB2D_DC_FLUSH_ALL ); \ + OUT_RING( CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \ + OUT_RING( RADEON_RB3D_DC_FLUSH_ALL ); \ } while (0) #define RADEON_FLUSH_ZCACHE() do { \ @@ -1085,7 +1098,7 @@ n, __FUNCTION__ ); \ } \ if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ - COMMIT_RING(); \ + COMMIT_RING(); \ radeon_wait_ring( dev_priv, (n) * sizeof(u32) ); \ } \ _nr = n; dev_priv->ring.space -= (n) * sizeof(u32); \ ==== //depot/projects/newisp/dev/drm/radeon_state.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.21 2006/04/13 11:16:59 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.22 2006/09/07 23:04:47 anholt Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -45,7 +45,11 @@ drm_file_t * filp_priv, u32 * offset) { - u32 off = *offset; + u64 off = *offset; + u32 fb_start = dev_priv->fb_location; + u32 fb_end = fb_start + dev_priv->fb_size - 1; + u32 gart_start = dev_priv->gart_vm_start; + u32 gart_end = gart_start + dev_priv->gart_size - 1; struct drm_radeon_driver_file_fields *radeon_priv; /* Hrm ... the story of the offset ... So this function converts @@ -65,10 +69,8 @@ /* First, the best case, the offset already lands in either the * framebuffer or the GART mapped space */ - if ((off >= dev_priv->fb_location && - off < (dev_priv->fb_location + dev_priv->fb_size)) || - (off >= dev_priv->gart_vm_start && - off < (dev_priv->gart_vm_start + dev_priv->gart_size))) + if ((off >= fb_start && off <= fb_end) || + (off >= gart_start && off <= gart_end)) return 0; /* Ok, that didn't happen... now check if we have a zero based @@ -81,16 +83,13 @@ } /* Finally, assume we aimed at a GART offset if beyond the fb */ - if (off > (dev_priv->fb_location + dev_priv->fb_size)) - off = off - (dev_priv->fb_location + dev_priv->fb_size) + - dev_priv->gart_vm_start; + if (off > fb_end) + off = off - fb_end - 1 + gart_start; /* Now recheck and fail if out of bounds */ - if ((off >= dev_priv->fb_location && - off < (dev_priv->fb_location + dev_priv->fb_size)) || - (off >= dev_priv->gart_vm_start && - off < (dev_priv->gart_vm_start + dev_priv->gart_size))) { - DRM_DEBUG("offset fixed up to 0x%x\n", off); + if ((off >= fb_start && off <= fb_end) || + (off >= gart_start && off <= gart_end)) { + DRM_DEBUG("offset fixed up to 0x%x\n", (unsigned int)off); *offset = off; return 0; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 8 01:04:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11D4A16A4DE; Fri, 8 Sep 2006 01:04:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD2C816A4E7 for ; Fri, 8 Sep 2006 01:04:07 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E293E43D72 for ; Fri, 8 Sep 2006 01:03:55 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8813tvC005683 for ; Fri, 8 Sep 2006 01:03:55 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88135oD004456 for perforce@freebsd.org; Fri, 8 Sep 2006 01:03:05 GMT (envelope-from scottl@freebsd.org) Date: Fri, 8 Sep 2006 01:03:05 GMT Message-Id: <200609080103.k88135oD004456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 105829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 01:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=105829 Change 105829 by scottl@scottl-x64 on 2006/09/08 01:02:37 Now that MPT works again, IFC. Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/fusu.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/asm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/elf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq80321.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/help.common#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_socket.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_socket.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stropts.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_util.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/syscalls.master#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.arm#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ipl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_output.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_output.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_thread.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdMemory.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arlreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/CHANGELOG.TXT#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drm.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/README#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_ioctl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/ispfw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_debug.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirmio.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard_cis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbbreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/probe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/driver.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/spibus/spi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/stg/tmc18c30_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/streams/streams.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_z8530.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehcivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/hid.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_kue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_udavreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/kue_fw.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohcivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/sl811hsvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubser.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucomvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ugen.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhcivar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ulpt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umct.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ums.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/urio.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ethersubr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_port.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi_util.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi_util.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvisor.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wavelan_ieee.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wireg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_rule.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/hpfs/hpfs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/ecma167-udf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_integrity.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_raid5.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/dev/sound/pci/emu10k1-alsa.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/dev/sound/pci/emu10k1.h#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/acpica/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XBOX#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/db_trace.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/support.s#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_proto.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_syscall.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_sysent.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_util.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.isc#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.master#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/NOTES#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia32/ia32_trap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/bus_if.m#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mac.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_subr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_time.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_proto.c#5 delete .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket2.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/strstr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/sys/modules/agp/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/asr/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_bridge/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_ef/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/osf1/Makefile#4 delete .. //depot/projects/scottl-camlock/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/stge/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/bridgestp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_faith.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/net_osdep.h#4 delete .. //depot/projects/scottl-camlock/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_aal5.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netatm/atm_usrreq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pppoe.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_socket.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_encap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/README#3 delete .. //depot/projects/scottl-camlock/src/sys/netinet6/ah_aesxcbcmac.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ah_core.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ah_output.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/esp_aesctr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/esp_core.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/esp_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/esp_output.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/esp_rijndael.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_cksum.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ipcomp_core.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ipcomp_input.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_output.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/keysock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netkey/key.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netkey/keydb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netkey/keysock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netnatm/natm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_crypt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_rq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_rq.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_trantcp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvcache.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsock.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/pc98_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/pci/agp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_xl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/pci/ncr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/posix4/ksched.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/posix4/p1003_1b.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/posix4/posix4.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/gdb_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/ofw_machdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/clock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/db_trace.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/gdb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_oea.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/ofw_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/sio_iobus.c#4 delete .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_vfs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac_mls/mac_mls.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pmap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/db_trace.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_bus_dma.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/_label.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bufobj.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bus.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bus_dma.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/dirent.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/domain.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/extattr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/imgact.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kobj.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/libkern.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lockmgr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mac_policy.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/msgbuf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mutex.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/protosw.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sched.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socket.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/stat.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sx.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysent.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/thr.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/time.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/types.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/umtx.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/unpcb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_meter.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#7 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1998, 1999, 2000, 2002, 2005 Kenneth D. Merry. +.\" Copyright (c) 1998, 1999, 2000, 2002, 2005, 2006 Kenneth D. Merry. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.41 2005/06/14 11:24:55 ru Exp $ +.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.42 2006/08/21 13:24:49 ken Exp $ .\" .Dd September 14, 1998 .Dt CAMCONTROL 8 @@ -59,6 +59,13 @@ .Op Fl S .Op Fl R .Nm +.Ic reportluns +.Op device id +.Op generic args +.Op Fl c +.Op Fl l +.Op Fl r Ar reporttype +.Nm .Ic start .Op device id .Op generic args @@ -266,6 +273,37 @@ .It Fl R Print out transfer rate information. .El +.It Ic reportluns +Send the SCSI REPORT LUNS (0xA0) command to the given device. +By default, +.Nm +will print out the list of logical units (LUNs) supported by the target device. +There are a couple of options to modify the output: +.Bl -tag -width 01234567890123 +.It Fl c +Just print out a count of LUNs, not the actual LUN numbers. +.It Fl l +Just print out the LUNs, and don't print out the count. +.It Fl r Ar reporttype +Specify the type of report to request from the target: +.Bl -tag -width 012345678 +.It default +Return the default report. +This is the +.Nm +default. +Most targets will support this report if they support the REPORT LUNS +command. +.It wellknown +Return only well known LUNs. +.It all +Return all available LUNs. +.El +.El +.Pp +.Nm +will try to print out LUN numbers in a reasonable format. +It can understand the peripheral, flat, LUN and extended LUN formats. .It Ic start Send the SCSI Start/Stop Unit (0x1B) command to the given device with the start bit set. ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2005 Kenneth D. Merry + * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006 Kenneth D. Merry * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.53 2005/03/26 05:34:54 ken Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.54 2006/08/21 13:24:49 ken Exp $"); #include #include @@ -69,6 +69,7 @@ CAM_CMD_TAG = 0x0000000e, CAM_CMD_RATE = 0x0000000f, CAM_CMD_DETACH = 0x00000010, + CAM_CMD_REPORTLUNS = 0x00000011 } cam_cmdmask; typedef enum { @@ -127,6 +128,7 @@ {"stop", CAM_CMD_STARTSTOP, CAM_ARG_NONE, NULL}, {"load", CAM_CMD_STARTSTOP, CAM_ARG_START_UNIT | CAM_ARG_EJECT, NULL}, {"eject", CAM_CMD_STARTSTOP, CAM_ARG_EJECT, NULL}, + {"reportluns", CAM_CMD_REPORTLUNS, CAM_ARG_NONE, "clr:"}, #endif /* MINIMALISTIC */ {"rescan", CAM_CMD_RESCAN, CAM_ARG_NONE, NULL}, {"reset", CAM_CMD_RESET, CAM_ARG_NONE, NULL}, @@ -203,6 +205,8 @@ int timeout, int argc, char **argv, char *combinedopt); static int scsiformat(struct cam_device *device, int argc, char **argv, char *combinedopt, int retry_count, int timeout); +static int scsireportluns(struct cam_device *device, int argc, char **argv, + char *combinedopt, int retry_count, int timeout); #endif /* MINIMALISTIC */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 8 04:46:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F31816A4E0; Fri, 8 Sep 2006 04:46:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32C1C16A4DD for ; Fri, 8 Sep 2006 04:46:34 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C56F743D4C for ; Fri, 8 Sep 2006 04:46:33 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k884kXxv021010 for ; Fri, 8 Sep 2006 04:46:33 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k884kWWW021007 for perforce@freebsd.org; Fri, 8 Sep 2006 04:46:32 GMT (envelope-from trhodes@freebsd.org) Date: Fri, 8 Sep 2006 04:46:32 GMT Message-Id: <200609080446.k884kWWW021007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 105832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 04:46:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=105832 Change 105832 by trhodes@trhodes_local on 2006/09/08 04:45:55 Diff reduction to head, mostly whitespace, return __FBSDID to it's rightful place, add/remove lines and spaces. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#7 edit .. //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_kuefw.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/sl811hs.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/slhci_pccard.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ufm.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/uftdireg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_if.m#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_rdesc.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#21 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#2 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#9 (text+ko) ==== @@ -326,7 +326,7 @@ EHCI_CMD_PSE | EHCI_CMD_RS); - /* take over port ownership */ + /* Take over port ownership */ EOWRITE4(sc, EHCI_CONFIGFLAG, EHCI_CONF_CF); for(i = 0; i < 100; i++) @@ -605,11 +605,11 @@ { link = le32toh(link); printf("0x%08x", link); - if(link & EHCI_LINK_TERMINATE) + if (link & EHCI_LINK_TERMINATE) printf(""); else { printf("<"); - if(type) { + if (type) { switch (EHCI_LINK_TYPE(link)) { case EHCI_LINK_ITD: printf("ITD"); break; case EHCI_LINK_QH: printf("QH"); break; @@ -890,7 +890,6 @@ #endif return(sqh); } -/**/ #define EHCI_REMOVE_FS_TD(std,last) (last) = _ehci_remove_fs_td(std,last) static ehci_sitd_t * @@ -2781,8 +2780,7 @@ 1 /* # of configurations */ }; -static const -usb_device_qualifier_t ehci_odevd = +static usb_device_qualifier_t ehci_odevd = { sizeof(usb_device_qualifier_t), UDESC_DEVICE_QUALIFIER, /* type */ @@ -2795,8 +2793,7 @@ 0 }; -static const -usb_config_descriptor_t ehci_confd = +static usb_config_descriptor_t ehci_confd = { sizeof(usb_config_descriptor_t), UDESC_CONFIG, @@ -2810,8 +2807,7 @@ 0 /* max power */ }; -static const -usb_interface_descriptor_t ehci_ifcd = +static usb_interface_descriptor_t ehci_ifcd = { sizeof(usb_interface_descriptor_t), UDESC_INTERFACE, @@ -2824,8 +2820,7 @@ 0 }; -static const -usb_endpoint_descriptor_t ehci_endpd = +static usb_endpoint_descriptor_t ehci_endpd = { sizeof(usb_endpoint_descriptor_t), UDESC_ENDPOINT, @@ -2835,8 +2830,7 @@ 255 }; -static const -usb_hub_descriptor_t ehci_hubd = +static usb_hub_descriptor_t ehci_hubd = { 0, /* dynamic length */ UDESC_HUB, ==== //depot/projects/usb/src/sys/dev/usb/ehci.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#6 (text+ko) ==== @@ -49,9 +49,12 @@ * sharing of code between *BSD's */ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.23 2006/09/07 00:06:41 imp Ex +p $"); + #include "opt_bus.h" -#include #include #include #include @@ -67,8 +70,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/ehci_pci.c,v 1.14 2004/08/02 15:37:34 iedowse Exp $"); - #define PCI_EHCI_VENDORID_ACERLABS 0x10b9 #define PCI_EHCI_VENDORID_AMD 0x1022 #define PCI_EHCI_VENDORID_APPLE 0x106b @@ -93,10 +94,8 @@ int err; err = bus_generic_suspend(self); - if(err) - { + if (err) return (err); - } ehci_suspend(sc); return 0; } @@ -110,6 +109,7 @@ ehci_resume(sc); bus_generic_resume(self); + return 0; } @@ -120,10 +120,8 @@ int err; err = bus_generic_shutdown(self); - if(err) - { + if (err) return (err); - } ehci_shutdown(sc); ehci_pci_givecontroller(self); @@ -146,7 +144,8 @@ { return ("EHCI (generic) USB 2.0 controller"); } - return NULL; + + return NULL; /* dunno */ } static int @@ -154,13 +153,10 @@ { const char *desc = ehci_pci_match(self); - if(desc) - { + if (desc) { device_set_desc(self, desc); return 0; - } - else - { + } else { return ENXIO; } } @@ -285,11 +281,9 @@ sprintf(sc->sc_vendor, "VIA"); break; default: - if(bootverbose) - { + if (bootverbose) device_printf(self, "(New EHCI DeviceId=0x%08x)\n", - pci_get_devid(self)); - } + pci_get_devid(self)); sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } @@ -304,13 +298,11 @@ ehci_pci_takecontroller(self); err = ehci_init(sc); - if(!err) - { + if (!err) { err = device_probe_and_attach(sc->sc_bus.bdev); } - if(err) - { + if (err) { device_printf(self, "USB init failed err=%d\n", err); goto error; } @@ -351,31 +343,25 @@ int err = bus_teardown_intr(self, sc->irq_res, sc->ih); - if(err) - { + if (err) /* XXX or should we panic? */ device_printf(self, "Could not tear down irq, %d\n", - err); - } + err); sc->ih = NULL; } - if(sc->irq_res) - { + if (sc->irq_res) { bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; } - if(sc->io_res) - { + if (sc->io_res) { bus_release_resource(self, SYS_RES_MEMORY, PCI_CBMEM, - sc->io_res); + sc->io_res); sc->io_res = NULL; } - if(sc->sc_bus.dma_tag) - { + if (sc->sc_bus.dma_tag) { usbd_dma_tag_free(sc->sc_bus.dma_tag); } - mtx_destroy(&sc->sc_bus.mtx); usbd_mem_free(sc, sizeof(*sc)); @@ -393,7 +379,7 @@ cparams = EREAD4(sc, EHCI_HCCPARAMS); - /* Synchronize with the BIOS if it owns the controller. */ + /* Synchronise with the BIOS if it owns the controller. */ for (eecp = EHCI_HCC_EECP(cparams); eecp != 0; eecp = EHCI_EECP_NEXT(eec)) { ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#8 (text+ko) ==== @@ -28,9 +28,11 @@ * 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/dev/usb/if_aue.c,v 1.99 2006/09/07 00:06:41 imp Exp $"); + /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. * Datasheet is available from http://www.admtek.com.tw. @@ -65,7 +67,6 @@ * be called from within the config thread function ! */ -#include #include #include #include @@ -101,8 +102,6 @@ /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.96 2006/02/14 12:44:55 glebius Exp $"); - MODULE_DEPEND(aue, usb, 1, 1, 1); MODULE_DEPEND(aue, ether, 1, 1, 1); MODULE_DEPEND(aue, miibus, 1, 1, 1); @@ -190,8 +189,6 @@ }; #define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) -/* prototypes */ - static device_probe_t aue_probe; static device_attach_t aue_attach; static device_detach_t aue_detach; ==== //depot/projects/usb/src/sys/dev/usb/if_auereg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#7 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.40 2006/09/07 00:06:41 imp Exp $"); + /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the * LinkSys USB200M and various other adapters. @@ -105,8 +108,6 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.36 2006/02/14 12:44:55 glebius Exp $"); - MODULE_DEPEND(axe, usb, 1, 1, 1); MODULE_DEPEND(axe, ether, 1, 1, 1); MODULE_DEPEND(axe, miibus, 1, 1, 1); @@ -141,8 +142,6 @@ { 0, 0 } }; -/* prototypes */ - static device_probe_t axe_probe; static device_attach_t axe_attach; static device_detach_t axe_detach; ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#6 (text+ko) ==== @@ -40,12 +40,15 @@ */ #include +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.14 2006/09/07 00:06:41 imp Exp $"); + #include #include #include #include #include #include +#include #include #include @@ -66,10 +69,6 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.12 2005/12/29 17:29:18 netchild Exp $"); - -/* prototypes */ - static device_probe_t cdce_probe; static device_attach_t cdce_attach; static device_detach_t cdce_detach; @@ -435,7 +434,7 @@ mtx_destroy(&(sc->sc_mtx)); - return 0; + return (0); } static void @@ -799,6 +798,7 @@ static int cdce_ifmedia_upd_cb(struct ifnet *ifp) { + /* no-op, cdce has only 1 possible media type */ return 0; } @@ -806,7 +806,7 @@ static void cdce_ifmedia_sts_cb(struct ifnet * const ifp, struct ifmediareq *req) { + req->ifm_status = IFM_AVALID | IFM_ACTIVE; req->ifm_active = IFM_ETHER | IFM_10_T; - return; } ==== //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_kuefw.h#2 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ohci.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/sl811hs.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/slhci_pccard.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ucomvar.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/udbp.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ufm.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uftdireg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/umass.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/umct.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ums.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/urio.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#2 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_if.m#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_quirks.h#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_rdesc.h#2 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#21 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#2 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uscanner.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#10 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Sep 8 06:57:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC03C16A4E9; Fri, 8 Sep 2006 06:57:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8BD116A4DD for ; Fri, 8 Sep 2006 06:57:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8124A43D49 for ; Fri, 8 Sep 2006 06:57:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k886vIXT037280 for ; Fri, 8 Sep 2006 06:57:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k886vImo037277 for perforce@freebsd.org; Fri, 8 Sep 2006 06:57:18 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 06:57:18 GMT Message-Id: <200609080657.k886vImo037277@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 105835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 06:57:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=105835 Change 105835 by imp@imp_lighthouse on 2006/09/08 06:56:35 More Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#7 (text+ko) ==== @@ -94,6 +94,7 @@ device at91_spi # SPI bridge support device at91_ssc device at91_tc +device at91_qdmmc # iic device iic device iicbus From owner-p4-projects@FreeBSD.ORG Fri Sep 8 06:57:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5382116A4DF; Fri, 8 Sep 2006 06:57:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 319E516A55C for ; Fri, 8 Sep 2006 06:57:19 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB39843D45 for ; Fri, 8 Sep 2006 06:57:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k886vIfG037286 for ; Fri, 8 Sep 2006 06:57:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k886vI1i037283 for perforce@freebsd.org; Fri, 8 Sep 2006 06:57:18 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 06:57:18 GMT Message-Id: <200609080657.k886vI1i037283@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 105836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 06:57:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=105836 Change 105836 by imp@imp_lighthouse on 2006/09/08 06:56:54 Add back some stuff I didn't understand before so I removed. Affected files ... .. //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#6 (text+ko) ==== @@ -138,13 +138,10 @@ } printf("\n"); #endif - device_add_child(dev, "ic", -1); device_add_child(dev, "iicsmb", -1); -#if 0 /* attach any known device */ device_add_child(dev, "iic", -1); -#endif bus_generic_attach(dev); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Sep 8 17:26:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F070C16A4FF; Fri, 8 Sep 2006 17:25:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B28A016A4E1 for ; Fri, 8 Sep 2006 17:25:59 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0693C43D49 for ; Fri, 8 Sep 2006 17:25:59 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88HPwxj006443 for ; Fri, 8 Sep 2006 17:25:58 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88HPwOt006440 for perforce@freebsd.org; Fri, 8 Sep 2006 17:25:58 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 8 Sep 2006 17:25:58 GMT Message-Id: <200609081725.k88HPwOt006440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 17:26:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=105847 Change 105847 by mjacob@newisp on 2006/09/08 17:25:50 Fix to compile again in target mode. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#5 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#5 (text+ko) ==== @@ -1242,8 +1242,7 @@ { void *qe; struct ccb_scsiio *cso = &ccb->csio; - uint16_t *hp; - uint32_t nxti, optr, save_handle; + uint32_t nxti, optr, handle; uint8_t local[QENTRY_LEN]; @@ -1348,7 +1347,6 @@ atp->state = ATPD_STATE_CTIO; } cto->ct_timeout = 10; - hp = &cto->ct_syshandle; } else { ct_entry_t *cto = (ct_entry_t *) local; @@ -1384,10 +1382,9 @@ } ccb->ccb_h.flags &= ~CAM_SEND_SENSE; cto->ct_timeout = 10; - hp = &cto->ct_syshandle; } - if (isp_save_xs_tgt(isp, ccb, &save_handle)) { + if (isp_save_xs_tgt(isp, ccb, &handle)) { xpt_print_path(ccb->ccb_h.path); printf("No XFLIST pointers for isp_target_start_ctio\n"); XS_SETERR(ccb, CAM_REQUEUE_REQ); @@ -1404,7 +1401,13 @@ * format. */ - *hp = save_handle; + if (IS_FC(isp)) { + ct2_entry_t *cto = (ct2_entry_t *) local; + cto->ct_syshandle = handle; + } else { + ct_entry_t *cto = (ct_entry_t *) local; + cto->ct_syshandle = handle; + } switch (ISP_DMASETUP(isp, cso, (ispreq_t *) local, &nxti, optr)) { case CMD_QUEUED: @@ -1419,7 +1422,7 @@ default: break; } - isp_destroy_tgt_handle(isp, save_handle); + isp_destroy_tgt_handle(isp, handle); out: ISPLOCK_2_CAMLOCK(isp); From owner-p4-projects@FreeBSD.ORG Fri Sep 8 17:27:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A25E16A62D; Fri, 8 Sep 2006 17:27:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBE2016A628 for ; Fri, 8 Sep 2006 17:27:03 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E79343D60 for ; Fri, 8 Sep 2006 17:27:00 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88HR0ro006487 for ; Fri, 8 Sep 2006 17:27:00 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88HR0OQ006482 for perforce@freebsd.org; Fri, 8 Sep 2006 17:27:00 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 8 Sep 2006 17:27:00 GMT Message-Id: <200609081727.k88HR0OQ006482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 17:27:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=105848 Change 105848 by mjacob@newisp on 2006/09/08 17:26:11 PCI-Express code. Affected files ... .. //depot/projects/newisp/dev/mpt/mpt_pci.c#2 edit Differences ... ==== //depot/projects/newisp/dev/mpt/mpt_pci.c#2 (text+ko) ==== @@ -138,6 +138,10 @@ #define PCI_PRODUCT_LSI_FC7X04X 0x0640 #endif +#ifndef PCI_PRODUCT_LSI_FC646 +#define PCI_PRODUCT_LSI_FC646 0x0646 +#endif + #ifndef PCI_PRODUCT_LSI_1030 #define PCI_PRODUCT_LSI_1030 0x0030 #endif @@ -228,16 +232,19 @@ desc = "LSILogic FC919 FC Adapter"; break; case PCI_PRODUCT_LSI_FC929: - desc = "LSILogic FC929 FC Adapter"; + desc = "Dual LSILogic FC929 FC Adapter"; break; case PCI_PRODUCT_LSI_FC919X: - desc = "LSILogic FC919X FC Adapter"; + desc = "LSILogic FC919 FC PCI-X Adapter"; break; case PCI_PRODUCT_LSI_FC929X: - desc = "LSILogic FC929X 2Gb/s FC Adapter"; + desc = "Dual LSILogic FC929X 2Gb/s FC PCI-X Adapter"; + break; + case PCI_PRODUCT_LSI_FC646: + desc = "Dual LSILogic FC7X04X 4Gb/s FC PCI-Express Adapter"; break; case PCI_PRODUCT_LSI_FC7X04X: - desc = "LSILogic FC7X04X 4Gb/s FC Adapter"; + desc = "Dual LSILogic FC7X04X 4Gb/s FC PCI-X Adapter"; break; case PCI_PRODUCT_LSI_1030: desc = "LSILogic 1030 Ultra4 Adapter"; @@ -250,7 +257,7 @@ case PCI_PRODUCT_LSI_SAS1068: case PCI_PRODUCT_LSI_SAS1068E: case PCI_PRODUCT_LSI_SAS1078: - desc = "LSILogic SAS Adapter"; + desc = "LSILogic SAS/SATA Adapter"; break; default: return (ENXIO); @@ -406,6 +413,7 @@ case PCI_PRODUCT_LSI_FC919: case PCI_PRODUCT_LSI_FC929: case PCI_PRODUCT_LSI_FC919X: + case PCI_PRODUCT_LSI_FC646: case PCI_PRODUCT_LSI_FC7X04X: mpt->is_fc = 1; break; @@ -463,6 +471,7 @@ * If so, link with our partner (around yet) */ if ((pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC929 || + (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC646 || (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC7X04X || (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_1030) { mpt_link_peer(mpt); From owner-p4-projects@FreeBSD.ORG Fri Sep 8 19:05:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5A8A16A416; Fri, 8 Sep 2006 19:05:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7353216A412 for ; Fri, 8 Sep 2006 19:05:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3243743D45 for ; Fri, 8 Sep 2006 19:05:04 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88J544C016144 for ; Fri, 8 Sep 2006 19:05:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88J53pD016141 for perforce@freebsd.org; Fri, 8 Sep 2006 19:05:03 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 19:05:03 GMT Message-Id: <200609081905.k88J53pD016141@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 105852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 19:05:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=105852 Change 105852 by imp@imp_lighthouse on 2006/09/08 19:04:06 nits (and a bug fix in checking validity) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#23 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#23 (text+ko) ==== @@ -439,15 +439,15 @@ WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); len = msgs[i].len; buf = msgs[i].buf; - if (len != 0 || buf == NULL) - return EINVAL; + if (len == 0 || buf == NULL) + return (EINVAL); WR4(sc, TWI_CR, TWI_CR_START); if (msgs[i].flags & IIC_M_RD) { while (len--) { if (len == 0) WR4(sc, TWI_CR, TWI_CR_STOP); if (!at91_twi_wait(sc, TWI_SR_RXRDY)) - return EIO; + return (EIO); *buf++ = RD4(sc, TWI_RHR) & 0xff; } } else { @@ -456,13 +456,13 @@ if (len == 0) WR4(sc, TWI_CR, TWI_CR_STOP); if (!at91_twi_wait(sc, TWI_SR_TXRDY)) - return EIO; + return (EIO); } } if (!at91_twi_wait(sc, TWI_SR_TXCOMP)) - return EIO; + return (EIO); } - return 0; + return (0); } static device_method_t at91_twi_methods[] = { From owner-p4-projects@FreeBSD.ORG Fri Sep 8 20:34:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E40D916A5DA; Fri, 8 Sep 2006 20:34:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7C9C16A5D8 for ; Fri, 8 Sep 2006 20:34:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6924E43D77 for ; Fri, 8 Sep 2006 20:34:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88KYwfM031486 for ; Fri, 8 Sep 2006 20:34:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88KYw5n031483 for perforce@freebsd.org; Fri, 8 Sep 2006 20:34:58 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 20:34:58 GMT Message-Id: <200609082034.k88KYw5n031483@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 105854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 20:34:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=105854 Change 105854 by imp@imp_lighthouse on 2006/09/08 20:34:22 Use correct ee address Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ /* Use a macro to calculate the TWI clock generator value to save code space. */ #define AT91C_TWSI_CLOCK 100000 -#define TWSI_EEPROM_ADDRESS 0x48 +#define TWSI_EEPROM_ADDRESS 0x40 #define TWI_CLK_BASE_DIV ((AT91C_MASTER_CLOCK/(4*AT91C_TWSI_CLOCK)) - 2) #define SET_TWI_CLOCK ((0x00010000) | (TWI_CLK_BASE_DIV) | (TWI_CLK_BASE_DIV << 8)) From owner-p4-projects@FreeBSD.ORG Fri Sep 8 20:35:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5272C16A65C; Fri, 8 Sep 2006 20:35:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B39B716A647 for ; Fri, 8 Sep 2006 20:34:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD96343D77 for ; Fri, 8 Sep 2006 20:34:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88KYwar031492 for ; Fri, 8 Sep 2006 20:34:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88KYwpN031489 for perforce@freebsd.org; Fri, 8 Sep 2006 20:34:58 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 20:34:58 GMT Message-Id: <200609082034.k88KYwpN031489@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 105855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 20:35:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=105855 Change 105855 by imp@imp_lighthouse on 2006/09/08 20:34:43 Read MAC address from eeprom. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#4 (text+ko) ==== @@ -6,7 +6,7 @@ P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c ashldi3.c divsi3.S +SRCS=arm_init.S boot2.c ee.c ashldi3.c divsi3.S NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -14,6 +14,7 @@ .include CFLAGS+= \ + -I${.CURDIR}/../bootspi \ -I${.CURDIR}/../../../common \ -I${.CURDIR}/../../../.. \ -D_KERNEL \ ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#12 (text+ko) ==== @@ -29,6 +29,7 @@ #include "emac.h" #include "lib.h" #include "sd-card.h" +#include "ee.h" #define SECOND 18 /* Circa that many ticks in a second. */ @@ -227,6 +228,26 @@ } #endif +static void +MacFromEE() +{ + uint32_t sig; + uint8_t euid64[8]; + + EERead(0, (uint8_t *)&sig, sizeof(sig)); + if (sig != 0xaa55aa55) { + printf("Bad signature %x\r\n", sig); + return; + } + EERead(48, euid64, 8); + mac[0] = euid64[0]; + mac[1] = euid64[1]; + mac[2] = euid64[4]; + mac[3] = euid64[5]; + mac[4] = euid64[6]; + mac[6] = euid64[7]; +} + int main(void) { @@ -242,11 +263,13 @@ fpga_load(); printf("done\r\n"); #endif + EEInit(); + MacFromEE(); EMAC_Init(); sdcard_init(); EMAC_SetMACAddress(mac); - dmadat = (void *)(0x20000000 + (1 << 20)); + dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ autoboot = 1; @@ -345,7 +368,6 @@ } #endif addr = eh.e_entry; - printf("In 5, 4, 3, 2, 1\n"); ((void(*)(int))addr)(RB_BOOTINFO | (opts & RBX_MASK)); } From owner-p4-projects@FreeBSD.ORG Fri Sep 8 21:43:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C58816A40F; Fri, 8 Sep 2006 21:43:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BDDD16A403 for ; Fri, 8 Sep 2006 21:43:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05DC143D49 for ; Fri, 8 Sep 2006 21:43:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88LhOKX044065 for ; Fri, 8 Sep 2006 21:43:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88LhOnC044062 for perforce@freebsd.org; Fri, 8 Sep 2006 21:43:24 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 21:43:24 GMT Message-Id: <200609082143.k88LhOnC044062@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 105857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 21:43:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=105857 Change 105857 by imp@imp_lighthouse on 2006/09/08 21:43:16 Cleanup lots of code in boot2, gets back 300 bytes after eeprom integration. Also, part of this is making 'printf' a cooked interface. This saves an additional 14 bytes, and eliminates a common bug potential in the process. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#17 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#13 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#17 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#9 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#19 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#17 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#28 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#17 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/printf.c#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/putchar.c#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#7 (text) ==== @@ -36,8 +36,8 @@ while (xmodem_rx(addr) == -1) continue; InitEEPROM(); - printf("Writing EEPROM from 0x%x to addr 0\r\n", addr); + printf("Writing EEPROM from 0x%x to addr 0\n", addr); WriteEEPROM(0, addr, 8192); - printf("Write complete. Press reset\r\n"); + printf("Write complete. Press reset\n"); return (1); } ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#17 (text) ==== @@ -40,12 +40,12 @@ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ SPI_InitFlash(); - printf("Waiting for data\r\n"); + printf("Waiting for data\n"); while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); + printf("\nDownloaded %u bytes.\n", len); p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); - printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); + printf("Writing %u bytes to flash at %u\n", len, OFFSET); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { for (j = 0; j < 10; j++) { off = i + OFFSET; @@ -55,7 +55,7 @@ break; } if (j >= 10) - printf("Bad Readback at %u\r\n", i); + printf("Bad Readback at %u\n", i); } return (1); } ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#13 (text+ko) ==== @@ -31,15 +31,13 @@ #include "sd-card.h" #include "ee.h" -#define SECOND 18 /* Circa that many ticks in a second. */ - #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ /* 0x2 is reserved for log2(RB_NOSYNC). */ /* 0x3 is reserved for log2(RB_HALT). */ /* 0x4 is reserved for log2(RB_INITNAME). */ #define RBX_DFLTROOT 0x5 /* -r */ -#define RBX_KDB 0x6 /* -d */ +/* #define RBX_KDB 0x6 -d */ /* 0x7 is reserved for log2(RB_RDONLY). */ /* 0x8 is reserved for log2(RB_DUMP). */ /* 0x9 is reserved for log2(RB_MINIROOT). */ @@ -53,50 +51,34 @@ /* 0x11 is reserved for log2(RB_SELFTEST). */ /* 0x12 is reserved for boot programs. */ /* 0x13 is reserved for boot programs. */ -#define RBX_PAUSE 0x14 /* -p */ -#define RBX_QUIET 0x15 /* -q */ -#define RBX_NOINTR 0x1c /* -n */ +/* #define RBX_PAUSE 0x14 -p */ +/* #define RBX_QUIET 0x15 -q */ +/* #define RBX_NOINTR 0x1c -n */ /* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */ /* #define RBX_DUAL 0x1d -D */ /* 0x1f is reserved for log2(RB_BOOTINFO). */ -/* pass: -a, -s, -r, -d, -c, -v, -g, -p */ +/* pass: -a, -s, -r, -v, -g */ #define RBX_MASK (OPT_SET(RBX_ASKNAME) | OPT_SET(RBX_SINGLE) | \ - OPT_SET(RBX_DFLTROOT) | OPT_SET(RBX_KDB ) | \ - OPT_SET(RBX_CONFIG) | OPT_SET(RBX_VERBOSE) | \ - OPT_SET(RBX_GDB) | \ - OPT_SET(RBX_PAUSE)) + OPT_SET(RBX_DFLTROOT) | \ + OPT_SET(RBX_VERBOSE) | \ + OPT_SET(RBX_GDB)) #define PATH_CONFIG "/boot.config" //#define PATH_KERNEL "/boot/kernel/kernel" #define PATH_KERNEL "/kernel.gz.tramp" -#define ARGS 0x900 -#define NOPT 8 -#define NDEV 3 -#define MEM_BASE 0x12 -#define MEM_EXT 0x15 - -#define DRV_HARD 0x80 -#define DRV_MASK 0x7f - -#define TYPE_AD 0 -#define TYPE_DA 1 -#define TYPE_MAXHARD TYPE_DA -#define TYPE_FD 2 +#define NOPT 6 #define OPT_SET(opt) (1 << (opt)) #define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) extern uint32_t _end; -static const char optstr[NOPT] = "agnpqrsv"; /* Also 'P' */ +static const char optstr[NOPT] = "agrsv"; static const unsigned char flags[NOPT] = { RBX_ASKNAME, RBX_GDB, - RBX_NOINTR, - RBX_PAUSE, - RBX_QUIET, RBX_DFLTROOT, RBX_SINGLE, RBX_VERBOSE @@ -109,7 +91,6 @@ static char kname[1024]; static uint32_t opts; static int dsk_meta; -//static int comspeed = SIOSPD; static void load(void); static int parse(void); @@ -143,20 +124,12 @@ ssize_t rv; if ((size_t)(rv = fsread(inode, buf, nbyte)) != nbyte) { - printf("Invalid %s\r\n", "sector"); + printf("Invalid %s\n", "sector"); return -1; } return 0; } -static void -xputchar(int ch) -{ - if (ch == '\n') - putchar('\r'); - putchar(ch); -} - static inline void getstr(void) { @@ -236,7 +209,7 @@ EERead(0, (uint8_t *)&sig, sizeof(sig)); if (sig != 0xaa55aa55) { - printf("Bad signature %x\r\n", sig); + printf("Bad signature %x\n", sig); return; } EERead(48, euid64, 8); @@ -255,13 +228,13 @@ ino_t ino; if (kname[0]) - printf("bss not zero\r\n"); + printf("bss not zero\n"); #ifdef TSC_FPGA SPI_InitFlash(); printf("Loading FPGA..."); fpga_load(); - printf("done\r\n"); + printf("done\n"); #endif EEInit(); MacFromEE(); @@ -280,8 +253,7 @@ if (*cmd) { if (parse()) autoboot = 0; - if (!OPT_CHECK(RBX_QUIET)) - printf("%s: %s", PATH_CONFIG, cmd); + printf("%s: %s", PATH_CONFIG, cmd); /* Do not process this command twice */ *cmd = 0; } @@ -290,13 +262,13 @@ p_strcpy(kname, PATH_KERNEL); for (;;) { - if (!autoboot || !OPT_CHECK(RBX_QUIET)) - printf("\r\nFreeBSD/arm boot\r\n" - "Default: %s\r\n" + if (!autoboot) + printf("\nFreeBSD/arm boot\n" + "Default: %s\n" "boot: ", kname); if (!autoboot || getc(5) == -1) getstr(); - else if (!autoboot || !OPT_CHECK(RBX_QUIET)) + else if (!autoboot) xputchar('\n'); autoboot = 0; if (parse()) @@ -321,13 +293,13 @@ if (!(ino = lookup(kname))) { if (!ls) - printf("No %s\r\n", kname); + printf("No %s\n", kname); return; } if (xfsread(ino, &eh, sizeof(eh))) return; if (!IS_ELF(eh)) { - printf("Invalid %s\r\n", "format"); + printf("Invalid %s\n", "format"); return; } fs_off = eh.e_phoff; @@ -392,7 +364,6 @@ return -1; opts ^= OPT_SET(flags[i]); } -// sio_init(115200 / comspeed); } else { if ((i = ep - arg)) { if ((size_t)i >= sizeof(kname)) @@ -424,7 +395,7 @@ break; } if (i == NDOSPART) { - printf("No BSD partition found\r\n"); + printf("No BSD partition found\n"); return -1; } // Although dp_start is aligned within the disk partition structure, @@ -435,11 +406,11 @@ return -1; d = (void *)(sec + LABELOFFSET); if (d->d_magic != DISKMAGIC || d->d_magic2 != DISKMAGIC) { - printf("Invalid %s\r\n", "label"); + printf("Invalid %s\n", "label"); return -1; } if (!d->d_partitions[0].p_size) { - printf("Invalid %s\r\n", "partition"); + printf("Invalid %s\n", "partition"); return -1; } dsk_start += d->d_partitions[0].p_offset; @@ -454,7 +425,6 @@ { static unsigned c = 0x2d5c7c2f; - if (!OPT_CHECK(RBX_QUIET)) - printf("%c\b", c = c << 8 | c >> 24); + printf("%c\b", c = c << 8 | c >> 24); return (MCI_read((char *)buf, lba << 9, nblk << 9)); } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#17 (text+ko) ==== @@ -234,20 +234,20 @@ case COMMAND_HELP: // dump command info - printf("Commands:\r\n" - "\tc\r\n" - "\td\r\n" - "\te\r\n" - "\tip\r\n" - "\tserver_ip\r\n" - "\tm\r\n" - "\ttftp\r\n" - "\ts\r\n" + printf("Commands:\n" + "\tc\n" + "\td\n" + "\te\n" + "\tip\n" + "\tserver_ip\n" + "\tm\n" + "\ttftp\n" + "\ts\n" #ifdef SUPPORT_TAG_LIST - "\tt\r\n" + "\tt\n" #endif - "\tw\r\n" - "\tx\r\n"); + "\tw\n" + "\tx\n"); break; case COMMAND_LOCAL_IP: @@ -315,7 +315,7 @@ break; } - printf("\r\n"); + printf("\n"); } @@ -324,7 +324,7 @@ * void ServicePrompt(char) * This private function process each character checking for valid commands. * This function is only executed if the character is considered valid. - * Each command is terminated with NULL (0) or '\r'. + * Each command is terminated with NULL (0) or ''. * .KB_C_FN_DEFINITION_END */ static void @@ -346,11 +346,11 @@ putchar(p_char); } if (!p_char) { - printf("\r\n"); + printf("\n"); ParseCommand(inputBuffer); p_memset(inputBuffer, 0, MAX_INPUT_SIZE); buffCount = 0; - printf("\r\n>"); + printf("\n>"); } } @@ -379,7 +379,7 @@ inputFunction = getc; } - printf("\r\n>"); + printf("\n>"); while (1) if ((ch = ((*inputFunction)(0))) > 0) ==== //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#7 (text+ko) ==== @@ -84,7 +84,7 @@ int i; #endif - printf("\r\nTSC boot...\r\n"); + printf("\nTSC boot...\n"); SPI_InitFlash(); #ifdef TSC_FPGA printf("Loading FPGA..."); @@ -93,7 +93,7 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC7; fpga_load(); AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC7; - printf("done\r\n"); + printf("done\n"); #endif EMAC_Init(); sdcard_init(); @@ -104,11 +104,11 @@ MCI_read((char *)0x20000000, i << 9, 1 << 9); printf("*"); } - printf("\r\nStarting...\r\n"); + printf("\nStarting...\n"); ((void(*)())(0x20000000))(); #else MCI_read((char *)0x20000000, 0, 1 << 20); - printf("Found %s\r\n", (char *)0x20000000); + printf("Found %s\n", (char *)0x20000000); while (1); #endif return (1); ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.c#4 (text+ko) ==== @@ -96,7 +96,7 @@ unsigned int status; if ((ee_off & ~0xff) != ((ee_off + size) & ~0xff)) { - printf("Crosses page boundary: 0x%x 0x%x\r\n", ee_off, size); + printf("Crosses page boundary: 0x%x 0x%x\n", ee_off, size); return; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#9 (text+ko) ==== @@ -82,7 +82,7 @@ int i; for (i = 0; boot_commands[i][0]; i++) - printf("0x%x : %s[E]\r\n", i, boot_commands[i]); + printf("0x%x : %s[E]\n", i, boot_commands[i]); } @@ -125,6 +125,6 @@ currentOffset = 0; DumpBootCommands(); - printf("Autoboot...\r\n"); + printf("Autoboot...\n"); Bootloader(ReadCharFromEnvironment); } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#19 (text+ko) ==== @@ -182,7 +182,7 @@ while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); + printf("\nDownloaded %u bytes.\n", len); WriteEEPROM(eeaddr, 0, addr, len); } #endif @@ -195,7 +195,7 @@ while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); + printf("\nDownloaded %u bytes.\n", len); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { off = i + offset; SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); @@ -302,38 +302,38 @@ break; case COMMAND_RESET: - printf("Reset\r\n"); + printf("Reset\n"); reset(); while (1) continue; break; case COMMAND_REPLACE_KERNEL_VIA_XMODEM: - printf("Updating KERNEL image\r\n"); + printf("Updating KERNEL image\n"); UpdateFlash(KERNEL_OFFSET); break; case COMMAND_REPLACE_FPGA_VIA_XMODEM: - printf("Updating FPGA image\r\n"); + printf("Updating FPGA image\n"); UpdateFlash(FPGA_OFFSET); break; case COMMAND_REPLACE_FLASH_VIA_XMODEM: - printf("Updating FLASH image\r\n"); + printf("Updating FLASH image\n"); UpdateFlash(FLASH_OFFSET); break; case COMMAND_REPLACE_ID_EEPROM: { char buf[25]; - printf("Testing Config EEPROM\r\n"); + printf("Testing Config EEPROM\n"); EEWrite(0, "This is a test", 15); EERead(0, buf, 15); - printf("Found '%s'\r\n", buf); + printf("Found '%s'\n", buf); break; } default: break; } - printf("\r\n"); + printf("\n"); } @@ -342,7 +342,7 @@ * void ServicePrompt(char) * This private function process each character checking for valid commands. * This function is only executed if the character is considered valid. - * Each command is terminated with NULL (0) or '\r'. + * Each command is terminated with NULL (0) or ''. * .KB_C_FN_DEFINITION_END */ static void @@ -364,11 +364,11 @@ putchar(p_char); } if (!p_char) { - printf("\r\n"); + printf("\n"); ParseCommand(inputBuffer); p_memset(inputBuffer, 0, MAX_INPUT_SIZE); buffCount = 0; - printf("\r\n>"); + printf("\n>"); } } @@ -393,7 +393,7 @@ p_memset((void*)inputBuffer, 0, sizeof(inputBuffer)); buffCount = 0; - printf("\r\n>"); + printf("\n>"); while (1) if ((ch = ((*inputFunction)(0))) > 0) ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#17 (text+ko) ==== @@ -46,7 +46,7 @@ int main(void) { - printf("\r\nBoot\r\n"); + printf("\nBoot\n"); EEInit(); SPI_InitFlash(); #ifdef TSC_FPGA ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#28 (text+ko) ==== @@ -209,14 +209,14 @@ dlAddress += len; lastSize += len; if (ackBlock % 128 == 0) - printf("tftp: %u kB\r", lastSize / 1024); + printf("tftp: %u kB", lastSize / 1024); } tftpHeader.opcode = TFTP_ACK_OPCODE; tftpHeader.block_num = SWAP16(ackBlock); Send_TFTP_Packet((char*)&tftpHeader, 4); if (len < 512) { ackBlock = -2; - printf("tftp: %u byte\r\n", lastSize); + printf("tftp: %u byte\n", lastSize); } } @@ -424,7 +424,7 @@ printf(" FDX"); update |= AT91C_EMAC_FD; } - printf("\r\n"); + printf("\n"); #endif pEmac->EMAC_CFG = update; } @@ -553,10 +553,10 @@ // Be sure to send a NAK, which is done by // ACKing the last block we got. TFTP_ACK_Data(0, ackBlock, 512); - printf("\nNAK %u\r\n", ackBlock); + printf("\nNAK %u\n", ackBlock); } } } if (timeout == 0) - printf("TFTP TIMEOUT!\r\n"); + printf("TFTP TIMEOUT!\n"); } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#17 (text) ==== @@ -29,6 +29,7 @@ int getc(int); void putchar(int); +void xputchar(int); void printf(const char *fmt,...); /* The following function write eeprom at ee_addr using data */ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#8 (text+ko) ==== @@ -168,7 +168,7 @@ /////////////////////////////////////////////////////////////////////// if (pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE) { #if IMP_DEBUG - printf("1 state is 0x%x\r\n", pMCI_Device->pMCI_DeviceDesc->state); + printf("1 state is 0x%x\n", pMCI_Device->pMCI_DeviceDesc->state); #endif return AT91C_READ_ERROR; } @@ -178,14 +178,14 @@ pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) != AT91C_SR_READY_FOR_DATA) { #if IMP_DEBUG - printf("2\r\n"); + printf("2\n"); #endif return AT91C_READ_ERROR; } if ( (src + sizeToRead) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity ) { #if IMP_DEBUG - printf("3\r\n"); + printf("3\n"); #endif return AT91C_READ_ERROR; } @@ -193,7 +193,7 @@ // If source does not fit a begin of a block if ((src & (sectorLength - 1)) != 0) { #if IMP_DEBUG - printf("4\r\n"); + printf("4\n"); #endif return AT91C_READ_ERROR; } @@ -203,14 +203,14 @@ if( (sizeToRead < sectorLength) && (pMCI_Device->pMCI_DeviceFeatures->Read_Partial == 0x00) ) { #if IMP_DEBUG - printf("5\r\n"); + printf("5\n"); #endif return AT91C_READ_ERROR; } if( sizeToRead > sectorLength) { #if IMP_DEBUG - printf("6\r\n"); + printf("6\n"); #endif return AT91C_READ_ERROR; } @@ -455,7 +455,7 @@ f->Relative_Card_Address = 0; continue; } - printf("Response is %x %x %x %x\r\n", tab_response[0], + printf("Response is %x %x %x %x\n", tab_response[0], tab_response[1], tab_response[2], tab_response[3]) f->READ_BL_LEN = ((tab_response[2] >> CSD__RD_B_LEN_S) & CSD__RD_B_LEN_M); f->WRITE_BL_LEN = ((tab_response[3] >> CSD__WBLEN_S) & CSD__WBLEN_M ); @@ -583,7 +583,7 @@ if (AT91F_MCI_GetCSD(f->Relative_Card_Address,tab_response) != AT91C_CMD_SEND_OK) return AT91C_INIT_ERROR; - printf("Response is %x %x %x %x\r\n", tab_response[0], + printf("Response is %x %x %x %x\n", tab_response[0], tab_response[1], tab_response[2], tab_response[3]); f->READ_BL_LEN = (tab_response[1] >> CSD_1_RD_B_LEN_S) & CSD_1_RD_B_LEN_M; @@ -617,7 +617,7 @@ return AT91C_INIT_ERROR; if (AT91F_MCI_SetBlocklength(1 << f->READ_BL_LEN) != AT91C_CMD_SEND_OK) return AT91C_INIT_ERROR; - printf("Found SD card %u bytes in size %u %u\r\n", f->Memory_Capacity, + printf("Found SD card %u bytes in size %u %u\n", f->Memory_Capacity, blocknr, mult); return AT91C_INIT_OK; } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/printf.c#5 (text+ko) ==== @@ -36,11 +36,11 @@ c = *fmt++; switch (c) { case 'c': - putchar(va_arg(ap, int)); + xputchar(va_arg(ap, int)); continue; case 's': for (s = va_arg(ap, char *); *s; s++) - putchar(*s); + xputchar(*s); continue; case 'd': /* A lie, always prints unsigned */ case 'u': @@ -51,7 +51,7 @@ while (u /= 10U); dumpbuf:; while (--s >= buf) - putchar(*s); + xputchar(*s); continue; case 'x': u = va_arg(ap, unsigned); @@ -62,7 +62,7 @@ goto dumpbuf; } } - putchar(c); + xputchar(c); } va_end(ap); ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/putchar.c#6 (text) ==== @@ -52,3 +52,11 @@ continue; pUSART->US_THR = (ch & 0xFF); } + +void +xputchar(int ch) +{ + if (ch == '\n') + putchar('\r'); + putchar(ch); +} ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#7 (text+ko) ==== @@ -87,7 +87,7 @@ #if IMP_DEBUG if (timeout == 0) - printf("Timeout, status is 0x%x\r\n", status); + printf("Timeout, status is 0x%x\n", status); #endif //TODO: Make interrupts work! @@ -104,7 +104,7 @@ int sizeToWrite; #if IMP_DEBUG - printf("\r\n"); + printf("\n"); #endif //See if we are requested to write partial sectors, and have the capability to do so @@ -181,7 +181,7 @@ unsigned int *walker; #if IMP_DEBUG - printf("Reading 0x%x bytes into ARM Addr 0x%x from card offset 0x%x\r\n", + printf("Reading 0x%x bytes into ARM Addr 0x%x from card offset 0x%x\n", length, dest, source); #endif @@ -209,7 +209,7 @@ //TODO:Status checking if (status != AT91C_READ_OK) { #if IMP_DEBUG - printf("STATUS is 0x%x\r\n", status); + printf("STATUS is 0x%x\n", status); #endif return -1; } @@ -241,14 +241,14 @@ //Do the writing status = AT91F_MCI_ReadBlock(&MCI_Device, source, (unsigned int*)dest, sizeToRead); #if IMP_DEBUG - printf("Reading 0x%x Addr 0x%x card 0x%x\r\n", + printf("Reading 0x%x Addr 0x%x card 0x%x\n", sizeToRead, dest, source); #endif //TODO:Status checking if (status != AT91C_READ_OK) { #if IMP_DEBUG - printf("STATUS is 0x%x\r\n", status); + printf("STATUS is 0x%x\n", status); #endif return -1; } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#17 (text+ko) ==== @@ -234,5 +234,5 @@ AT91C_BASE_ST->ST_RTMR = 1; if (((value = GetFlashStatus()) & 0xFC) != 0xBC) - printf(" Bad SPI status: 0x%x\r\n", value); + printf(" Bad SPI status: 0x%x\n", value); } From owner-p4-projects@FreeBSD.ORG Fri Sep 8 23:42:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBE0F16A416; Fri, 8 Sep 2006 23:42:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C649F16A403 for ; Fri, 8 Sep 2006 23:42:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54D6643D55 for ; Fri, 8 Sep 2006 23:42:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88Ngv35055968 for ; Fri, 8 Sep 2006 23:42:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88NgvQh055965 for perforce@freebsd.org; Fri, 8 Sep 2006 23:42:57 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Sep 2006 23:42:57 GMT Message-Id: <200609082342.k88NgvQh055965@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 105863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Sep 2006 23:42:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=105863 Change 105863 by imp@imp_lighthouse on 2006/09/08 23:42:10 ARM doesn't need to boot off a system > 1.5Tb, so save another 80 bytes by using the simplified cgbase. Affected files ... .. //depot/projects/arm/src/sys/boot/common/ufsread.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can support both UFS1 and UFS2 again. */ From owner-p4-projects@FreeBSD.ORG Sat Sep 9 00:03:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA76D16A417; Sat, 9 Sep 2006 00:03:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C59E16A403 for ; Sat, 9 Sep 2006 00:03:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57D0143D4C for ; Sat, 9 Sep 2006 00:03:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8903NUi058141 for ; Sat, 9 Sep 2006 00:03:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8903M76058138 for perforce@freebsd.org; Sat, 9 Sep 2006 00:03:22 GMT (envelope-from imp@freebsd.org) Date: Sat, 9 Sep 2006 00:03:22 GMT Message-Id: <200609090003.k8903M76058138@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 105864 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 00:03:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=105864 Change 105864 by imp@imp_lighthouse on 2006/09/09 00:03:09 Fix mmc support, to the extent that it compiles again. This costs 1100 bytes, so keep it disabled. Save a few bytes with better math. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#9 (text+ko) ==== @@ -48,6 +48,8 @@ #include "lib.h" +#define MMC_SUPPORT 0 + //*---------------------------------------------------------------------------- //* \fn AT91F_MCI_SendCommand //* \brief Generic function to send a command to the MMC or SDCard @@ -71,8 +73,10 @@ // Test error ==> if crc error and response R3 ==> don't check error error = (AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR; if (error != 0 ) { - // if the command is SEND_OP_COND the CRC error flag is always present (cf : R3 response) - if ( (Cmd != AT91C_SDCARD_APP_OP_COND_CMD) && (Cmd != AT91C_MMC_SEND_OP_COND_CMD) ) + // if the command is SEND_OP_COND the CRC error flag is + // always present (cf : R3 response) + if ((Cmd != AT91C_SDCARD_APP_OP_COND_CMD) && + (Cmd != AT91C_MMC_SEND_OP_COND_CMD)) return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR); if (error != AT91C_MCI_RCRCE) return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR); @@ -175,8 +179,7 @@ if ((AT91F_MCI_GetStatus( - pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) != - AT91C_SR_READY_FOR_DATA) { + pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) == 0) { #if IMP_DEBUG printf("2\n"); #endif @@ -219,10 +222,7 @@ // Init Mode Register AT91C_BASE_MCI->MCI_MR |= ((sectorLength << 16) | AT91C_MCI_PDCMODE); - if (sizeToRead %4) - sizeToRead = (sizeToRead /4)+1; - else - sizeToRead = sizeToRead/4; + sizeToRead = (sizeToRead + 3) / 4; AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); AT91C_BASE_PDC_MCI->PDC_RPR = (unsigned int)dataBuffer; @@ -242,7 +242,7 @@ return AT91C_READ_OK; } -#if 0 +#if MMC_SUPPORT //*---------------------------------------------------------------------------- //* \fn AT91F_MCI_WriteBlock //* \brief Write an ENTIRE block but not always PARTIAL block !!! @@ -254,14 +254,14 @@ unsigned int *dataBuffer, int sizeToWrite ) { - unsigned log2sl = MCI_Device.pMCI_DeviceFeatures->WRITE_BL_LEN; + unsigned log2sl = pMCI_Device->pMCI_DeviceFeatures->WRITE_BL_LEN; unsigned sectorLength = 1 << log2sl; /////////////////////////////////////////////////////////////////////// if( pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE) return AT91C_WRITE_ERROR; - if( (AT91F_MCI_GetStatus(pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) != AT91C_SR_READY_FOR_DATA) + if( (AT91F_MCI_GetStatus(pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) == 0) return AT91C_WRITE_ERROR; if ((dest + sizeToWrite) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity) @@ -281,12 +281,9 @@ /////////////////////////////////////////////////////////////////////// // Init Mode Register - AT91C_BASE_MCI->MCI_MR |= ((pMCI_Device->pMCI_DeviceFeatures->Max_Write_DataBlock_Length << 16) | AT91C_MCI_PDCMODE); - - if (sizeToWrite %4) - sizeToWrite = (sizeToWrite /4)+1; - else - sizeToWrite = sizeToWrite/4; + AT91C_BASE_MCI->MCI_MR |= ((1 << pMCI_Device->pMCI_DeviceFeatures->WRITE_BL_LEN) << 16) | AT91C_MCI_PDCMODE; + + sizeToWrite = (sizeToWrite + 3) / 4; // Init PDC for write sequence AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); @@ -372,7 +369,7 @@ return( AT91F_MCI_SendCommand(AT91C_SET_BLOCKLEN_CMD, length) ); } -#if 0 +#if MMC_SUPPORT //*---------------------------------------------------------------------------- //* \fn AT91F_MCI_MMC_GetAllOCR //* \brief Asks to all cards to send their operations conditions @@ -456,25 +453,25 @@ continue; } printf("Response is %x %x %x %x\n", tab_response[0], - tab_response[1], tab_response[2], tab_response[3]) - f->READ_BL_LEN = ((tab_response[2] >> CSD__RD_B_LEN_S) & CSD__RD_B_LEN_M); - f->WRITE_BL_LEN = ((tab_response[3] >> CSD__WBLEN_S) & CSD__WBLEN_M ); - f->Sector_Size = 1 + ((tab_response[2] >> CSD__v22_SECT_SIZE_S) & CSD__v22_SECT_SIZE_M ); - f->Read_Partial = (tab_response[2] >> CSD__RD_B_PAR_S) & CSD__RD_B_PAR_M; - f->Write_Partial = (tab_response[3] >> CSD__WBLOCK_P_S) & CSD__WBLOCK_P_M; + tab_response[1], tab_response[2], tab_response[3]); + f->READ_BL_LEN = ((tab_response[1] >> CSD_1_RD_B_LEN_S) & CSD_1_RD_B_LEN_M); + f->WRITE_BL_LEN = ((tab_response[3] >> CSD_3_WBLEN_S) & CSD_3_WBLEN_M ); + f->Sector_Size = 1 + ((tab_response[2] >> CSD_2_v22_SECT_SIZE_S) & CSD_2_v22_SECT_SIZE_M ); + f->Read_Partial = (tab_response[1] >> CSD_1_RD_B_PAR_S) & CSD_1_RD_B_PAR_M; + f->Write_Partial = (tab_response[3] >> CSD_3_WBLOCK_P_S) & CSD_3_WBLOCK_P_M; // None in MMC specification version 2.2 f->Erase_Block_Enable = 0; - f->Read_Block_Misalignment = (tab_response[2] >> CSD__RD_B_MIS_S) & CSD__RD_B_MIS_M; - f->Write_Block_Misalignment = (tab_response[2] >> CSD__WR_B_MIS_S) & CSD__WR_B_MIS_M; + f->Read_Block_Misalignment = (tab_response[1] >> CSD_1_RD_B_MIS_S) & CSD_1_RD_B_MIS_M; + f->Write_Block_Misalignment = (tab_response[1] >> CSD_1_WR_B_MIS_S) & CSD_1_WR_B_MIS_M; //// Compute Memory Capacity // compute MULT - mult = 1 << ( ((tab_response[2] >> CSD__C_SIZE_M_S) & CSD__C_SIZE_M_M) + 2 ); + mult = 1 << ( ((tab_response[2] >> CSD_2_C_SIZE_M_S) & CSD_2_C_SIZE_M_M) + 2 ); // compute MSB of C_SIZE - blocknr = ((tab_response[1] >> CSD__CSIZE_H_S) & CSD__CSIZE_H_M) << 2; + blocknr = ((tab_response[1] >> CSD_1_CSIZE_H_S) & CSD_1_CSIZE_H_M) << 2; // compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR - blocknr = mult * ( ( blocknr + ( (tab_response[2] >> CSD__CSIZE_L_S) & CSD__CSIZE_L_M) ) + 1 ); + blocknr = mult * ( ( blocknr + ( (tab_response[2] >> CSD_2_CSIZE_L_S) & CSD_2_CSIZE_L_M) ) + 1 ); f->Memory_Capacity = (1 << f->READ_BL_LEN) * blocknr; //// End of Compute Memory Capacity } From owner-p4-projects@FreeBSD.ORG Sat Sep 9 00:07:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3705F16A415; Sat, 9 Sep 2006 00:07:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 128C216A403 for ; Sat, 9 Sep 2006 00:07:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D10EF43D46 for ; Sat, 9 Sep 2006 00:07:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8907SLN058321 for ; Sat, 9 Sep 2006 00:07:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8907S9B058318 for perforce@freebsd.org; Sat, 9 Sep 2006 00:07:28 GMT (envelope-from imp@freebsd.org) Date: Sat, 9 Sep 2006 00:07:28 GMT Message-Id: <200609090007.k8907S9B058318@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 105865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 00:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=105865 Change 105865 by imp@imp_lighthouse on 2006/09/09 00:06:28 style nits Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#5 (text+ko) ==== @@ -18,5 +18,4 @@ -I${.CURDIR}/../../../common \ -I${.CURDIR}/../../../.. \ -D_KERNEL \ - -DUFS1_ONLY \ - -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ + -DUFS1_ONLY ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#8 (text+ko) ==== @@ -279,20 +279,19 @@ { // Init Device Structure - MCI_Device_Features.Relative_Card_Address = 0; - MCI_Device_Features.Card_Inserted = AT91C_SD_CARD_INSERTED; - MCI_Device_Features.READ_BL_LEN = 0; - MCI_Device_Features.WRITE_BL_LEN = 0; - MCI_Device_Features.Read_Partial = 0; - MCI_Device_Features.Write_Partial = 0; - MCI_Device_Features.Erase_Block_Enable = 0; - MCI_Device_Features.Sector_Size = 0; - MCI_Device_Features.Memory_Capacity = 0; - MCI_Device_Desc.state = AT91C_MCI_IDLE; - MCI_Device_Desc.SDCard_bus_width = AT91C_MCI_SCDBUS; - MCI_Device.pMCI_DeviceDesc = &MCI_Device_Desc; - MCI_Device.pMCI_DeviceFeatures = &MCI_Device_Features; - + MCI_Device_Features.Relative_Card_Address = 0; + MCI_Device_Features.Card_Inserted = AT91C_SD_CARD_INSERTED; + MCI_Device_Features.READ_BL_LEN = 0; + MCI_Device_Features.WRITE_BL_LEN = 0; + MCI_Device_Features.Read_Partial = 0; + MCI_Device_Features.Write_Partial = 0; + MCI_Device_Features.Erase_Block_Enable = 0; + MCI_Device_Features.Sector_Size = 0; + MCI_Device_Features.Memory_Capacity = 0; + MCI_Device_Desc.state = AT91C_MCI_IDLE; + MCI_Device_Desc.SDCard_bus_width = AT91C_MCI_SCDBUS; + MCI_Device.pMCI_DeviceDesc = &MCI_Device_Desc; + MCI_Device.pMCI_DeviceFeatures = &MCI_Device_Features; } static void AT91F_MCI_Handler(void) From owner-p4-projects@FreeBSD.ORG Sat Sep 9 00:10:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69A6716A40F; Sat, 9 Sep 2006 00:10:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40F3216A403 for ; Sat, 9 Sep 2006 00:10:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DB6F43D49 for ; Sat, 9 Sep 2006 00:10:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k890AWAe058457 for ; Sat, 9 Sep 2006 00:10:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k890AWhc058454 for perforce@freebsd.org; Sat, 9 Sep 2006 00:10:32 GMT (envelope-from imp@freebsd.org) Date: Sat, 9 Sep 2006 00:10:32 GMT Message-Id: <200609090010.k890AWhc058454@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 105866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 00:10:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=105866 Change 105866 by imp@imp_lighthouse on 2006/09/09 00:09:43 gcc's flow analysis is getting pretty good... eliminate a few more stores. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#3 (text+ko) ==== @@ -58,8 +58,10 @@ unsigned int periphBEnable) // \arg PERIPH B to enable { - pPio->PIO_ASR = periphAEnable; - pPio->PIO_BSR = periphBEnable; + if (periphAEnable) + pPio->PIO_ASR = periphAEnable; + if (periphBEnable) + pPio->PIO_BSR = periphBEnable; pPio->PIO_PDR = (periphAEnable | periphBEnable); // Set in Periph mode } From owner-p4-projects@FreeBSD.ORG Sat Sep 9 00:22:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7830916A412; Sat, 9 Sep 2006 00:22:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5322616A403 for ; Sat, 9 Sep 2006 00:22:50 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9989843D58 for ; Sat, 9 Sep 2006 00:22:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k890Mnc6059082 for ; Sat, 9 Sep 2006 00:22:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k890MnZ1059077 for perforce@freebsd.org; Sat, 9 Sep 2006 00:22:49 GMT (envelope-from imp@freebsd.org) Date: Sat, 9 Sep 2006 00:22:49 GMT Message-Id: <200609090022.k890MnZ1059077@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 105867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 00:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=105867 Change 105867 by imp@imp_lighthouse on 2006/09/09 00:22:10 Printf removal, gets us about 100 bytes Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#14 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#14 (text+ko) ==== @@ -227,14 +227,9 @@ int autoboot; ino_t ino; - if (kname[0]) - printf("bss not zero\n"); - #ifdef TSC_FPGA SPI_InitFlash(); - printf("Loading FPGA..."); fpga_load(); - printf("done\n"); #endif EEInit(); MacFromEE(); ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#10 (text+ko) ==== @@ -452,8 +452,6 @@ f->Relative_Card_Address = 0; continue; } - printf("Response is %x %x %x %x\n", tab_response[0], - tab_response[1], tab_response[2], tab_response[3]); f->READ_BL_LEN = ((tab_response[1] >> CSD_1_RD_B_LEN_S) & CSD_1_RD_B_LEN_M); f->WRITE_BL_LEN = ((tab_response[3] >> CSD_3_WBLEN_S) & CSD_3_WBLEN_M ); f->Sector_Size = 1 + ((tab_response[2] >> CSD_2_v22_SECT_SIZE_S) & CSD_2_v22_SECT_SIZE_M ); @@ -580,8 +578,6 @@ if (AT91F_MCI_GetCSD(f->Relative_Card_Address,tab_response) != AT91C_CMD_SEND_OK) return AT91C_INIT_ERROR; - printf("Response is %x %x %x %x\n", tab_response[0], - tab_response[1], tab_response[2], tab_response[3]); f->READ_BL_LEN = (tab_response[1] >> CSD_1_RD_B_LEN_S) & CSD_1_RD_B_LEN_M; f->WRITE_BL_LEN = (tab_response[3] >> CSD_3_WBLEN_S) & @@ -614,7 +610,6 @@ return AT91C_INIT_ERROR; if (AT91F_MCI_SetBlocklength(1 << f->READ_BL_LEN) != AT91C_CMD_SEND_OK) return AT91C_INIT_ERROR; - printf("Found SD card %u bytes in size %u %u\n", f->Memory_Capacity, - blocknr, mult); + printf("Found SD card %u bytes\n", f->Memory_Capacity); return AT91C_INIT_OK; } From owner-p4-projects@FreeBSD.ORG Sat Sep 9 00:29:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DF0616A412; Sat, 9 Sep 2006 00:29:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39FBA16A403 for ; Sat, 9 Sep 2006 00:29:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5BF243D49 for ; Sat, 9 Sep 2006 00:29:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k890TwqH059310 for ; Sat, 9 Sep 2006 00:29:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k890Twjf059307 for perforce@freebsd.org; Sat, 9 Sep 2006 00:29:58 GMT (envelope-from imp@freebsd.org) Date: Sat, 9 Sep 2006 00:29:58 GMT Message-Id: <200609090029.k890Twjf059307@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 105868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 00:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=105868 Change 105868 by imp@imp_lighthouse on 2006/09/09 00:29:09 more verbosity Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#15 (text+ko) ==== @@ -257,8 +257,7 @@ p_strcpy(kname, PATH_KERNEL); for (;;) { - if (!autoboot) - printf("\nFreeBSD/arm boot\n" + printf("\nFreeBSD/arm boot\n" "Default: %s\n" "boot: ", kname); if (!autoboot || getc(5) == -1) From owner-p4-projects@FreeBSD.ORG Sat Sep 9 06:05:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23F6C16A412; Sat, 9 Sep 2006 06:05:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA3A916A407 for ; Sat, 9 Sep 2006 06:05:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CC0043D46 for ; Sat, 9 Sep 2006 06:05:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8965nAI000958 for ; Sat, 9 Sep 2006 06:05:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8965loU000955 for perforce@freebsd.org; Sat, 9 Sep 2006 06:05:47 GMT (envelope-from imp@freebsd.org) Date: Sat, 9 Sep 2006 06:05:47 GMT Message-Id: <200609090605.k8965loU000955@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 105875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 06:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=105875 Change 105875 by imp@imp_paco-paco on 2006/09/09 06:04:54 IFC @105873 Affected files ... .. //depot/projects/arm/src/Makefile#5 integrate .. //depot/projects/arm/src/Makefile.inc1#15 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/arm/src/etc/rc.d/bthidd#1 branch .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/arm/src/lib/libutil/pw_util.c#3 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/arm/src/release/Makefile#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/arm/src/release/scripts/kernels-install.sh#3 integrate .. //depot/projects/arm/src/sbin/geom/class/nop/geom_nop.c#2 integrate .. //depot/projects/arm/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/arm/src/sbin/mount/mount.8#2 integrate .. //depot/projects/arm/src/share/man/man7/security.7#2 integrate .. //depot/projects/arm/src/share/man/man9/printf.9#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#15 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#22 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/arm/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#8 integrate .. //depot/projects/arm/src/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/arm/src/sys/dev/ic/nec765.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#18 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#18 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#16 integrate .. //depot/projects/arm/src/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/arm/src/sys/geom/gate/g_gate.h#5 integrate .. //depot/projects/arm/src/sys/geom/nop/g_nop.c#6 integrate .. //depot/projects/arm/src/sys/geom/nop/g_nop.h#3 integrate .. //depot/projects/arm/src/sys/modules/Makefile#30 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/arm/src/sys/pc98/cbus/fdc.c#5 integrate .. //depot/projects/arm/src/sys/sys/param.h#17 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthid_config.h#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthidd.8#1 branch .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthidd.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthidd.h#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/client.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/hid.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/kbd.h#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/lexer.l#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/parser.y#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/server.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/session.c#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ +# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ # # The user-driven targets are: # @@ -58,8 +58,8 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can -# cross build world for other architectures using the buildworld target, +# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can +# cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. # @@ -268,36 +268,32 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 ia64 amd64 -.for arch in ${target:C/:.*$//} -.for mach in ${target:C/^.*://} -KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ +.for target in amd64 i386 ia64 pc98 sparc64 +KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} -universe: universe_${mach} -.ORDER: universe_prologue universe_${mach} universe_epilogue -universe_${mach}: - @echo ">> ${mach} started on `LC_ALL=C date`" +universe: universe_${target} +.ORDER: universe_prologue universe_${target} universe_epilogue +universe_${target}: + @echo ">> ${target} started on `LC_ALL=C date`" -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ __MAKE_CONF=/dev/null \ - > _.${mach}.buildworld 2>&1 - @echo ">> ${mach} buildworld completed on `LC_ALL=C date`" -.if exists(${.CURDIR}/sys/${mach}/conf/NOTES) - -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ - > ${.CURDIR}/_.${mach}.makeLINT 2>&1 + > _.${target}.buildworld 2>&1 + @echo ">> ${target} buildworld completed on `LC_ALL=C date`" +.if exists(${.CURDIR}/sys/${target}/conf/NOTES) + -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \ + > ${.CURDIR}/_.${target}.makeLINT 2>&1 .endif .for kernel in ${KERNCONFS} -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ KERNCONF=${kernel} \ __MAKE_CONF=/dev/null \ - > _.${mach}.${kernel} 2>&1 + > _.${target}.${kernel} 2>&1 .endfor - @echo ">> ${mach} completed on `LC_ALL=C date`" -.endfor -.endfor + @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe: universe_epilogue universe_epilogue: ==== //depot/projects/arm/src/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.558 2006/09/07 20:27:56 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -207,6 +207,7 @@ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS ==== //depot/projects/arm/src/etc/defaults/rc.conf#5 (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.294 2006/08/17 20:13:24 brian Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.295 2006/09/07 22:25:07 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -336,6 +336,10 @@ sdpd_groupname="nobody" # set spdp(8) user/group to run as after sdpd_username="nobody" # it initializes +bthidd_enable="NO" # Enable bthidd(8) (or NO) +bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file +bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/arm/src/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.75 2006/08/22 11:12:09 flz Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 auditd \ - bgfsck bluetooth bootparams bridge bsnmpd \ + bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/arm/src/lib/libc/stdlib/malloc.c#7 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.136 2006/09/01 19:14:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.137 2006/09/08 17:52:15 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -699,6 +699,12 @@ /* * Try to use brk for chunk-size allocations, due to address space constraints. */ +/* + * Protects sbrk() calls. This must be separate from chunks_mtx, since + * base_chunk_alloc() also uses sbrk(), but cannot lock chunks_mtx (doing so + * could cause recursive lock acquisition). + */ +static malloc_mutex_t brk_mtx; /* Result of first sbrk(0) call. */ static void *brk_base; /* Current end of brk, or ((void *)-1) if brk is exhausted. */ @@ -816,6 +822,7 @@ static void wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4); static void malloc_printf(const char *format, ...); +static bool base_chunk_alloc(size_t minsize); static void *base_alloc(size_t size); static chunk_node_t *base_chunk_node_alloc(void); static void base_chunk_node_dealloc(chunk_node_t *node); @@ -967,6 +974,69 @@ /******************************************************************************/ +static bool +base_chunk_alloc(size_t minsize) +{ + + assert(minsize <= chunk_size); + +#ifdef USE_BRK + /* + * Do special brk allocation here, since the base chunk doesn't really + * need to be chunk-aligned. + */ + if (brk_prev != (void *)-1) { + void *brk_cur; + intptr_t incr; + + malloc_mutex_lock(&brk_mtx); + do { + /* Get the current end of brk. */ + brk_cur = sbrk(0); + + /* + * Calculate how much padding is necessary to + * chunk-align the end of brk. Don't worry about + * brk_cur not being chunk-aligned though. + */ + incr = (intptr_t)chunk_size + - (intptr_t)CHUNK_ADDR2OFFSET(brk_cur); + if (incr < minsize) + incr += chunk_size; + + brk_prev = sbrk(incr); + if (brk_prev == brk_cur) { + /* Success. */ + malloc_mutex_unlock(&brk_mtx); + base_chunk = brk_cur; + base_next_addr = base_chunk; + base_past_addr = (void *)((uintptr_t)base_chunk + + incr); +#ifdef MALLOC_STATS + base_total += incr; +#endif + return (false); + } + } while (brk_prev != (void *)-1); + malloc_mutex_unlock(&brk_mtx); + } +#endif + + /* + * Don't worry about chunk alignment here, since base_chunk doesn't really + * need to be aligned. + */ + base_chunk = pages_map(NULL, chunk_size); + if (base_chunk == NULL) + return (true); + base_next_addr = base_chunk; + base_past_addr = (void *)((uintptr_t)base_chunk + chunk_size); +#ifdef MALLOC_STATS + base_total += chunk_size; +#endif + return (false); +} + static void * base_alloc(size_t size) { @@ -980,21 +1050,10 @@ /* Make sure there's enough space for the allocation. */ if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { - void *tchunk; - - assert(csize <= chunk_size); - - tchunk = chunk_alloc(chunk_size); - if (tchunk == NULL) { + if (base_chunk_alloc(csize)) { ret = NULL; goto RETURN; } - base_chunk = tchunk; - base_next_addr = (void *)base_chunk; - base_past_addr = (void *)((uintptr_t)base_chunk + chunk_size); -#ifdef MALLOC_STATS - base_total += chunk_size; -#endif } /* Allocate. */ @@ -1234,6 +1293,7 @@ * The loop is necessary to recover from races with other * threads that are using brk for something other than malloc. */ + malloc_mutex_lock(&brk_mtx); do { /* Get the current end of brk. */ brk_cur = sbrk(0); @@ -1254,10 +1314,12 @@ brk_prev = sbrk(incr); if (brk_prev == brk_cur) { /* Success. */ + malloc_mutex_unlock(&brk_mtx); brk_max = (void *)(intptr_t)ret + size; goto RETURN; } } while (brk_prev != (void *)-1); + malloc_mutex_unlock(&brk_mtx); } #endif @@ -1327,6 +1389,7 @@ && (uintptr_t)chunk < (uintptr_t)brk_max) { void *brk_cur; + malloc_mutex_lock(&brk_mtx); /* Get the current end of brk. */ brk_cur = sbrk(0); @@ -1340,6 +1403,7 @@ if (brk_cur == brk_max && (void *)(uintptr_t)chunk + size == brk_max && sbrk(-(intptr_t)size) == brk_max) { + malloc_mutex_unlock(&brk_mtx); if (brk_prev == brk_max) { /* Success. */ brk_prev = (void *)(intptr_t)brk_max @@ -1348,6 +1412,7 @@ } goto RETURN; } else + malloc_mutex_unlock(&brk_mtx); madvise(chunk, size, MADV_FREE); } else #endif @@ -1567,7 +1632,7 @@ * * becomes * - * (size_invs[(D >> QUANTUM_2POW_MIN) - 3] * D) >> SIZE_INV_SHIFT + * (X * size_invs[(D >> QUANTUM_2POW_MIN) - 3]) >> SIZE_INV_SHIFT */ #define SIZE_INV_SHIFT 21 #define SIZE_INV(s) (((1 << SIZE_INV_SHIFT) / (s << QUANTUM_2POW_MIN)) + 1) @@ -1645,7 +1710,7 @@ */ regind = diff / size; }; - assert(regind == diff / size); + assert(diff == regind * size); assert(regind < bin->nregs); elm = regind >> (SIZEOF_INT_2POW + 3); @@ -2940,6 +3005,15 @@ malloc_printf("Allocated: %zu, space used: %zu\n", allocated, total); + /* Print base stats. */ + { + malloc_mutex_lock(&base_mtx); + malloc_printf("\nbase:\n"); + malloc_printf(" %13s\n", "total"); + malloc_printf(" %13llu\n", base_total); + malloc_mutex_unlock(&base_mtx); + } + /* Print chunk stats. */ { chunk_stats_t chunks_stats; @@ -3240,6 +3314,7 @@ malloc_mutex_init(&chunks_mtx); RB_INIT(&huge); #ifdef USE_BRK + malloc_mutex_init(&brk_mtx); brk_base = sbrk(0); brk_prev = brk_base; brk_max = brk_base; @@ -3257,49 +3332,11 @@ #endif #ifdef USE_BRK /* - * Do special brk allocation here, since the base chunk doesn't really - * need to be chunk-aligned. + * Allocate a base chunk here, since it doesn't actually have to be + * chunk-aligned. Doing this before allocating any other chunks allows + * the use of space that would otherwise be wasted. */ - { - void *brk_cur; - intptr_t incr; - - do { - /* Get the current end of brk. */ - brk_cur = sbrk(0); - - /* - * Calculate how much padding is necessary to - * chunk-align the end of brk. Don't worry about - * brk_cur not being chunk-aligned though. - */ - incr = (intptr_t)chunk_size - - (intptr_t)CHUNK_ADDR2OFFSET(brk_cur); - - brk_prev = sbrk(incr); - if (brk_prev == brk_cur) { - /* Success. */ - break; - } - } while (brk_prev != (void *)-1); - - base_chunk = brk_cur; - base_next_addr = base_chunk; - base_past_addr = (void *)((uintptr_t)base_chunk + incr); -#ifdef MALLOC_STATS - base_total += incr; - stats_chunks.nchunks = 1; - stats_chunks.curchunks = 1; - stats_chunks.highchunks = 1; -#endif - } -#else - /* - * The first base chunk will be allocated when needed by base_alloc(). - */ - base_chunk = NULL; - base_next_addr = NULL; - base_past_addr = NULL; + base_chunk_alloc(0); #endif base_chunk_nodes = NULL; malloc_mutex_init(&base_mtx); ==== //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.46 2006/08/28 04:52:50 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.47 2006/09/08 09:29:14 davidxu Exp $ */ #include "namespace.h" @@ -355,8 +355,7 @@ ret = mutex_self_lock(m, abstime); } else { if (abstime == NULL) { - _thr_umutex_lock(&m->m_lock, id); - ret = 0; + ret = _thr_umutex_lock(&m->m_lock, id); } else if (__predict_false( abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) { ==== //depot/projects/arm/src/lib/libutil/pw_util.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ static const char sccsid[] = "@(#)pw_util.c 8.3 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/lib/libutil/pw_util.c,v 1.36 2006/09/04 15:09:21 thomas Exp $"; + "$FreeBSD: src/lib/libutil/pw_util.c,v 1.37 2006/09/08 08:14:32 thomas Exp $"; #endif /* not lint */ /* @@ -488,7 +488,7 @@ fpw = pw_scan(r, PWSCAN_MASTER); /* - * fpw is either the struct password for the current line, + * fpw is either the struct passwd for the current line, * or NULL if the line is malformed. */ ==== //depot/projects/arm/src/libexec/rtld-elf/rtld.c#4 (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/libexec/rtld-elf/rtld.c,v 1.116 2006/09/01 06:13:16 marcel Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.117 2006/09/08 14:59:54 kib Exp $ */ /* @@ -123,7 +123,7 @@ static void set_program_var(const char *, const void *); static const Elf_Sym *symlook_default(const char *, unsigned long, const Obj_Entry *, const Obj_Entry **, const Ver_Entry *, int); -static const Elf_Sym *symlook_list(const char *, unsigned long, Objlist *, +static const Elf_Sym *symlook_list(const char *, unsigned long, const Objlist *, const Obj_Entry **, const Ver_Entry *, int flags, DoneList *); static void trace_loaded_objects(Obj_Entry *obj); static void unlink_object(Obj_Entry *); @@ -1851,21 +1851,18 @@ return NULL; } + DoneList donelist; + const Objlist *srch_list; + donelist_init(&donelist); if (obj->mainprog) { - DoneList donelist; - /* Search main program and all libraries loaded by it. */ - donelist_init(&donelist); - def = symlook_list(name, hash, &list_main, &defobj, ve, flags, - &donelist); + srch_list = &list_main; } else { - /* - * XXX - This isn't correct. The search should include the whole - * DAG rooted at the given object. - */ - def = symlook_obj(name, hash, obj, ve, flags); - defobj = obj; + /* Search the whole DAG rooted at the given object. */ + srch_list = &(obj->dagmembers); } + def = symlook_list(name, hash, srch_list, &defobj, ve, flags, + &donelist); } if (def != NULL) { @@ -2336,7 +2333,7 @@ } static const Elf_Sym * -symlook_list(const char *name, unsigned long hash, Objlist *objlist, +symlook_list(const char *name, unsigned long hash, const Objlist *objlist, const Obj_Entry **defobj_out, const Ver_Entry *ventry, int flags, DoneList *dlp) { ==== //depot/projects/arm/src/release/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.912 2006/08/22 07:51:08 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.913 2006/09/08 19:54:36 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -1098,7 +1098,7 @@ @rm -rf ${RD}/dists/${TD}/${TN}* @mkdir -p ${RD}/dists/${TD} @( cd ${SD} && \ - tn=`echo ${TN} | tr 'A-Z' 'a-z' | cut -c1-8` && \ + tn=`echo ${TN} | tr 'A-Z' 'a-z'` && \ echo rolling ${TD}/$$tn tarball &&\ tar --exclude CVS --exclude obj --exclude BOOTMFS -cf - ${ARG} | \ ${ZIPNSPLIT} ${RD}/dists/${TD}/$$tn. && \ ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.972 2006/09/07 18:58:19 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.974 2006/09/07 23:49:26 bmah Exp $ 2000 @@ -210,7 +210,7 @@ A potential denial of service attack against &man.named.8; has been fixed. For more details, see security advisory - FreeBSD-SA-06:20.named. &merged; + FreeBSD-SA-06:20.bind. &merged; @@ -1609,8 +1609,8 @@ GCC has been updated from 3.4.4 to 3.4.6. &merged; - GNU Readline library - has been updated from 5.0 to 5.1. + GNU Readline library has been + updated from 5.0 to 5.1. GNU Troff has been updated from version 1.19 to version 1.19.2. @@ -1627,7 +1627,7 @@ lukemftpd has been updated from a snapshot from NetBSD as of 9 August 2004 to a snapshot from - NetBSD as of 31 August 2006. + NetBSD as of 31 August 2006. &merged; OpenSSH has been updated from 4.2p1 to 4.3p1. ==== //depot/projects/arm/src/release/scripts/kernels-install.sh#3 (text) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/kernels-install.sh,v 1.3 2006/08/28 08:06:21 ru Exp $ +# $FreeBSD: src/release/scripts/kernels-install.sh,v 1.4 2006/09/08 19:54:37 ru Exp $ # if [ "`id -u`" != "0" ]; then @@ -35,8 +35,8 @@ echo "Saving existing $KERNEL as $sav" mv $KERNEL $sav fi - # translate per Makefile:doTARBALL XXX are we sure to have tr+cut? - tn=`echo ${CONFIG} | tr 'A-Z' 'a-z' | cut -c1-8` + # translate per Makefile:doTARBALL XXX are we sure to have tr? + tn=`echo ${CONFIG} | tr 'A-Z' 'a-z'` cat $tn.?? | tar --unlink -xpzf - -C $BOOT else echo "Installation of $CONFIG kernel distribution not done." ==== //depot/projects/arm/src/sbin/geom/class/nop/geom_nop.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Pawel Jakub Dawidek + * Copyright (c) 2004-2006 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/nop/geom_nop.c,v 1.8 2006/02/01 12:11:36 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/nop/geom_nop.c,v 1.9 2006/09/08 09:21:21 pjd Exp $"); #include #include @@ -38,7 +38,9 @@ uint32_t lib_version = G_LIB_VERSION; uint32_t version = G_NOP_VERSION; -static intmax_t failprob = 0; +static intmax_t error = -1; +static intmax_t rfailprob = -1; +static intmax_t wfailprob = -1; static intmax_t offset = 0; static intmax_t secsize = 0; static intmax_t size = 0; @@ -46,20 +48,25 @@ struct g_command class_commands[] = { { "create", G_FLAG_VERBOSE | G_FLAG_LOADKLD, NULL, { - { 'f', "failprob", &failprob, G_TYPE_NUMBER }, + { 'e', "error", &error, G_TYPE_NUMBER }, { 'o', "offset", &offset, G_TYPE_NUMBER }, + { 'r', "rfailprob", &rfailprob, G_TYPE_NUMBER }, { 's', "size", &size, G_TYPE_NUMBER }, { 'S', "secsize", &secsize, G_TYPE_NUMBER }, + { 'w', "wfailprob", &wfailprob, G_TYPE_NUMBER }, G_OPT_SENTINEL }, - "[-v] [-f failprob] [-o offset] [-s size] [-S secsize] dev ..." + "[-v] [-e error] [-o offset] [-r rfailprob] [-s size] [-S secsize] " + "[-w wfailprob] dev ..." }, { "configure", G_FLAG_VERBOSE, NULL, { - { 'f', "failprob", &failprob, G_TYPE_NUMBER }, + { 'e', "error", &error, G_TYPE_NUMBER }, + { 'r', "rfailprob", &rfailprob, G_TYPE_NUMBER }, + { 'w', "wfailprob", &wfailprob, G_TYPE_NUMBER }, G_OPT_SENTINEL }, - "[-v] [-f failprob] prov ..." + "[-v] [-e error] [-r rfailprob] [-w wfailprob] prov ..." }, { "destroy", G_FLAG_VERBOSE, NULL, { ==== //depot/projects/arm/src/sbin/geom/class/nop/gnop.8#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004-2005 Pawel Jakub Dawidek +.\" Copyright (c) 2004-2006 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/nop/gnop.8,v 1.19 2005/12/08 23:00:31 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.20 2006/09/08 09:21:21 pjd Exp $ .\" -.Dd May 21, 2004 +.Dd September 8, 2006 .Dt GNOP 8 .Os .Sh NAME @@ -34,15 +34,19 @@ .Nm .Cm create .Op Fl v -.Op Fl f Ar failprob +.Op Fl e Ar error .Op Fl o Ar offset +.Op Fl r Ar rfailprob .Op Fl s Ar size .Op Fl S Ar secsize +.Op Fl w Ar wfailprob .Ar dev ... .Nm .Cm configure .Op Fl v -.Op Fl f Ar failprob +.Op Fl e Ar error +.Op Fl r Ar rfailprob +.Op Fl w Ar wfailprob .Ar prov ... .Nm .Cm destroy @@ -104,17 +108,21 @@ .El .Pp Additional options: -.Bl -tag -width ".Fl f Ar failprob" +.Bl -tag -width ".Fl f Ar rfailprob" +.It Fl e Ar error +Specifies the error number to return on failure. .It Fl f Force the removal of the specified provider. -.It Fl f Ar failprob -Specifies failure probability in percentage. .It Fl o Ar offset Where to begin on the original provider. +.It Fl r Ar rfailprob +Specifies read failure probability in percent. .It Fl s Ar size Size of the transparent provider. .It Fl S Ar secsize Sector size of the transparent provider. +.It Fl w Ar wfailprob +Specifies write failure probability in percent. .It Fl v Be more verbose. .El ==== //depot/projects/arm/src/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.121 2006/09/06 22:07:14 andre Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.122 2006/09/08 13:29:38 andre Exp $"; #endif /* not lint */ #include @@ -805,7 +805,7 @@ #define IFCAPBITS \ "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" \ -"\8TSO4\9TSO6\10VLAN_HWCSUM" +"\10VLAN_HWCSUM\11TSO4\12TSO6" /* * Print the status of the interface. If an address family was ==== //depot/projects/arm/src/sbin/mount/mount.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.78 2006/07/12 16:05:51 des Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.79 2006/09/08 13:47:39 danger Exp $ .\" .Dd July 12, 2006 .Dt MOUNT 8 @@ -131,9 +131,12 @@ to the file system should be done asynchronously. This is a .Em dangerous -flag to set, -and should not be used unless you are prepared to recreate the file -system should your system crash. +flag to set, since it does not guarantee that the file system structure +on the disk will remain consistent. +For this reason, the +.Cm async +flag should be used sparingly, and only when some data recovery +mechanism is present. .It Cm current When used with the .Fl u ==== //depot/projects/arm/src/share/man/man7/security.7#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.47 2006/07/12 18:12:11 keramida Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.48 2006/09/08 04:56:21 trhodes Exp $ .\" -.Dd November 29, 2004 +.Dd September 8, 2006 .Dt SECURITY 7 .Os .Sh NAME @@ -54,19 +54,6 @@ In a nutshell, what you want to do is to create as many layers of security as are convenient and then carefully monitor the system for intrusions. -You do not want to -overbuild your security or you will interfere with the detection side, and -detection is one of the single most important aspects of any security -mechanism. -For example, it makes little sense to set the -.Cm schg -flags -(see -.Xr chflags 1 ) -on every system binary because while this may temporarily protect the -binaries, it prevents an attacker who has broken in from making an -easily detectable change that may result in your security mechanisms not -detecting the attacker at all. .Pp System security also pertains to dealing with various forms of attacks, including attacks that attempt to crash or otherwise make a system unusable ==== //depot/projects/arm/src/share/man/man9/printf.9#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/printf.9,v 1.7 2005/07/31 03:30:45 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/printf.9,v 1.8 2006/09/08 14:05:03 ru Exp $ .\" -.Dd August 10, 2004 +.Dd September 8, 2006 .Dt PRINTF 9 .Os .Sh NAME @@ -90,7 +90,7 @@ for example, \e10 gives octal and \e20 gives hexadecimal. The arguments are made up of a sequence of bit identifiers. Each bit identifier begins with an integer value which is the number of the -bit this identifier describes. +bit (starting from 1) this identifier describes. The rest of the identifier is a string of characters containing the name of the bit. The string is terminated by either the bit number at the start of the next @@ -140,7 +140,11 @@ .Fn uprintf functions return the number of characters displayed. .Sh EXAMPLES -This example demonstrates the use of the \&%b and \&%D conversion specifiers. +This example demonstrates the use of the +.Cm \&%b +and +.Cm \&%D +conversion specifiers. The function .Bd -literal -offset indent void ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.60 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.61 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.58 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.59 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ @@ -310,5 +310,10 @@ #define FREEBSD32_SYS_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 +#define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 +#define FREEBSD32_SYS_thr_set_name 464 +#define FREEBSD32_SYS_thr_setscheduler 466 +#define FREEBSD32_SYS_thr_getscheduler 467 +#define FREEBSD32_SYS_thr_setschedparam 468 #define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.49 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.50 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ @@ -463,7 +463,7 @@ "#453", /* 453 = auditctl */ "#454", /* 454 = _umtx_op */ "#455", /* 455 = thr_new */ - "#456", /* 456 = sigqueue */ + "sigqueue", /* 456 = sigqueue */ "#457", /* 457 = kmq_open */ "#458", /* 458 = kmq_setattr */ "#459", /* 459 = kmq_timedreceive */ @@ -471,11 +471,11 @@ "#461", /* 461 = kmq_notify */ "#462", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ - "#464", /* 464 = thr_set_name */ + "thr_set_name", /* 464 = thr_set_name */ "#465", /* 465 = aio_fsync */ - "#466", /* 466 = thr_setscheduler */ - "#467", /* 467 = thr_getscheduler */ - "#468", /* 468 = thr_setschedparam */ + "thr_setscheduler", /* 466 = thr_setscheduler */ + "thr_getscheduler", /* 467 = thr_getscheduler */ + "thr_setschedparam", /* 468 = thr_setschedparam */ "#469", /* 469 = __getpath_fromfd */ "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.59 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.60 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ @@ -488,7 +488,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 453 = auditctl */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ + { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 9 09:57:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C98016A412; Sat, 9 Sep 2006 09:57:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57A7016A407 for ; Sat, 9 Sep 2006 09:57:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21F5C43D45 for ; Sat, 9 Sep 2006 09:57:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k899vc8q023817 for ; Sat, 9 Sep 2006 09:57:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k899vbhA023814 for perforce@freebsd.org; Sat, 9 Sep 2006 09:57:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 09:57:37 GMT Message-Id: <200609090957.k899vbhA023814@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 105878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 09:57:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=105878 Change 105878 by rwatson@rwatson_sesame on 2006/09/09 09:57:24 Make svr4's privilege use for PRIV_VFS_ADMIN consistent with all other PRIV_VFS_ADMIN instances in the kernel. Affected files ... .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_fcntl.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_fcntl.c#3 (text+ko) ==== @@ -280,7 +280,8 @@ goto out; if (td->td_ucred->cr_uid != vattr.va_uid && - (error = priv_check(td, PRIV_VFS_ADMIN)) != 0) + (error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, + SUSER_ALLOWJAIL)) != 0) goto out; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) From owner-p4-projects@FreeBSD.ORG Sat Sep 9 09:58:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A37516A407; Sat, 9 Sep 2006 09:58:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3925416A412 for ; Sat, 9 Sep 2006 09:58:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE9B043D46 for ; Sat, 9 Sep 2006 09:58:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k899wdLC023889 for ; Sat, 9 Sep 2006 09:58:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k899wduN023886 for perforce@freebsd.org; Sat, 9 Sep 2006 09:58:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 09:58:39 GMT Message-Id: <200609090958.k899wduN023886@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 105879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 09:58:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=105879 Change 105879 by rwatson@rwatson_sesame on 2006/09/09 09:58:04 Allow fchroot() in jail on svr4, consistent with chroot elsewhere in the kernel. Affected files ... .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#3 (text+ko) ==== @@ -611,7 +611,8 @@ struct file *fp; int error, vfslocked; - if ((error = priv_check(td, PRIV_VFS_FCHROOT)) != 0) + if ((error = priv_check_cred(td->td_ucred, PRIV_VFS_FCHROOT, + SUSER_ALLOWJAIL)) != 0) return error; if ((error = getvnode(fdp, uap->fd, &fp)) != 0) return error; From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:00:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB59E16A47C; Sat, 9 Sep 2006 10:00:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4C0816A403 for ; Sat, 9 Sep 2006 10:00:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0B2143D45 for ; Sat, 9 Sep 2006 10:00:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89A0hAZ024035 for ; Sat, 9 Sep 2006 10:00:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89A0gQV024031 for perforce@freebsd.org; Sat, 9 Sep 2006 10:00:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:00:42 GMT Message-Id: <200609091000.k89A0gQV024031@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 105880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=105880 Change 105880 by rwatson@rwatson_sesame on 2006/09/09 10:00:40 Hook up mac_priv.c, which contains the MAC entry points for both denying and granting privilege. Add a new composition operator, MAC_GRANT(), for the grant path. Add a sample policy, mac_privs, which allows uid's to be assigned additional privileges using a rule based system. While here, update privileges, adding one for this policy, renaming the mount_owner privilege, and removing the VFS revoke privilege, which is actually just the vfs_admin privilege. change ifdef's so that user space can include privs.h for use in the management tool for mac_privs.c. Affected files ... .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#3 edit .. //depot/projects/trustedbsd/priv/sys/conf/files#3 edit .. //depot/projects/trustedbsd/priv/sys/conf/options#2 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_priv.c#2 edit .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#3 edit .. //depot/projects/trustedbsd/priv/sys/modules/mac_privs/Makefile#1 add .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#3 edit .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#1 add .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#2 edit .. //depot/projects/trustedbsd/priv/sys/security/mac_privs/mac_privs.c#1 add .. //depot/projects/trustedbsd/priv/sys/security/mac_privs/mac_privs.h#1 add .. //depot/projects/trustedbsd/priv/sys/sys/mac.h#2 edit .. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#2 edit .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/conf/NOTES#3 (text+ko) ==== @@ -1001,6 +1001,7 @@ options MAC_NONE options MAC_PARTITION options MAC_PORTACL +options MAC_PRIVS options MAC_SEEOTHERUIDS options MAC_STUB options MAC_TEST ==== //depot/projects/trustedbsd/priv/sys/conf/files#3 (text+ko) ==== @@ -1912,6 +1912,7 @@ security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_posix_sem.c optional mac +security/mac/mac_priv.c optional mac security/mac/mac_process.c optional mac security/mac/mac_socket.c optional mac security/mac/mac_system.c optional mac @@ -1927,6 +1928,7 @@ security/mac_none/mac_none.c optional mac_none security/mac_partition/mac_partition.c optional mac_partition security/mac_portacl/mac_portacl.c optional mac_portacl +security/mac_privs/mac_privs.c optional mac_privs security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test ==== //depot/projects/trustedbsd/priv/sys/conf/options#2 (text+ko) ==== @@ -110,6 +110,7 @@ MAC_NONE opt_dontuse.h MAC_PARTITION opt_dontuse.h MAC_PORTACL opt_dontuse.h +MAC_PRIVS opt_dontuse.h MAC_SEEOTHERUIDS opt_dontuse.h MAC_STATIC opt_mac.h MAC_STUB opt_dontuse.h ==== //depot/projects/trustedbsd/priv/sys/kern/kern_priv.c#2 (text+ko) ==== @@ -58,7 +58,8 @@ TUNABLE_INT("security.bsd.suser_enabled", &suser_enabled); /* - * Check a credential for privilege. + * Check a credential for privilege. Lots of good reasons to deny privilege; + * only a few to grant it. */ int priv_check_cred(struct ucred *cred, enum priv priv, int flags) @@ -68,44 +69,57 @@ KASSERT(PRIV_VALID(priv), ("priv_check_cred: invalid privilege %d", priv)); -#if defined(MAC) && defined(NOTYET) +#ifdef MAC error = mac_priv_check(cred, priv); if (error) return (error); #endif + /* + * Jail policy will restrict certain privileges that may otherwise be + * be granted. + * + * While debugging the transition from SUSER_ALLOWJAIL to Jail being + * aware of specific privileges, perform run-time checking that the + * two versions of the policy align. This assertion will go away + * once the SUSER_ALLOWJAIL flag has gone away. + */ error = prison_priv_check(cred, priv); + KASSERT(!jailed(cred) || error == ((flags & SUSER_ALLOWJAIL) ? 0 : + EPERM), ("priv_check_cred: prison_priv_check %d but flags %s", + error, flags & SUSER_ALLOWJAIL ? "allowjail" : "!allowjail")); if (error) return (error); /* - * XXXRW: Historic SUSER_ALLOWJAIL check, which allows the calling - * context to specify whether this privilege is permissible in a - * jail. This will go away shortly as we will be able to centralize - * the decision in prison_priv_check(). + * Having determined if privilege is restricted by various policies, + * now determine if privilege is granted. For now, we allow + * short-circuit boolean evaluation, so may not call all policies. + * Perhaps we should. * - * XXXRW: Consider an assertion that this never happens, as the - * earlier prison_priv_check() function should have rejected it. + * Superuser policy grants privilege based on the effective (or in + * certain edge cases, real) uid being 0. We allow the policy to be + * globally disabled, although this is currently of limited uility. */ - if (jailed(cred) && !(flags & SUSER_ALLOWJAIL)) - return (EPERM); + if (suser_enabled) { + if (flags & SUSER_RUID) { + if (cred->cr_ruid == 0) + return (0); + } else { + if (cred->cr_uid == 0) + return (0); + } + } /* - * Global super-user privilege frob. + * Now check with MAC, if enabled, to see if a policy module grants + * privilege. */ - if (!suser_enabled) - return (EPERM); - - /* - * Check for uid 0. - */ - if (((flags & SUSER_RUID) ? cred->cr_ruid : cred->cr_uid) != 0) - return (EPERM); - - /* - * Privilege is granted. - */ - return (0); +#ifdef MAC + if (mac_priv_grant(cred, priv) == 0) + return (0); +#endif + return (EPERM); } int ==== //depot/projects/trustedbsd/priv/sys/modules/Makefile#3 (text+ko) ==== @@ -147,6 +147,7 @@ mac_none \ mac_partition \ mac_portacl \ + mac_privs \ mac_seeotheruids \ mac_stub \ mac_test \ ==== //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#3 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2006 nCircle Network Security, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -12,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was developed by Robert N. M. Watson for the TrustedBSD + * Project under contract to nCircle Network Security, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -168,6 +172,36 @@ } while (0) /* + * MAC_GRANT performs the designated check by walking the policy module + * list and checking with each as to how it feels about the request. Unlike + * MAC_CHECK, it grants if any policies return '0', and otherwise returns + * EPERM. Note that it returns its value via 'error' in the scope of the + * caller. + */ +#define MAC_GRANT(check, args...) do { \ + struct mac_policy_conf *mpc; \ + int entrycount; \ + \ + error = EPERM; \ + LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## check != NULL) { \ + if (mpc->mpc_ops->mpo_ ## check(args) == 0) \ + error = 0; \ + } \ + } \ + if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## check != NULL) { \ + if (mpc->mpc_ops->mpo_ ## check (args) \ + == 0) \ + error = 0; \ + } \ + } \ + mac_policy_list_unbusy(); \ + } \ +} while (0) + +/* * MAC_BOOLEAN performs the designated boolean composition by walking * the module list, invoking each instance of the operation, and * combining the results using the passed C operator. Note that it ==== //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/priv/sys/sys/mac.h#2 (text+ko) ==== @@ -47,8 +47,6 @@ #ifndef _SYS_MAC_H_ #define _SYS_MAC_H_ -#include - #ifndef _POSIX_MAC #define _POSIX_MAC #endif @@ -107,6 +105,9 @@ #else /* _KERNEL */ +#include +#include /* XXXRW: Until name space issues resolved. */ + /* * Kernel functions to manage and evaluate labels. */ @@ -464,6 +465,8 @@ struct label *label); void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); void mac_associate_nfsd_label(struct ucred *cred); +int mac_priv_check(struct ucred *cred, enum priv priv); +int mac_priv_grant(struct ucred *cred, enum priv priv); /* * Calls to help various file systems implement labeling functionality ==== //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#2 (text+ko) ==== @@ -68,6 +68,7 @@ struct mac_policy_conf; struct mbuf; struct mount; +struct msg; struct msqid_kernel; struct pipepair; struct proc; @@ -590,6 +591,8 @@ struct ucred *file_cred, struct vnode *vp, struct label *label); typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); +typedef int (*mpo_priv_check_t)(struct ucred *cred, enum priv priv); +typedef int (*mpo_priv_grant_t)(struct ucred *cred, enum priv priv); struct mac_policy_ops { /* @@ -879,6 +882,8 @@ mpo_check_vnode_stat_t mpo_check_vnode_stat; mpo_check_vnode_write_t mpo_check_vnode_write; mpo_associate_nfsd_label_t mpo_associate_nfsd_label; + mpo_priv_check_t mpo_priv_check; + mpo_priv_grant_t mpo_priv_grant; }; /* ==== //depot/projects/trustedbsd/priv/sys/sys/priv.h#2 (text+ko) ==== @@ -36,14 +36,6 @@ #define _SYS_PRIV_H_ /* - * Eventually we may need to export the privilege list to user space. Until - * then, don't do so unnecessarily. - */ -#ifndef _KERNEL -#error "no user-serviceable parts inside" -#endif - -/* * Privilege list. In no particular order. * * Think carefully before adding or reusing one of these privileges -- are @@ -52,6 +44,9 @@ * modules. Particular numeric privilege assignments are part of the * loadable kernel module ABI, and should not be changed across minor * releases. + * + * When adding a new privilege, remember to determine if it's appropriate for + * use in jail, and update the privilege switch in kern_jail.c as necessary. */ enum priv { /* Track beginning of privilege list. */ @@ -116,6 +111,7 @@ PRIV_KLD_LOAD, /* Load a kernel module. */ PRIV_KLD_UNLOAD, /* Unload a kernel module. */ PRIV_MAC_PARTITION, /* Privilege in mac_partition policy. */ + PRIV_MAC_PRIVS, /* Privilege in the mac_privs policy. */ PRIV_PROC_LIMIT, /* Exceed user process limit. */ PRIV_PROC_SETLOGIN, /* Can call setlogin. */ PRIV_PROC_SETRLIMIT, /* Can raise resources limits. */ @@ -173,11 +169,10 @@ PRIV_VFS_LINK, /* bsd.hardlink_check_uid */ PRIV_VFS_MKNOD_DEV, /* Can create device nodes. */ PRIV_VFS_MOUNT, /* Can mount(). */ - PRIV_VFS_MOUNTOWNER, /* Override owner on user mounts. */ + PRIV_VFS_MOUNT_OWNER, /* Override owner on user mounts. */ PRIV_VFS_MOUNT_EXPORTED, /* Can set MNT_EXPORTED on mount. */ PRIV_VFS_MOUNT_PERM, /* Override device node perms at mount. */ PRIV_VFS_MOUNT_SUIDDIR, /* Can set MNT_SUIDDIR on mount. */ - PRIV_VFS_REVOKE, /* Can revoke(). */ PRIV_VFS_SETGID, /* Can setgid if not in group. */ PRIV_VFS_STICKYFILE, /* Can set sticky bit on file. */ PRIV_VFS_SYSFLAGS, /* Can modify system flags. */ @@ -297,6 +292,7 @@ */ #define PRIV_VALID(x) ((x) > _PRIV_LOWEST && (x) < _PRIV_HIGHEST) +#ifdef _KERNEL /* * Privilege check interfaces, modeled after historic suser() interfacs, but * with the addition of a specific privilege name. The existing SUSER_* flag @@ -308,5 +304,6 @@ struct ucred; int priv_check(struct thread *td, enum priv priv); int priv_check_cred(struct ucred *cred, enum priv priv, int flags); +#endif #endif /* !_SYS_PRIV_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:01:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD6A116A407; Sat, 9 Sep 2006 10:01:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A25716A412 for ; Sat, 9 Sep 2006 10:01:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E42B643D45 for ; Sat, 9 Sep 2006 10:01:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89A1jMr024243 for ; Sat, 9 Sep 2006 10:01:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89A1jfo024240 for perforce@freebsd.org; Sat, 9 Sep 2006 10:01:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:01:45 GMT Message-Id: <200609091001.k89A1jfo024240@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 105881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=105881 Change 105881 by rwatson@rwatson_sesame on 2006/09/09 10:01:13 Complete privilege mapping for Jail. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -535,82 +535,189 @@ return (0); switch (priv) { + /* case PRIV_ROOT: */ + /* case PRIV_ACCT: */ + /* case PRIV_MAXFILES: */ + /* case PRIV_MAXPROC: */ + case PRIV_KTRACE: + /* case PRIV_SETDUMPER: */ + /* case PRIV_NFSD: */ + /* case PRIV_REBOOT: */ + /* case PRIV_SWAPON: */ + /* case PRIV_SWAPOFF: */ + /* case PRIV_MSGBUF: */ + /* case PRIV_WITNESS: */ + /* case PRIV_IO: */ + /* case PRIV_KEYBOARD: */ + /* case PRIV_DRIVER: */ + /* case PRIV_ADJTIME: */ + /* case PRIV_NTP_ADJTIME: */ + /* case PRIV_CLOCK_SETTIME: */ + /* case PRIV_SETTIMEOFDAY: */ + /* case PRIV_SETHOSTID: */ + /* case PRIV_SETDOMAINNAME: */ + /* case PRIV_AUDIT_CONTROL: */ + /* case PRIV_AUDIT_FAILSTOP: */ + case PRIV_AUDIT_GETAUDIT: + case PRIV_AUDIT_SETAUDIT: + case PRIV_AUDIT_SUBMIT: case PRIV_CRED_SETUID: case PRIV_CRED_SETEUID: case PRIV_CRED_SETGID: case PRIV_CRED_SETEGID: + case PRIV_CRED_SETGROUPS: case PRIV_CRED_SETREUID: case PRIV_CRED_SETREGID: case PRIV_CRED_SETRESUID: case PRIV_CRED_SETRESGID: - case PRIV_CRED_SETGROUPS: - /* - * Grant most process credential privileges, as root within a - * jail can set up credentials as it sees fit. The ability - * to modify jail settings, and in particular to attach to a - * jail, is not granted. - */ - return (0); - - case PRIV_SIGNAL_SUGID: - case PRIV_SIGNAL_DIFFCRED: + case PRIV_SEEOTHERGIDS: + case PRIV_SEEOTHERUIDS: + case PRIV_DEBUG_DIFFCRED: + case PRIV_DEBUG_SUGID: + case PRIV_DEBUG_UNPRIV: + /* case PRIV_FIRMWARE_LOAD: */ + /* case PRIV_JAIL_ATTACH: */ + /* case PRIV_KENV_SET: */ + /* case PRIV_KENV_UNSET: */ + /* case PRIV_KLD_LOAD: */ + /* case PRIV_KLD_UNLOAD: */ + /* case PRIV_MAC_PARTITION: */ + case PRIV_PROC_LIMIT: case PRIV_PROC_SETLOGIN: - /* - * Inter-process privileges are generally granted, since a - * separate jail name space check will be performed to scope - * these calls to the current jail. - */ - return (0); - - case PRIV_SCHED_SETPRIORITY: case PRIV_PROC_SETRLIMIT: - /* - * Root in jail can modify resource limits and scheduler - * properties as it sees fit. - */ - return (0); - case PRIV_IPC_READ: - case PRIV_IPC_EXEC: - case PRIV_IPC_WRITE: - case PRIV_IPC_ADMIN: - case PRIV_IPC_MSGSIZE: - /* - * Grant System V IPC privileges -- we enable access to the - * services using a single setting, and assume that if System - * V IPC is available in the jail, privilege will be granted - * to root in the jail. - */ - return (0); - - case PRIV_MQ_ADMIN: - /* - * POSIX message queue administrative privilege is granted: - * if the jail can name the resource, then root in the jail - * can manage it. - */ - return (0); - + /* XXXRW: Not yet. */ + /* case PRIV_IPC_READ: */ + /* case PRIV_IPC_WRITE: */ + /* case PRIV_IPC_EXEC: */ + /* case PRIV_IPC_ADMIN: */ + /* case PRIV_IPC_MSGSIZE: */ + /* case PRIV_MQ_ADMIN: */ + /* case PRIV_PMC_MANAGE: */ + /* case PRIV_PMC_SYSTEM: */ + case PRIV_SCHED_DIFFCRED: + /* case PRIV_SCHED_SETPRIORITY: */ + /* case PRIV_SCHED_RTPRIO: */ + /* case PRIV_SCHED_SETPOLICY: */ + /* case PRIV_SCHED_SET: */ + /* case PRIV_SCHED_SETPARAM: */ + /* case PRIV_SEM_WRITE: */ + case PRIV_SIGNAL_DIFFCRED: + case PRIV_SIGNAL_SUGID: + /* case PRIV_SYSCTL_DEBUG: */ + /* case PRIV_SYSCTL_WRITE: */ + case PRIV_SYSCTL_WRITEJAIL: + /* case PRIV_TTY_CONSOLE: */ + /* case PRIV_TTY_DRAINWAIT: */ + /* case PRIV_TTY_DTRWAIT: */ + /* case PRIV_TTY_EXCLUSIVE: */ + /* case PRIV_TTY_PRISON: */ + /* case PRIV_TTY_STI: */ + /* case PRIV_TTY_SETA: */ + /* case PRIV_UFS_EXTATTRCTL: */ + case PRIV_UFS_GETQUOTA: + case PRIV_UFS_QUOTAOFF: /* XXXRW: Slightly surprising. */ + case PRIV_UFS_QUOTAON: /* XXXRW: Slightly surprising. */ + case PRIV_UFS_SETQUOTA: + case PRIV_UFS_SETUSE: /* XXXRW: Slightly surprising. */ + /* case PRIV_UFS_EXCEEDQUOTA: */ case PRIV_VFS_READ: case PRIV_VFS_WRITE: + case PRIV_VFS_ADMIN: case PRIV_VFS_EXEC: - case PRIV_VFS_ADMIN: case PRIV_VFS_LOOKUP: - /* - * In general, grant file permission exemption in VFS, but - * not the right to manipulate the name space (mounting, - * chroot, etc). - */ + case PRIV_VFS_BLOCKRESERVE: /* XXXRW: Slightly surprising. */ + case PRIV_VFS_CHFLAGS_DEV: + case PRIV_VFS_CHOWN: + case PRIV_VFS_CHROOT: + case PRIV_VFS_CLEARSUGID: + /* case PRIV_VFS_EXTATTR_SYSTEM: */ + case PRIV_VFS_FCHROOT: + /* case PRIV_VFS_FHOPEN: */ + /* case PRIV_VFS_FHSTAT: */ + /* case PRIV_VFS_FHSTATFS: */ + /* case PRIV_VFS_GENERATION: */ + /* case PRIV_VFS_GETFH: */ + case PRIV_VFS_LINK: + /* case PRIV_VFS_MKNOD_DEV: */ + /* case PRIV_VFS_MOUNT: */ + /* case PRIV_VFS_MOUNT_OWNER: */ + /* case PRIV_VFS_MOUNT_EXPORTED: */ + /* case PRIV_VFS_MOUNT_PERM: */ + /* case PRIV_VFS_MOUNT_SUIDDIR: */ + case PRIV_VFS_SETGID: + case PRIV_VFS_STICKYFILE: return (0); - case PRIV_VFS_CHFLAGS_DEV: - case PRIV_VFS_REVOKE: - /* - * Grant rights relating to managing visible device nodes and - * ttys. - */ + case PRIV_VFS_SYSFLAGS: + if (jail_chflags_allowed) + return (0); + else + return (EPERM); + /* case PRIV_VFS_UNMOUNT: */ + /* case PRIV_VM_MADV_PROTECT: */ + /* case PRIV_VM_MLOCK: */ + /* case PRIV_VM_MUNLOCK: */ + /* case PRIV_DEVFS_RULE: */ + /* case PRIV_DEVFS_SYMLINK: */ + /* case PRIV_RANDOM_RESEED: */ + /* case PRIV_NET_BRIDGE: */ + /* case PRIV_NET_GRE: */ + /* case PRIV_NET_PPP: */ + /* case PRIV_NET_SLIP: */ + /* case PRIV_NET_BPF: */ + /* case PRIV_NET_RAW: */ + /* case PRIV_NET_ROUTE: */ + /* case PRIV_NET_TAP: */ + /* case PRIV_NET_SETIFMTU: */ + /* case PRIV_NET_SETIFFLAGS: */ + /* case PRIV_NET_SETIFCAP: */ + /* case PRIV_NET_SETIFNAME: */ + /* case PRIV_NET_SETIFMETRIC: */ + /* case PRIV_NET_SETIFPHYS: */ + /* case PRIV_NET_SETIFMAC: */ + /* case PRIV_NET_ADDMULTI: */ + /* case PRIV_NET_DELMULTI: */ + /* case PRIV_NET_HWIOCTL: */ + /* case PRIV_NET_SETLLADDR: */ + /* case PRIV_NET_ADDIFGROUP: */ + /* case PRIV_NET_DELIFGROUP: */ + /* case PRIV_NET_IFCREATE: */ + /* case PRIV_NET_IFDESTROY: */ + /* case PRIV_NET80211_GETKEY: */ + /* case PRIV_NET80211_MANAGE: */ + /* case PRIV_NETATALK_RESERVEDPORT: */ + /* case PRIV_NETATM_CFG: */ + /* case PRIV_NETATM_ADD: */ + /* case PRIV_NETATM_DEL: */ + /* case PRIV_NETATM_SET: */ + /* case PRIV_NETGRAPH_CONTROL: */ + /* case PRIV_NETGRAPH_TTY: */ + case PRIV_NETINET_RESERVEDPORT: return (0); + /* case PRIV_NETINET_IPFW: */ + /* case PRIV_NETINET_DIVERT: */ + /* case PRIV_NETINET_PF: */ + /* case PRIV_NETINET_DUMMYNET: */ + /* case PRIV_NETINET_CARP: */ + /* case PRIV_NETINET_MROUTE: */ + case PRIV_NETINET_RAW: + if (jail_allow_raw_sockets) + return (0); + else + return (EPERM); + case PRIV_NETINET_GETCRED: + /* case PRIV_NETINET_ADDRCTRL6: */ + /* case PRIV_NETINET_ND6: */ + /* case PRIV_NETINET_SCOPE6: */ + /* case PRIV_NETINET_ALIFETIME6: */ + /* case PRIV_NETINET_IPSEC: */ + /* case PRIV_NETIPX_RESERVEDPORT: */ + /* case PRIV_NETIPX_RAW: */ + /* case PRIV_NETNCP: */ + /* case PRIV_NETSMB: */ + /* case PRIV_VM86_INTCALL: */ default: /* From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:03:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 607A716A416; Sat, 9 Sep 2006 10:03:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AA5C16A403 for ; Sat, 9 Sep 2006 10:03:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D636D43D64 for ; Sat, 9 Sep 2006 10:03:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89A3mXB025658 for ; Sat, 9 Sep 2006 10:03:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89A3mRr025655 for perforce@freebsd.org; Sat, 9 Sep 2006 10:03:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:03:48 GMT Message-Id: <200609091003.k89A3mRr025655@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 105882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:03:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=105882 Change 105882 by rwatson@rwatson_sesame on 2006/09/09 10:02:52 Add a new sysctl privilege associated with a sysctl writable in jail, in contrast the sysctls not writable in jail. That way jail can grant access to some, but not all, sysctls without further special casing in the sysctl code. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_sysctl.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_sysctl.c#3 (text+ko) ==== @@ -1253,7 +1253,8 @@ /* Is this sysctl writable by only privileged users? */ if (req->newptr && !(oid->oid_kind & CTLFLAG_ANYBODY)) { if (oid->oid_kind & CTLFLAG_PRISON) - error = priv_check(req->td, PRIV_SYSCTL_WRITEJAIL); + error = priv_check_cred(req->td->td_ucred, + PRIV_SYSCTL_WRITEJAIL, SUSER_ALLOWJAIL); else error = priv_check(req->td, PRIV_SYSCTL_WRITE); if (error) From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:06:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D002916A416; Sat, 9 Sep 2006 10:06:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA5D616A412 for ; Sat, 9 Sep 2006 10:06:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C86343D45 for ; Sat, 9 Sep 2006 10:06:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89A6rRJ025937 for ; Sat, 9 Sep 2006 10:06:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89A6q5Q025934 for perforce@freebsd.org; Sat, 9 Sep 2006 10:06:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:06:52 GMT Message-Id: <200609091006.k89A6q5Q025934@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 105883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:06:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=105883 Change 105883 by rwatson@rwatson_sesame on 2006/09/09 10:06:18 Annotate inconsistencies in procfs access control. Annotate the oddness of WITNESS doing a privilege checkn in a sysctl. Annotate the oddness of uipc_mqueue with respect to jail. Update vfs_mount.c so that overriding the owner during mount is based on vfs_admin, which is generally allowed in jail; this is separate from other privilege checks elsewhere in the mount process. Complete rename of priv_vfs_mountowner. Convert vfs_syscalls.c to use the admin privilege rather than the revoke privilege. Annotate that the raw socket decision would be better made in the jail code than in the raw socket code. Convert IPv6 to allow privileged ports to be used in jail, consistent with IPv4. Don't allow managing IPSEC in jail. Don't limit querying netinet IPv6 pcb information in jail based on a privilege check, there are separate visibility checks for that. In mac_portacl, exempt jailed root, similar to other places where root can bind ports. Affected files ... .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#3 edit .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#3 edit .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#3 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#3 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#3 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#3 edit .. //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#3 edit .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#3 edit .. //depot/projects/trustedbsd/priv/sys/netinet6/ipsec.c#3 edit .. //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#3 edit .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_osdep.h#3 edit .. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#3 (text+ko) ==== @@ -92,6 +92,9 @@ * XXXRW: Is this specific check required here, as * p_candebug() should implement it, or other checks * are missing. + * + * XXXRW: Other debugging privileges are granted in + * jail, why isn't this? */ error = priv_check(td, PRIV_DEBUG_SUGID); if (error) ==== //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#3 (text+ko) ==== @@ -533,6 +533,9 @@ error = sysctl_handle_int(oidp, &value, 0, req); if (error != 0 || req->newptr == NULL) return (error); + /* + * XXXRW: Why a priv check here? + */ error = priv_check(req->td, PRIV_WITNESS); if (error != 0) return (error); ==== //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#3 (text+ko) ==== @@ -954,6 +954,10 @@ sx_assert(&pn->mn_info->mi_lock, SX_LOCKED); + /* + * XXXRW: Other instances of the message queue primitive are + * allowed in jail? + */ if (ucred->cr_uid != pn->mn_uid && (error = priv_check_cred(ucred, PRIV_MQ_ADMIN, 0)) != 0) error = EACCES; ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#3 (text+ko) ==== @@ -908,7 +908,8 @@ return (error); } if (va.va_uid != td->td_ucred->cr_uid) { - error = priv_check(td, PRIV_VFS_ADMIN); + error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, + SUSER_ALLOWJAIL); if (error) { vput(vp); return (error); ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#3 (text+ko) ==== @@ -407,7 +407,7 @@ if ((mp->mnt_flag & MNT_USER) == 0 || mp->mnt_cred->cr_uid != td->td_ucred->cr_uid) { - if ((error = priv_check(td, PRIV_VFS_MOUNTOWNER)) != 0) + if ((error = priv_check(td, PRIV_VFS_MOUNT_OWNER)) != 0) return (error); } return (0); ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -3892,7 +3892,7 @@ if (error) goto out; if (td->td_ucred->cr_uid != vattr.va_uid) { - error = priv_check_cred(td->td_ucred, PRIV_VFS_REVOKE, + error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, SUSER_ALLOWJAIL); if (error) goto out; ==== //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#3 (text+ko) ==== @@ -605,6 +605,9 @@ inp = sotoinpcb(so); KASSERT(inp == NULL, ("rip_attach: inp != NULL")); + /* + * XXXRW: Centralize privilege decision in kern_jail.c. + */ if (jailed(td->td_ucred) && !jail_allow_raw_sockets) return (EPERM); error = priv_check_cred(td->td_ucred, PRIV_NETINET_RAW, ==== //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#3 (text+ko) ==== @@ -773,7 +773,8 @@ last = ipport_hilastauto; lastport = &pcbinfo->lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, 0); + error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, + SUSER_ALLOWJAIL); if (error) return error; first = ipport_lowfirstauto; /* 1023 */ ==== //depot/projects/trustedbsd/priv/sys/netinet6/ipsec.c#3 (text+ko) ==== @@ -1225,9 +1225,11 @@ /* * XXXRW: Can we avoid caching the privilege decision here, and * instead cache the credential? + * + * XXXRW: Why is suser_allowjail set here? */ if (so->so_cred != NULL && priv_check_cred(so->so_cred, - PRIV_NETINET_IPSEC, SUSER_ALLOWJAIL) == 0) + PRIV_NETINET_IPSEC, 0) == 0) new->priv = 1; else new->priv = 0; ==== //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#3 (text+ko) ==== @@ -435,7 +435,8 @@ struct inpcb *inp; int error; - error = priv_check(req->td, PRIV_NETINET_GETCRED); + error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED, + SUSER_ALLOWJAIL); if (error) return (error); ==== //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_osdep.h#3 (text+ko) ==== @@ -215,11 +215,12 @@ * NetBSD (1.6N) tests (so)->so_uid == 0). * This difference is wrapped inside the IPSEC_PRIVILEGED_SO() macro. * + * XXXRW: Why was this suser_allowjail? */ #ifdef __FreeBSD__ #define IPSEC_IS_PRIVILEGED_SO(_so) \ ((_so)->so_cred != NULL && \ - priv_check_cred((_so)->so_cred, PRIV_NETINET_IPSECSUSER_ALLOWJAIL) \ + priv_check_cred((_so)->so_cred, PRIV_NETINET_IPSEC, 0) \ == 0) #endif /* __FreeBSD__ */ ==== //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#3 (text+ko) ==== @@ -428,7 +428,8 @@ mtx_unlock(&rule_mtx); if (error != 0 && mac_portacl_suser_exempt != 0) - error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, 0); + error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, + SUSER_ALLOWJAIL); return (error); } From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:07:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABB8016A416; Sat, 9 Sep 2006 10:07:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66E0516A407 for ; Sat, 9 Sep 2006 10:07:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30ABB43D45 for ; Sat, 9 Sep 2006 10:07:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89A7t7o026018 for ; Sat, 9 Sep 2006 10:07:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89A7s82026015 for perforce@freebsd.org; Sat, 9 Sep 2006 10:07:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:07:54 GMT Message-Id: <200609091007.k89A7s82026015@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 105884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:07:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=105884 Change 105884 by rwatson@rwatson_sesame on 2006/09/09 10:06:54 Userspace management tool for mac_privs, allowing appropriately privileged users to assign privileges to other users. That includes the right to assign priv_mac_privs, allowing delegation of the right to assign. This demonstrates how a MAC policy might grant privilege. Affected files ... .. //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/Makefile#1 add .. //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_priv_names.c#1 add .. //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_privs.c#1 add .. //depot/projects/trustedbsd/priv/usr.sbin/mac_privs/mac_privs.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:09:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DBE816A416; Sat, 9 Sep 2006 10:09:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5DC716A415 for ; Sat, 9 Sep 2006 10:09:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E0A943D49 for ; Sat, 9 Sep 2006 10:09:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89A9wrt026167 for ; Sat, 9 Sep 2006 10:09:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89A9whn026164 for perforce@freebsd.org; Sat, 9 Sep 2006 10:09:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:09:58 GMT Message-Id: <200609091009.k89A9whn026164@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 105885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:09:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=105885 Change 105885 by rwatson@rwatson_sesame on 2006/09/09 10:08:59 Fix typo: mention currsz, not just maxsz. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditon.2#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#8 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#8 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -192,7 +192,7 @@ field will be set to the maximum audit log file size. A value of 0 indicates no limit to the size. The -.Ft af_filesz +.Ft af_currsz will be set to the current audit log file size. .It Dv A_GETCWD .\" [COMMENTED OUT]: Valid description, not yet implemented. From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:12:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9297316A416; Sat, 9 Sep 2006 10:12:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AF7516A412 for ; Sat, 9 Sep 2006 10:12:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1C6A43D5A for ; Sat, 9 Sep 2006 10:12:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89AC10D026394 for ; Sat, 9 Sep 2006 10:12:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89AC1hs026391 for perforce@freebsd.org; Sat, 9 Sep 2006 10:12:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:12:01 GMT Message-Id: <200609091012.k89AC1hs026391@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 105886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=105886 Change 105886 by rwatson@rwatson_sesame on 2006/09/09 10:11:45 Improve debugging output for auditd: mention what error caused a rename failure. Remove \n's. Rename AUDIT_TRIGGER_OPEN_NEW to AUDIT_TRIGGER_ROTATE_USER, and add AUDIT_TRIGGER_ROTATE_KERNEL, to distinguish a rotate sourced from the user and from the kernel. Disable rate limiting on certain kernel-sourced triggers -- specifically rotate, because it won't be retransmitted, so if we miss it, we won't see it again and the audit trail will grow indefinitely. This is bad. Maintain rate limiting for other space-related events. Don't generate a syslog event for sigchld. It's boring. Likewise for a trigger read event, since we'll document the details of the event in a separate log message. Annotate a few bugs in how we handle mappings (we don't remove old ones if deleted), and that we need to incrementally update the kernel policy, not overwrite it, or we lose argc/argv/... flags. We need those to be stored in audit_control at some point. Fix a typo in the AUDITOFF_WARN string. Update the maximum user record size to MAXAUDITDATA from 1k. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#19 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#6 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#7 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -75,7 +75,7 @@ switch(ch) { case 'n': - trigger = AUDIT_TRIGGER_OPEN_NEW; + trigger = AUDIT_TRIGGER_ROTATE_USER; break; case 's': ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#19 $ */ #include @@ -160,8 +160,9 @@ *ptr = '.'; strcpy(ptr+1, TS); if (rename(oldname, lastfile) != 0) - syslog(LOG_ERR, "Could not rename %s to %s", - oldname, lastfile); + syslog(LOG_ERR, + "Could not rename %s to %s: %m", oldname, + lastfile); else syslog(LOG_INFO, "renamed %s to %s", oldname, lastfile); @@ -286,7 +287,7 @@ free(dirent->dirname); free(dirent); } - syslog(LOG_ERR, "Log directories exhausted\n"); + syslog(LOG_ERR, "Log directories exhausted"); return (-1); } @@ -343,7 +344,7 @@ * XXX is generated here? */ if (0 == (ret = getacmin(&minval))) { - syslog(LOG_DEBUG, "min free = %d\n", minval); + syslog(LOG_DEBUG, "min free = %d", minval); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, "could not get audit queue settings"); @@ -494,31 +495,65 @@ } /* - * Suppress duplicate messages within a 30 second interval. This should be - * enough to time to rotate log files without thrashing from soft warnings - * generated before the log is actually rotated. + * Handle the audit trigger event. + * + * We suppress (ignore) duplicated triggers in close succession in order to + * try to avoid thrashing-like behavior. However, not all triggers can be + * ignored, as triggers generally represent edge triggers, not level + * triggers, and won't be retransmitted if the condition persists. Of + * specific concern is the rotate trigger -- if one is dropped, then it will + * not be retransmitted, and the log file will grow in an unbounded fashion. */ #define DUPLICATE_INTERVAL 30 static void handle_audit_trigger(int trigger) { - static int last_trigger; + static int last_trigger, last_warning; static time_t last_time; struct dir_ent *dirent; + struct timeval ts; + struct timezone tzp; + time_t tt; /* - * Suppres duplicate messages from the kernel within the specified + * Suppress duplicate messages from the kernel within the specified * interval. */ - struct timeval ts; - struct timezone tzp; - time_t tt; - if (gettimeofday(&ts, &tzp) == 0) { tt = (time_t)ts.tv_sec; - if ((trigger == last_trigger) && - (tt < (last_time + DUPLICATE_INTERVAL))) - return; + switch (trigger) { + case AUDIT_TRIGGER_LOW_SPACE: + case AUDIT_TRIGGER_NO_SPACE: + /* + * Triggers we can suppress. Of course, we also need + * to rate limit the warnings, so apply the same + * interval limit on syslog messages. + */ + if ((trigger == last_trigger) && + (tt < (last_time + DUPLICATE_INTERVAL))) { + if (tt >= (last_warning + DUPLICATE_INTERVAL)) + syslog(LOG_INFO, + "Suppressing duplicate trigger %d", + trigger); + return; + } + last_warning = tt; + break; + + case AUDIT_TRIGGER_ROTATE_KERNEL: + case AUDIT_TRIGGER_ROTATE_USER: + case AUDIT_TRIGGER_READ_FILE: + /* + * Triggers that we cannot suppress. + */ + break; + } + + /* + * Only update last_trigger after aborting due to a duplicate + * trigger, not before, or we will never allow that trigger + * again. + */ last_trigger = trigger; last_time = tt; } @@ -528,7 +563,6 @@ */ dirent = TAILQ_FIRST(&dir_q); switch(trigger) { - case AUDIT_TRIGGER_LOW_SPACE: syslog(LOG_INFO, "Got low space trigger"); if (dirent && (dirent->softlim != 1)) { @@ -554,7 +588,8 @@ } else { /* * Continue auditing to the current file. Also - * generate an allsoft warning. + * generate an allsoft warning. + * * XXX do we want to do this ? */ audit_warn_allsoft(); @@ -577,12 +612,14 @@ audit_warn_allhard(++allhardcount); break; - case AUDIT_TRIGGER_OPEN_NEW: + case AUDIT_TRIGGER_ROTATE_KERNEL: + case AUDIT_TRIGGER_ROTATE_USER: /* * Create a new file and swap with the one being used in * kernel */ - syslog(LOG_INFO, "Got open new trigger"); + syslog(LOG_INFO, "Got open new trigger from %s", trigger == + AUDIT_TRIGGER_ROTATE_KERNEL ? "kernel" : "user"); if (swap_audit_file() == -1) syslog(LOG_ERR, "Error swapping audit file"); break; @@ -656,10 +693,8 @@ syslog(LOG_DEBUG, "%s: SIGTERM", __FUNCTION__); break; } - if (sigchlds != sigchlds_handled) { - syslog(LOG_DEBUG, "%s: SIGCHLD", __FUNCTION__); + if (sigchlds != sigchlds_handled) handle_sigchld(); - } if (sighups != sighups_handled) { syslog(LOG_DEBUG, "%s: SIGHUP", __FUNCTION__); handle_sighup(); @@ -670,7 +705,6 @@ syslog(LOG_ERR, "%s: read EOF", __FUNCTION__); return (-1); } - syslog(LOG_DEBUG, "%s: read %d", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else @@ -695,6 +729,7 @@ /* * Process the audit event file, obtaining a class mapping for each * event, and send that mapping into the kernel. + * * XXX There's a risk here that the BSM library will return NULL * for an event when it can't properly map it to a class. In that * case, we will not process any events beyond the one that failed, @@ -703,10 +738,17 @@ ev.ae_name = (char *)malloc(AU_EVENT_NAME_MAX); ev.ae_desc = (char *)malloc(AU_EVENT_DESC_MAX); if ((ev.ae_name == NULL) || (ev.ae_desc == NULL)) { + if (ev.ae_name != NULL) + free(ev.ae_name); syslog(LOG_ERR, "Memory allocation error when configuring audit controls."); return (-1); } + + /* + * XXXRW: Currently we have no way to remove mappings from the kernel + * when they are removed from the file-based mappings. + */ evp = &ev; setauevent(); while ((evp = getauevent_r(evp)) != NULL) { @@ -747,6 +789,10 @@ /* * Set the audit policy flags based on passed in parameter values. + * + * XXXRW: This removes existing policy flags not related to cnt/ahlt. + * We need a way to merge configuration policy and command line + * argument policy. */ if (auditon(A_SETPOLICY, &global_flags, sizeof(global_flags))) syslog(LOG_ERR, "Failed to set audit policy."); ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#6 $ */ #ifndef _AUDITD_H_ @@ -61,7 +61,7 @@ #define HARDLIM_ALL_WARN "allhard" #define SOFTLIM_ALL_WARN "allsoft" -#define AUDITOFF_WARN "aditoff" +#define AUDITOFF_WARN "auditoff" #define EBUSY_WARN "ebusy" #define GETACDIR_WARN "getacdir" #define HARDLIM_WARN "hard" ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#20 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#20 $ */ #ifndef _BSM_AUDIT_H @@ -46,12 +46,13 @@ * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_LOW_SPACE 1 /* Below low watermark. */ +#define AUDIT_TRIGGER_ROTATE_KERNEL 2 /* Kernel requests rotate. */ +#define AUDIT_TRIGGER_READ_FILE 3 /* Re-read config file. */ +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ +#define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ +#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests roate. */ +#define AUDIT_TRIGGER_MAX 6 /* * Special file that will be read for trigger events from the kernel @@ -164,12 +165,12 @@ #define AUDIT_PERZONE 0x2000 /* - * Audit queue control parameters. + * Default audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 #define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 +#define AQ_BUFSZ MAXAUDITDATA #define AQ_MAXBUFSZ 1048576 /* From owner-p4-projects@FreeBSD.ORG Sat Sep 9 10:26:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62E3B16A47C; Sat, 9 Sep 2006 10:26:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10F4016A417 for ; Sat, 9 Sep 2006 10:26:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B246543D49 for ; Sat, 9 Sep 2006 10:26:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89AQKmX027214 for ; Sat, 9 Sep 2006 10:26:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89AQK0s027211 for perforce@freebsd.org; Sat, 9 Sep 2006 10:26:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 10:26:20 GMT Message-Id: <200609091026.k89AQK0s027211@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 105888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 10:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=105888 Change 105888 by rwatson@rwatson_sesame on 2006/09/09 10:25:42 Add AUE_SYSCTL_WRITE event to represent a write to a sysctl. This is slightly different than the Darwin admin/non-admin split, but likewise will allow us to categorize AUE_SYSCTL as an other event rather than an admin event, reducing its occurrence in trails for simple things like querying address space layout, etc, which otherwise litter trails of admin events. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#42 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#42 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#42 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -469,6 +469,7 @@ #define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ #define AUE_KENV 43114 /* FreeBSD. */ #define AUE_JAIL_ATTACH 43115 /* FreeBSD. */ +#define AUE_SYSCTL_WRITE 43116 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#13 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#14 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -322,7 +322,7 @@ 43018:AUE_FSTAT:fstat(2):fa 43019:AUE_FPATHCONF:fpathconf(2):fa 43020:AUE_GETDIRENTRIES:getdirentries(2):fr -43021:AUE_SYSCTL:sysctl(3):ad +43021:AUE_SYSCTL:sysctl(3):ot 43022:AUE_MLOCK:mlock(2):pc 43023:AUE_MUNLOCK:munlock(2):pc 43024:AUE_UNDELETE:undelete(2):fm @@ -417,6 +417,7 @@ 43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm 43114:AUE_KENV:kenv(8):ad 43115:AUE_JAIL_ATTACH:jail_attach(2):ad +43116:AUE_SYSCTL_WRITE:sysctl(3):ad # # User space system events. # From owner-p4-projects@FreeBSD.ORG Sat Sep 9 13:47:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 529FC16A4E5; Sat, 9 Sep 2006 13:47:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1118A16A492 for ; Sat, 9 Sep 2006 13:47:06 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ED19440C9 for ; Sat, 9 Sep 2006 13:09:48 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89D9laU047340 for ; Sat, 9 Sep 2006 13:09:47 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89D9lxW047337 for perforce@freebsd.org; Sat, 9 Sep 2006 13:09:47 GMT (envelope-from trhodes@freebsd.org) Date: Sat, 9 Sep 2006 13:09:47 GMT Message-Id: <200609091309.k89D9lxW047337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 105892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 13:47:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=105892 Change 105892 by trhodes@trhodes_local on 2006/09/09 13:08:48 Return const previously removed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#10 (text+ko) ==== @@ -2780,7 +2780,8 @@ 1 /* # of configurations */ }; -static usb_device_qualifier_t ehci_odevd = +static const +usb_device_qualifier_t ehci_odevd = { sizeof(usb_device_qualifier_t), UDESC_DEVICE_QUALIFIER, /* type */ @@ -2793,7 +2794,8 @@ 0 }; -static usb_config_descriptor_t ehci_confd = +static const +usb_config_descriptor_t ehci_confd = { sizeof(usb_config_descriptor_t), UDESC_CONFIG, @@ -2807,7 +2809,8 @@ 0 /* max power */ }; -static usb_interface_descriptor_t ehci_ifcd = +static const +usb_interface_descriptor_t ehci_ifcd = { sizeof(usb_interface_descriptor_t), UDESC_INTERFACE, @@ -2820,7 +2823,8 @@ 0 }; -static usb_endpoint_descriptor_t ehci_endpd = +static const +usb_endpoint_descriptor_t ehci_endpd = { sizeof(usb_endpoint_descriptor_t), UDESC_ENDPOINT, @@ -2830,7 +2834,8 @@ 255 }; -static usb_hub_descriptor_t ehci_hubd = +static const +usb_hub_descriptor_t ehci_hubd = { 0, /* dynamic length */ UDESC_HUB, From owner-p4-projects@FreeBSD.ORG Sat Sep 9 17:08:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0141816A4E8; Sat, 9 Sep 2006 17:08:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5E1716A4D0 for ; Sat, 9 Sep 2006 17:08:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D8A943D62 for ; Sat, 9 Sep 2006 17:08:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89H8mVi077817 for ; Sat, 9 Sep 2006 17:08:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89H8ksb077814 for perforce@freebsd.org; Sat, 9 Sep 2006 17:08:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 17:08:46 GMT Message-Id: <200609091708.k89H8ksb077814@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 105899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 17:08:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=105899 Change 105899 by rwatson@rwatson_sesame on 2006/09/09 17:08:22 An initial cut at a priv(9) man page. Much to be done here still, but a start. Affected files ... .. //depot/projects/trustedbsd/priv/share/man/man9/priv.9#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 9 17:17:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67A0216A417; Sat, 9 Sep 2006 17:17:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D94716A412 for ; Sat, 9 Sep 2006 17:17:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE02B43D53 for ; Sat, 9 Sep 2006 17:17:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89HH4YJ078266 for ; Sat, 9 Sep 2006 17:17:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89HGxWT078259 for perforce@freebsd.org; Sat, 9 Sep 2006 17:16:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 17:16:59 GMT Message-Id: <200609091716.k89HGxWT078259@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 105901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 17:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=105901 Change 105901 by rwatson@rwatson_zoo on 2006/09/09 17:16:10 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - bind9 update. - libpcap, tcpdump updates. - bthidd - libthr umutex - TSO - DDB show vnode - More bug fixes, driver tweaks, etc, etc, etc. TrustedBSD-related: - Audit of sysarch operation on i386. - suser tweaks for kern_ktr.c. - audit style cleanups - AUE_GETCWD in audit_bsm.c Affected files ... .. //depot/projects/trustedbsd/base/Makefile#46 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#78 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#13 integrate .. //depot/projects/trustedbsd/base/UPDATING#71 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/ethertype.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-stdinc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ethertype.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/icmp6.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ppp.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ap1394.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ascii.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cip.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipfc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipx.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lane.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pflog.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-token.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#59 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#37 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#42 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bthidd#1 branch .. //depot/projects/trustedbsd/base/include/Makefile#54 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#21 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/alloca.S#5 delete .. //depot/projects/trustedbsd/base/lib/libc/stdlib/alloca.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#32 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_atfork.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrier.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cond.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_list.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#24 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sem.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setprio.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spinlock.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pw_util.c#10 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#33 integrate .. //depot/projects/trustedbsd/base/release/Makefile#78 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#110 integrate .. //depot/projects/trustedbsd/base/release/scripts/kernels-install.sh#4 integrate .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/geom_nop.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/gnop.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#41 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#31 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#24 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#27 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iic.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/le.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#42 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#21 integrate .. //depot/projects/trustedbsd/base/share/man/man7/security.7#18 integrate .. //depot/projects/trustedbsd/base/share/man/man9/printf.9#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#28 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/pxeldr/pxeldr.S#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#32 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#59 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#57 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ic/nec765.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iic.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/hid.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdce.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cue.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_kue.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udavreg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/kue_fw.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcivar.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubsa.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubser.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uftdi.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhcivar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umct.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_ethersubr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi_util.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi_util.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.h#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/nop/g_nop.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/nop/g_nop.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#63 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#80 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#81 integrate .. //depot/projects/trustedbsd/base/sys/modules/agp/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#48 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#27 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#40 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#48 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#65 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#52 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_forward.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#29 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#48 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#59 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.holiday#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/cu.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truncate/truncate.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthid_config.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/bthidd.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/client.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/hid.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/kbd.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/kbd.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/lexer.l#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/parser.y#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/server.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/session.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/lcp.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#24 integrate .. //depot/projects/trustedbsd/base/usr.sbin/tcpdump/tcpdump/Makefile#12 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#46 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ +# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ # # The user-driven targets are: # @@ -58,8 +58,8 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can -# cross build world for other architectures using the buildworld target, +# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can +# cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. # @@ -266,36 +266,32 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in i386 i386:pc98 sparc64 ia64 amd64 -.for arch in ${target:C/:.*$//} -.for mach in ${target:C/^.*://} -KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \ +.for target in amd64 i386 ia64 pc98 sparc64 +KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} -universe: universe_${mach} -.ORDER: universe_prologue universe_${mach} universe_epilogue -universe_${mach}: - @echo ">> ${mach} started on `LC_ALL=C date`" +universe: universe_${target} +.ORDER: universe_prologue universe_${target} universe_epilogue +universe_${target}: + @echo ">> ${target} started on `LC_ALL=C date`" -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ __MAKE_CONF=/dev/null \ - > _.${mach}.buildworld 2>&1 - @echo ">> ${mach} buildworld completed on `LC_ALL=C date`" -.if exists(${.CURDIR}/sys/${mach}/conf/NOTES) - -cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \ - > ${.CURDIR}/_.${mach}.makeLINT 2>&1 + > _.${target}.buildworld 2>&1 + @echo ">> ${target} buildworld completed on `LC_ALL=C date`" +.if exists(${.CURDIR}/sys/${target}/conf/NOTES) + -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \ + > ${.CURDIR}/_.${target}.makeLINT 2>&1 .endif .for kernel in ${KERNCONFS} -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ - TARGET_ARCH=${arch} TARGET=${mach} \ + TARGET=${target} \ KERNCONF=${kernel} \ __MAKE_CONF=/dev/null \ - > _.${mach}.${kernel} 2>&1 + > _.${target}.${kernel} 2>&1 .endfor - @echo ">> ${mach} completed on `LC_ALL=C date`" -.endfor -.endfor + @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe: universe_epilogue universe_epilogue: ==== //depot/projects/trustedbsd/base/Makefile.inc1#78 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -11,7 +11,7 @@ # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list -# TARGET_ARCH="arch" to crossbuild world to a different arch +# TARGET="machine" to crossbuild world for a different machine type # # The intended user-driven targets are: @@ -95,14 +95,36 @@ OSRELDATE= 0 .endif .endif + +# Guess machine architecture from machine type, and vice versa. +.if !defined(TARGET_ARCH) && defined(TARGET) +TARGET_ARCH= ${TARGET:S/pc98/i386/} +.elif !defined(TARGET) && defined(TARGET_ARCH) && \ + ${TARGET_ARCH} != ${MACHINE_ARCH} +TARGET= ${TARGET_ARCH} +.endif +# Otherwise, default to current machine type and architecture. +TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == ${MACHINE_ARCH} -TARGET?= ${MACHINE} + +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +.if ${TARGET} == ${TARGET_ARCH} +_t= ${TARGET} +.else +_t= ${TARGET_ARCH}/${TARGET} +.endif +.for _t in ${_t} +.if empty(KNOWN_ARCHES:M${_t}) +.error Unknown target ${TARGET_ARCH}:${TARGET}. +.endif +.endfor + +.if ${TARGET} == ${MACHINE} TARGET_CPUTYPE?=${CPUTYPE} .else -TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif + .if !empty(TARGET_CPUTYPE) _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else @@ -185,11 +207,13 @@ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage @@ -465,9 +489,19 @@ WMAKE_TGTS+= build32 .endif -buildworld: ${WMAKE_TGTS} -.ORDER: ${WMAKE_TGTS} +buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue +.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue + +buildworld_prologue: + @echo "--------------------------------------------------------------" + @echo ">>> World build started on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" +buildworld_epilogue: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> World build completed on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" # # We need to have this as a target because the indirection between Makefile ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.50 2006/09/05 01:17:51 matusita Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -97,6 +97,10 @@ OLD_FILES+=etc/rc.d/ppp-user # 20051012: setkey(8) moved to /sbin/ OLD_FILES+=usr/sbin/setkey +# 20050930: pccardd(8) removed +OLD_FILES+=usr/sbin/pccardd +OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz +OLD_FILES+=usr/share/man/man8/pccardd.8.gz # 20050927: bridge(4) replaced by if_bridge(4) OLD_FILES+=usr/include/net/bridge.h # 20050831: not implemented ==== //depot/projects/trustedbsd/base/UPDATING#71 (text+ko) ==== @@ -21,6 +21,9 @@ developers choose to disable these features on build machines to maximize performance. +20060903: + libpcap updated to v0.9.4 and tcpdump to v3.9.4 + 20060816: The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour for IP_FIREWALL_FORWARD is now as it was before when it was first @@ -610,4 +613,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.454 2006/09/02 22:17:15 marius Exp $ +$FreeBSD: src/UPDATING,v 1.455 2006/09/04 21:49:31 sam Exp $ ==== //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,4 +1,11 @@ + --- 9.3.2-P1 released --- + +2066. [security] Handle SIG queries gracefully. [RT #16300] + +1941. [bug] ncache_adderesult() should set eresult even if no + rdataset is passed to it. [RT #15642] + --- 9.3.2 released --- --- 9.3.2rc1 released --- ==== //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ #include @@ -2393,7 +2393,7 @@ is_zone = ISC_FALSE; qtype = event->qtype; - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; @@ -2434,7 +2434,7 @@ /* * If it's a SIG query, we'll iterate the node. */ - if (qtype == dns_rdatatype_rrsig) + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) type = dns_rdatatype_any; else type = qtype; ==== //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#5 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ #include @@ -762,7 +762,8 @@ INSIST(result != ISC_R_SUCCESS || dns_rdataset_isassociated(event->rdataset) || fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event)); } @@ -3188,7 +3189,8 @@ if (hevent != NULL) { if (!negative && !chaining && (fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig)) { + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig)) { /* * Don't bind rdatasets; the caller * will iterate the node. @@ -3306,7 +3308,8 @@ if (!ISC_LIST_EMPTY(fctx->validators)) { INSIST(!negative); INSIST(fctx->type == dns_rdatatype_any || - fctx->type == dns_rdatatype_rrsig); + fctx->type == dns_rdatatype_rrsig || + fctx->type == dns_rdatatype_sig); /* * Don't send a response yet - we have * more rdatasets that still need to @@ -3455,14 +3458,15 @@ return (result); anodep = &event->node; /* - * If this is an ANY or SIG query, we're not going - * to return any rdatasets, unless we encountered + * If this is an ANY, SIG or RRSIG query, we're not + * going to return any rdatasets, unless we encountered * a CNAME or DNAME as "the answer". In this case, * we're going to return DNS_R_CNAME or DNS_R_DNAME * and we must set up the rdatasets. */ if ((fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) || + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) || (name->attributes & DNS_NAMEATTR_CHAINING) != 0) { ardataset = event->rdataset; asigrdataset = event->sigrdataset; @@ -3521,7 +3525,7 @@ */ if (secure_domain && rdataset->trust != dns_trust_glue) { /* - * SIGs are validated as part of validating the + * RRSIGs are validated as part of validating the * type they cover. */ if (rdataset->type == dns_rdatatype_rrsig) @@ -3591,7 +3595,8 @@ if (ANSWER(rdataset) && need_validation) { if (fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_rrsig) { + fctx->type != dns_rdatatype_rrsig && + fctx->type != dns_rdatatype_sig) { /* * This is The Answer. We will * validate it, but first we cache @@ -3763,23 +3768,28 @@ isc_result_t *eresultp) { isc_result_t result; + dns_rdataset_t rdataset; + + if (ardataset == NULL) { + dns_rdataset_init(&rdataset); + ardataset = &rdataset; + } result = dns_ncache_add(message, cache, node, covers, now, maxttl, ardataset); - if (result == DNS_R_UNCHANGED) { + if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) { /* - * The data in the cache are better than the negative cache - * entry we're trying to add. + * If the cache now contains a negative entry and we + * care about whether it is DNS_R_NCACHENXDOMAIN or + * DNS_R_NCACHENXRRSET then extract it. */ - if (ardataset != NULL && ardataset->type == 0) { + if (ardataset->type == 0) { /* - * The cache data is also a negative cache - * entry. + * The cache data is a negative cache entry. */ if (NXDOMAIN(ardataset)) *eresultp = DNS_R_NCACHENXDOMAIN; else *eresultp = DNS_R_NCACHENXRRSET; - result = ISC_R_SUCCESS; } else { /* * Either we don't care about the nature of the @@ -3791,14 +3801,11 @@ * XXXRTH There's a CNAME/DNAME problem here. */ *eresultp = ISC_R_SUCCESS; - result = ISC_R_SUCCESS; } - } else if (result == ISC_R_SUCCESS) { - if (NXDOMAIN(ardataset)) - *eresultp = DNS_R_NCACHENXDOMAIN; - else - *eresultp = DNS_R_NCACHENXRRSET; + result = ISC_R_SUCCESS; } + if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset)) + dns_rdataset_disassociate(ardataset); return (result); } ==== //depot/projects/trustedbsd/base/contrib/bind9/version#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.17.2.21 2005/12/14 00:43:14 marka Exp $ +# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=3 PATCHVER=2 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 ==== //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#7 (text+ko) ==== @@ -1,6 +1,17 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.1 2005/07/05 21:04:27 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL) + +Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release + + Support for radiotap on Linux (Mike Kershaw) + Fixes for HP-UX + Support for additional Juniper link-layer types + Fixes for filters on MPLS-encapsulated packets + "vlan" filter fixed + "pppoed" and "pppoes" filters added; the latter modifies later + parts of the filter expression to look at the PPP headers and + headers in the PPP payload -Tue. July 5, 2005. ken@xelerance.com. Summary for 3.9.x tcpdump +Tue. July 5, 2005. ken@xelerance.com. Summary for 0.9.3 libpcap release Fixes for compiling on nearly every platform, including improved 64bit support @@ -9,16 +20,12 @@ OpenBSD pf format support IrDA capture (Linux only) -Tue. May 27, 2005. mcr@sandelman.ottawa.on.ca. Summary for 0.9.1 release - - Numerous fixes for - Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release Fixed minor problem in gencode.c that would appear on 64-bit platforms. Version number is now sane. - + Mon. March 29, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.2 release updates for autoconf 2.5 @@ -31,13 +38,13 @@ Win32 patches from NetGroup, Politecnico di Torino (Italy) OpenBSD pf, DLT_PFLOG added Many changes to ATM support. - lookup pcap_lookupnet() + lookup pcap_lookupnet() Added DLT_ARCNET_LINUX, DLT_ENC, DLT_IEEE802_11_RADIO, DLT_SUNATM, DLT_IP_OVER_FC, DLT_FRELAY, others. Sigh. More AIX wonderfulness. - Document updates. + Document updates. Changes to API: pcap_next_ex(), pcap_breakloop(), pcap_dump_flush(), - pcap_list_datalinks(), pcap_set_datalink(), + pcap_list_datalinks(), pcap_set_datalink(), pcap_lib_version(), pcap_datalink_val_to_name(), pcap_datalink_name_to_val(), new error returns. @@ -58,7 +65,7 @@ Added pcap_findalldevs() call to get list of interfaces in a MI way. - pcap_stats() has been documented as to what its counters mean on + pcap_stats() has been documented as to what its counters mean on each platform. Tuesday January 9, 2001. guy@alum.mit.edu. Summary for 0.6 release @@ -131,7 +138,7 @@ - Added a new "pcap_compile_nopcap()", which lets you compile a filter expression into a BPF program without having an open live capture or capture file. - + v0.4 Sat Jul 25 12:40:09 PDT 1998 - Fix endian problem with DLT_NULL devices. From FreeBSD via Bill ==== //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#7 (text+ko) ==== @@ -63,6 +63,7 @@ Mark Pizzolato Martin Husemann Matthew Luckie + Mike Kershaw Mike Wiacek Monroe Williams Nicolas Dade ==== //depot/projects/trustedbsd/base/contrib/libpcap/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.5 2002/02/08 19:45:58 obrien Exp $ +$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6 2006/09/04 19:54:49 sam Exp $ This directory contains virgin copies of the original distribution files on a "vendor" branch. Do not, under any circumstances, attempt to upgrade @@ -9,28 +9,27 @@ [Do not make ANY changes to the files.] 2. Use the command: - cvs import -m 'Virgin import of LBL libpcap v' \ - -I SUNOS4 -I linux-include \ - src/contrib/libpcap LBL v + cvs import -m 'Import of libpcap v' \ + -I SUNOS4 -I msdos -I Win32 -I missing \ + -I ChmodBPF -I linux-include \ + src/contrib/libpcap TCPDUMP_ORG v - For example, to do the import of version 0.2.1, I typed: - cvs import -m 'Virgin import of LBL libpcap v0.2.1' \ - -I SUNOS4 -I linux-include \ - src/contrib/libpcap LBL v0_2_1 + For example, to do the import of version 0.9.4, I typed: + cvs import -m 'Import of libpcap v0.9.4 \ + -I SUNOS4 -I msdos -I Win32 -I missing \ + -I ChmodBPF -I linux-include \ + src/contrib/libpcap TCPDUMP_ORG v0_9_4 3. Follow the instructions printed out in step 2 to resolve any conflicts between local FreeBSD changes and the newer version. + 4. Bump __FreeBSD_version in sys/param.h as appropriate - 4. Update the shared library version number in - src/lib/libpcap/Makefile as described in the - handbook section 18. - Do not, under any circumstances, deviate from this procedure. To make local changes to libpcap, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the LBL branch. +branch (aka HEAD). Never make local changes on the TCPDUMP_ORG branch. All local changes should be submitted to "tcpdump-workers@tcpdump.org" for inclusion in the next vendor release of tcpdump and libpcap. -pst@freebsd.org - 19 Aug 1996 +sam@freebsd.org - 4 September 2006 ==== //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#3 (text+ko) ==== @@ -37,12 +37,57 @@ ---------------------------------------------------------------------- +Libpcap when built for DAG cards against dag-2.5.1 or later releases: + +Timeouts are supported. pcap_dispatch() will return after to_ms milliseconds +regardless of how many packets are received. If to_ms is zero pcap_dispatch() +will block waiting for data indefinitely. + +pcap_dispatch() will block on and process a minimum of 64kB of data (before +filtering) for efficiency. This can introduce high latencies on quiet +interfaces unless a timeout value is set. The timeout expiring will override +the 64kB minimum causing pcap_dispatch() to process any available data and +return. + +pcap_setnonblock is supported. When nonblock is set, pcap_dispatch() will +check once for available data, process any data available up to count, then +return immediately. + +pcap_findalldevs() is supported, e.g. dag0, dag1... + +Some DAG cards can provide more than one 'stream' of received data. +This can be data from different physical ports, or separated by filtering +or load balancing mechanisms. Receive streams have even numbers, e.g. +dag0:0, dag0:2 etc. Specifying transmit streams for capture is not supported. + +pcap_setfilter() is supported, BPF programs run in userspace. + +pcap_setdirection() is not supported. Only received traffic is captured. +DAG cards normally do not have IP or link layer addresses assigned as +they are used to passively monitor links. + +pcap_breakloop() is supported. + +pcap_datalink() and pcap_list_datalinks() are supported. The DAG card does +not attempt to set the correct datalink type automatically where more than +one type is possible. + +pcap_stats() is supported. ps_drop is the number of packets dropped due to +RX stream buffer overflow, this count is before filters are applied (it will +include packets that would have been dropped by the filter). The RX stream +buffer size is user configurable outside libpcap, typically 16-512MB. + +pcap_get_selectable_fd() is not supported, DAG cards do not support +poll/select methods. + +pcap_inject() and pcap_sendpacket() are not supported. + +---------------------------------------------------------------------- + Please submit bug reports via . -Please also visit our Web pages at: +Please also visit our Web site at: http://www.endace.com/ - http://dag.cs.waikato.ac.nz/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 9 17:24:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BF9616A519; Sat, 9 Sep 2006 17:24:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4BD016A500 for ; Sat, 9 Sep 2006 17:24:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA6BE43D49 for ; Sat, 9 Sep 2006 17:24:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89HOGpT081102 for ; Sat, 9 Sep 2006 17:24:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89HODBg081099 for perforce@freebsd.org; Sat, 9 Sep 2006 17:24:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Sep 2006 17:24:13 GMT Message-Id: <200609091724.k89HODBg081099@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 105902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 17:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=105902 Change 105902 by rwatson@rwatson_zoo on 2006/09/09 17:23:46 Integrate TrustedBSD priv branch from TrustedBSD base branch. For a detailed list of changes in this merge, see @105901. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/hid.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/kue_fw.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umass.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umct.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ums.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/urio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/agp/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/bpf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/priv/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.26 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.28 2006/09/06 22:05:34 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,6 +613,18 @@ /* Send EOI first thing. */ lapic_eoi(); +#ifdef SMP + /* + * Don't do any accounting for the disabled HTT cores, since it + * will provide misleading numbers for the userland. + * + * No locking is necessary here, since even if we loose the race + * when hlt_cpus_mask changes it is not a big deal, really. + */ + if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) + return; +#endif + /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -160,8 +160,10 @@ long Maxmem = 0; long realmem = 0; -vm_paddr_t phys_avail[20]; -vm_paddr_t dump_avail[20]; +#define PHYSMAP_SIZE (2 * 30) + +vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; +vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2) @@ -832,8 +834,6 @@ } #endif -#define PHYSMAP_SIZE (2 * 20) - u_int basemem; /* ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.23 2006/08/17 21:06:48 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.24 2006/09/09 16:25:25 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -124,7 +124,7 @@ static void linux32_fixlimits(struct proc *p); extern LIST_HEAD(futex_list, futex) futex_list; -extern struct mtx futex_mtx; +extern struct sx futex_sx; static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; @@ -1080,7 +1080,7 @@ sx_init(&emul_lock, "emuldata lock"); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); - mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, NULL, 1000); linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, @@ -1110,7 +1110,7 @@ linux_device_unregister_handler(*ldhp); sx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); - mtx_destroy(&futex_mtx); + sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); ==== //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.3 2006/07/14 22:40:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.4 2006/09/07 21:53:28 imp Exp $"); #include #include @@ -128,20 +128,16 @@ sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); - WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); - /* probe and attach the iicbus */ bus_generic_attach(dev); - out:; if (err) at91_twi_deactivate(dev); @@ -228,12 +224,15 @@ } static int -at91_twi_wait_stop_done(struct at91_twi_softc *sc) +at91_twi_wait(struct at91_twi_softc *sc, uint32_t bit) { int err = 0; + int counter = 10000; - while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + while (!(RD4(sc, TWI_SR) & bit) && counter-- != 0) continue; + if (counter == 0) + err = EIO; return (err); } @@ -252,7 +251,7 @@ sc = device_get_softc(dev); if (sc->sc_started) { WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); } return (err); } @@ -345,7 +344,7 @@ if (!last) goto errout; WR4(sc, TWI_CR, TWI_CR_STOP); - err = at91_twi_wait_stop_done(sc); + err = at91_twi_wait(sc, TWI_SR_TXCOMP); *walker = RD4(sc, TWI_RHR) & 0xff; if (read) *read = walker - buf; @@ -419,6 +418,53 @@ return (error); } +static int +at91_twi_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) +{ + struct at91_twi_softc *sc; + int i, len; + uint32_t rdwr; + uint8_t *buf; + + sc = device_get_softc(dev); + for (i = 0; i < nmsgs; i++) { + /* + * The linux atmel driver doesn't use the internal device + * address feature of twi. A separate i2c message needs to + * be written to use this. + * See http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html + * for details. + */ + rdwr = (msgs[i].flags & IIC_M_RD) ? TWI_MMR_MREAD : 0; + WR4(sc, TWI_MMR, TWI_MMR_DADR(msgs[i].slave) | rdwr); + len = msgs[i].len; + buf = msgs[i].buf; + if (len != 0 || buf == NULL) + return EINVAL; + WR4(sc, TWI_CR, TWI_CR_START); + if (msgs[i].flags & IIC_M_RD) { + while (len--) { + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_RXRDY)) + return EIO; + *buf++ = RD4(sc, TWI_RHR) & 0xff; + } + } else { + while (len--) { + WR4(sc, TWI_THR, *buf++); + if (len == 0) + WR4(sc, TWI_CR, TWI_CR_STOP); + if (!at91_twi_wait(sc, TWI_SR_TXRDY)) + return EIO; + } + } + if (!at91_twi_wait(sc, TWI_SR_TXCOMP)) + return EIO; + } + return 0; +} + static device_method_t at91_twi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_twi_probe), @@ -433,6 +479,7 @@ DEVMETHOD(iicbus_write, at91_twi_write), DEVMETHOD(iicbus_read, at91_twi_read), DEVMETHOD(iicbus_reset, at91_twi_rst_card), + DEVMETHOD(iicbus_transfer, at91_twi_transfer), { 0, 0 } }; ==== //depot/projects/trustedbsd/priv/sys/arm/at91/if_atereg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.2 2006/09/07 21:50:01 imp Exp $ */ #ifndef ARM_AT91_IF_ATEREG_H #define ARM_AT91_IF_ATEREG_H @@ -52,15 +52,15 @@ #define ETH_DTE 0x58 /* Deferred Transmittion Frame Reg */ #define ETH_LCOL 0x5c /* Late Collision Register */ #define ETH_ECOL 0x60 /* Excessive Collision Register */ -#define ETH_CSE 0x64 /* Carrier Sense Error Register */ -#define ETH_TUE 0x68 /* Transmit Underrun Error Register */ -#define ETH_CDE 0x6c /* Code Error Register */ -#define ETH_ELR 0x70 /* Excessive Length Error Register */ -#define ETH_RJB 0x74 /* Receive Jabber Register */ -#define ETH_USF 0x78 /* Undersize Frame Register */ -#define ETH_SQEE 0x7c /* SQE Test Error Register */ -#define ETH_DRFC 0x80 /* Discarded RX Frame Register */ - /* 0x84 reserved */ +#define ETH_TUE 0x64 /* Transmit Underrun Error Register */ +#define ETH_CSE 0x68 /* Carrier Sense Error Register */ +#define ETH_DRFC 0x6c /* Discarded RX Frame Register */ +#define ETH_ROV 0x68 /* Receive Overrun Register */ +#define ETH_CDE 0x64 /* Code Error Register */ +#define ETH_ELR 0x78 /* Excessive Length Error Register */ +#define ETH_RJB 0x7c /* Receive Jabber Register */ +#define ETH_USF 0x80 /* Undersize Frame Register */ +#define ETH_SQEE 0x84 /* SQE Test Error Register */ /* 0x88 reserved */ /* 0x8c reserved */ #define ETH_HSH 0x90 /* EMAC Hash Address High [63:32] */ ==== //depot/projects/trustedbsd/priv/sys/boot/i386/pxeldr/pxeldr.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.14 2006/04/11 20:53:49 sobomax Exp $ + * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.15 2006/09/05 19:28:03 ru Exp $ */ /* @@ -25,6 +25,8 @@ * separate PXE-aware client just to load the loader. */ +#include + /* * Memory locations. */ @@ -53,10 +55,6 @@ .set KARGS_FLAGS_PXE,0x2 # flag to indicate booting from # PXE loader /* - * Boot howto bits - */ - .set RB_SERIAL,0x1000 # serial console -/* * Segment selectors. */ .set SEL_SDATA,0x8 # Supervisor data @@ -119,11 +117,11 @@ #ifdef PROBE_KEYBOARD /* * Look at the BIOS data area to see if we have an enhanced keyboard. If not, - * set the RBX_SERIAL bit in the howto byte. + * set the RBX_DUAL and RBX_SERIAL bits in the howto byte. */ testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present? jnz keyb # yes, so skip - orl $RB_SERIAL, (%bx) # enable serial console + orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console keyb: #endif /* ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.60 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.61 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.58 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.59 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ @@ -310,5 +310,10 @@ #define FREEBSD32_SYS_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 #define FREEBSD32_SYS_kldunloadf 444 +#define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 +#define FREEBSD32_SYS_thr_set_name 464 +#define FREEBSD32_SYS_thr_setscheduler 466 +#define FREEBSD32_SYS_thr_getscheduler 467 +#define FREEBSD32_SYS_thr_setschedparam 468 #define FREEBSD32_SYS_MAXSYSCALL 471 ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.49 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.50 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ @@ -463,7 +463,7 @@ "#453", /* 453 = auditctl */ "#454", /* 454 = _umtx_op */ "#455", /* 455 = thr_new */ - "#456", /* 456 = sigqueue */ + "sigqueue", /* 456 = sigqueue */ "#457", /* 457 = kmq_open */ "#458", /* 458 = kmq_setattr */ "#459", /* 459 = kmq_timedreceive */ @@ -471,11 +471,11 @@ "#461", /* 461 = kmq_notify */ "#462", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ - "#464", /* 464 = thr_set_name */ + "thr_set_name", /* 464 = thr_set_name */ "#465", /* 465 = aio_fsync */ - "#466", /* 466 = thr_setscheduler */ - "#467", /* 467 = thr_getscheduler */ - "#468", /* 468 = thr_setschedparam */ + "thr_setscheduler", /* 466 = thr_setscheduler */ + "thr_getscheduler", /* 467 = thr_getscheduler */ + "thr_setschedparam", /* 468 = thr_setschedparam */ "#469", /* 469 = __getpath_fromfd */ "#470", /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.59 2006/09/03 16:24:36 rwatson Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.60 2006/09/09 01:22:13 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp */ @@ -488,7 +488,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 453 = auditctl */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ + { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 459 = kmq_timedreceive */ @@ -496,11 +496,11 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 461 = kmq_notify */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ + { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ + { AS(thr_setscheduler_args), (sy_call_t *)thr_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */ + { AS(thr_getscheduler_args), (sy_call_t *)thr_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */ + { AS(thr_setschedparam_args), (sy_call_t *)thr_setschedparam, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ }; ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.74 2006/09/09 01:22:13 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -743,7 +743,8 @@ 453 AUE_AUDITCTL UNIMPL auditctl 454 AUE_NULL UNIMPL _umtx_op 455 AUE_NULL UNIMPL thr_new -456 AUE_NULL UNIMPL sigqueue +456 AUE_NULL NOPROTO { int sigqueue(pid_t pid, int signum, \ + void *value); } 457 AUE_NULL UNIMPL kmq_open 458 AUE_NULL UNIMPL kmq_setattr 459 AUE_NULL UNIMPL kmq_timedreceive @@ -751,10 +752,16 @@ 461 AUE_NULL UNIMPL kmq_notify 462 AUE_NULL UNIMPL kmq_unlink 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } -464 AUE_NULL UNIMPL thr_set_name +464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } 465 AUE_NULL UNIMPL aio_fsync -466 AUE_NULL UNIMPL thr_setscheduler -467 AUE_NULL UNIMPL thr_getscheduler -468 AUE_NULL UNIMPL thr_setschedparam +466 AUE_NULL NOPROTO { int thr_setscheduler(long id, int policy,\ + const struct sched_param *param, \ + int param_size); } +467 AUE_NULL NOPROTO { int thr_getscheduler(long id, int *policy,\ + struct sched_param *param, \ + int param_size); } +468 AUE_NULL NOPROTO { int thr_setschedparam(long id, \ + const struct sched_param *param, \ + int param_size); } 469 AUE_NULL UNIMPL __getpath_fromfd 470 AUE_NULL UNIMPL __getpath_fromaddr ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_futex.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.4 2006/08/26 10:36:16 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.6 2006/09/09 16:25:25 netchild Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $"); #endif @@ -47,6 +47,7 @@ #include #include #include +#include #include #ifdef COMPAT_LINUX32 @@ -73,10 +74,10 @@ }; LIST_HEAD(futex_list, futex) futex_list; -struct mtx futex_mtx; /* this protects the LIST of futexes */ +struct sx futex_sx; /* this protects the LIST of futexes */ -#define FUTEX_LOCK mtx_lock(&futex_mtx) -#define FUTEX_UNLOCK mtx_unlock(&futex_mtx) +#define FUTEX_LOCK sx_xlock(&futex_sx) +#define FUTEX_UNLOCK sx_xunlock(&futex_sx) #define FUTEX_LOCKED 1 #define FUTEX_UNLOCKED 0 @@ -302,9 +303,6 @@ ret = futex_wake(f, args->val, NULL); futex_put(f); if (op_ret > 0) { -#ifdef DEBUG - printf("second wakeup\n"); -#endif op_ret = 0; /* * Linux uses the address of the timespec parameter @@ -346,16 +344,11 @@ return f; } } - if (locked == FUTEX_UNLOCKED) - FUTEX_UNLOCK; - /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); f->f_uaddr = uaddr; f->f_refcount = 1; TAILQ_INIT(&f->f_waiting_proc); - if (locked == FUTEX_UNLOCKED) - FUTEX_LOCK; LIST_INSERT_HEAD(&futex_list, f, f_list); if (locked == FUTEX_UNLOCKED) FUTEX_UNLOCK; @@ -421,13 +414,13 @@ FUTEX_LOCK; TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) { if (count <= n) { - wakeup(wp); + wakeup_one(wp); count++; } else { if (newf != NULL) { /* futex_put called after tsleep */ wp->wp_new_futex = futex_get(newf->f_uaddr, FUTEX_LOCKED); - wakeup(wp); + wakeup_one(wp); } } } ==== //depot/projects/trustedbsd/priv/sys/conf/files.amd64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.92 2006/08/15 12:54:28 netchild Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.93 2006/09/05 16:55:12 anholt Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -208,6 +208,7 @@ isa/vga_isa.c optional vga kern/link_elf_obj.c standard pci/agp_amd64.c optional agp +pci/agp_i810.c optional agp pci/agp_intel.c optional agp # # IA32 binary support ==== //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf_ioctl.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.25 2006/07/21 09:48:13 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.26 2006/09/06 17:19:45 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* add: $OpenBSD: pf_ioctl.c,v 1.168 2006/07/21 01:21:17 dhartmei Exp $ */ @@ -3438,11 +3438,17 @@ struct inpcb *inp) { /* - * IPv6 does not affected ip_len/ip_off byte order changes. + * IPv6 is not affected by ip_len/ip_off byte order changes. */ int chk; - chk = pf_test6(PF_IN, ifp, m, NULL, inp); + /* + * In case of loopback traffic IPv6 uses the real interface in + * order to support scoped addresses. In order to support stateful + * filtering we have change this to lo0 as it is the case in IPv4. + */ + chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &loif[0] : ifp, m, + NULL, inp); if (chk && *m) { m_freem(*m); *m = NULL; ==== //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic7xxx_osm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.44 2005/12/04 02:12:40 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.45 2006/09/05 20:28:28 mjacob Exp $"); #include #include @@ -158,6 +158,8 @@ count = 0; sim = NULL; sim2 = NULL; + path = NULL; + path2 = NULL; /* * Create a thread to perform all recovery. ==== //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.143 2006/09/03 00:27:41 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.144 2006/09/09 03:36:57 ambrisko Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -326,6 +326,7 @@ static void bge_txeof(struct bge_softc *); static void bge_rxeof(struct bge_softc *); +static void bge_asf_driver_up (struct bge_softc *); static void bge_tick_locked(struct bge_softc *); static void bge_tick(void *); static void bge_stats_update(struct bge_softc *); @@ -376,7 +377,12 @@ static void bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); #endif -static void bge_reset(struct bge_softc *); +#define BGE_RESET_START 1 +#define BGE_RESET_STOP 2 +static void bge_sig_post_reset(struct bge_softc *, int); +static void bge_sig_legacy(struct bge_softc *, int); +static void bge_sig_pre_reset(struct bge_softc *, int); +static int bge_reset(struct bge_softc *); static void bge_link_upd(struct bge_softc *); static device_method_t bge_methods[] = { @@ -646,7 +652,6 @@ { struct bge_softc *sc; struct mii_data *mii; - sc = device_get_softc(dev); mii = device_get_softc(sc->bge_miibus); @@ -968,6 +973,84 @@ CSR_WRITE_4(sc, BGE_MAR0 + (i * 4), hashes[i]); } +static void +bge_sig_pre_reset(sc, type) + struct bge_softc *sc; + int type; +{ + /* + * Some chips don't like this so only do this if ASF is enabled + */ + if (sc->bge_asf_mode) + bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); + + if (sc->bge_asf_mode & ASF_NEW_HANDSHAKE) { + switch (type) { + case BGE_RESET_START: + bge_writemem_ind(sc, BGE_SDI_STATUS, 0x1); /* START */ + break; + case BGE_RESET_STOP: + bge_writemem_ind(sc, BGE_SDI_STATUS, 0x2); /* UNLOAD */ + break; + } + } +} + +static void +bge_sig_post_reset(sc, type) + struct bge_softc *sc; + int type; +{ + if (sc->bge_asf_mode & ASF_NEW_HANDSHAKE) { + switch (type) { + case BGE_RESET_START: + bge_writemem_ind(sc, BGE_SDI_STATUS, 0x80000001); + /* START DONE */ + break; + case BGE_RESET_STOP: + bge_writemem_ind(sc, BGE_SDI_STATUS, 0x80000002); + break; + } + } +} + +static void +bge_sig_legacy(sc, type) + struct bge_softc *sc; + int type; +{ + if (sc->bge_asf_mode) { + switch (type) { + case BGE_RESET_START: + bge_writemem_ind(sc, BGE_SDI_STATUS, 0x1); /* START */ + break; + case BGE_RESET_STOP: + bge_writemem_ind(sc, BGE_SDI_STATUS, 0x2); /* UNLOAD */ + break; + } + } +} + +void bge_stop_fw(struct bge_softc *); +void +bge_stop_fw(sc) + struct bge_softc *sc; +{ + int i; + + if (sc->bge_asf_mode) { + bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM_FW, BGE_FW_PAUSE); + CSR_WRITE_4(sc, BGE_CPU_EVENT, + CSR_READ_4(sc, BGE_CPU_EVENT) != (1 << 14)); + + for (i = 0; i < 100; i++ ) { + if (!(CSR_READ_4(sc, BGE_CPU_EVENT) & (1 << 14))) + break; + DELAY(10); + } + } +} + /* * Do endian, PCI and DMA initialization. Also check the on-board ROM * self-test results. @@ -978,7 +1061,7 @@ uint32_t dma_rw_ctl; int i; - /* Set endian type before we access any non-PCI registers. */ + /* Set endianness before we access any non-PCI registers. */ pci_write_config(sc->bge_dev, BGE_PCI_MISC_CTL, BGE_INIT, 4); /* @@ -1070,6 +1153,12 @@ BGE_MODECTL_TX_NO_PHDR_CSUM); /* + * Tell the firmware the driver is running + */ + if (sc->bge_asf_mode & ASF_STACKUP) + BGE_SETBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP); + + /* * Disable memory write invalidate. Apparently it is not supported * properly by these devices. */ @@ -1992,6 +2081,7 @@ uint32_t mac_tmp = 0; u_char eaddr[6]; int error = 0, rid; + int trys; sc = device_get_softc(dev); sc->bge_dev = dev; @@ -2059,7 +2149,38 @@ sc->bge_flags |= BGE_FLAG_PCIX; /* Try to reset the chip. */ - bge_reset(sc); + if (bge_reset(sc)) { + device_printf(sc->bge_dev, "chip reset failed\n"); + bge_release_resources(sc); + error = ENXIO; + goto fail; + } + + sc->bge_asf_mode = 0; + if (bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM_SIG) + == BGE_MAGIC_NUMBER) { + if (bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM_NICCFG) + & BGE_HWCFG_ASF) { + sc->bge_asf_mode |= ASF_ENABLE; + sc->bge_asf_mode |= ASF_STACKUP; + if (sc->bge_asicrev == BGE_ASICREV_BCM5750) { + sc->bge_asf_mode |= ASF_NEW_HANDSHAKE; + } + } + } + + /* Try to reset the chip again the nice way. */ + bge_stop_fw(sc); + bge_sig_pre_reset(sc, BGE_RESET_STOP); + if (bge_reset(sc)) { + device_printf(sc->bge_dev, "chip reset failed\n"); + bge_release_resources(sc); + error = ENXIO; + goto fail; + } + + bge_sig_legacy(sc, BGE_RESET_STOP); + bge_sig_post_reset(sc, BGE_RESET_STOP); if (bge_chipinit(sc)) { device_printf(sc->bge_dev, "chip initialization failed\n"); @@ -2186,15 +2307,36 @@ sc->bge_ifmedia.ifm_media = sc->bge_ifmedia.ifm_cur->ifm_media; } else { /* - * Do transceiver setup. + * Do transceiver setup and tell the firmware the + * driver is down so we can try to get access the + * probe if ASF is running. Retry a couple of times + * if we get a conflict with the ASF firmware accessing + * the PHY. */ + BGE_CLRBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP); +again: + bge_asf_driver_up(sc); + + trys = 0; if (mii_phy_probe(dev, &sc->bge_miibus, bge_ifmedia_upd, bge_ifmedia_sts)) { + if (trys++ < 4) { + device_printf(sc->bge_dev, "Try again\n"); + bge_miibus_writereg(sc->bge_dev, 1, MII_BMCR, BMCR_RESET); + goto again; + } + device_printf(sc->bge_dev, "MII without any PHY!\n"); bge_release_resources(sc); error = ENXIO; goto fail; } + + /* + * Now tell the firmware we are going up after probing the PHY + */ + if (sc->bge_asf_mode & ASF_STACKUP) + BGE_SETBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 9 18:13:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB5C616A412; Sat, 9 Sep 2006 18:13:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 849F916A407 for ; Sat, 9 Sep 2006 18:13:14 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EF5743D4C for ; Sat, 9 Sep 2006 18:13:14 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89IDDEQ088059 for ; Sat, 9 Sep 2006 18:13:13 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89IDDdh088043 for perforce@freebsd.org; Sat, 9 Sep 2006 18:13:13 GMT (envelope-from netchild@freebsd.org) Date: Sat, 9 Sep 2006 18:13:13 GMT Message-Id: <200609091813.k89IDDdh088043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 105903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 18:13:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=105903 Change 105903 by netchild@netchild_magellan on 2006/09/09 18:11:00 Branch for generic linuxolator improvements now that the SoC is over and more people work on this. Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/amd64/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/float.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/param.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/linuxolator/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/support.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/_types.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/asm.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/bus.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/clock.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/endian.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/exec.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/float.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/fp.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/frame.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/intr.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/limits.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/param.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/proc.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/profile.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/psl.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/pte.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/resource.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/runq.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/signal.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/smp.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/swi.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/trap.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/README#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/boot.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/commands.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/console.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/help.common#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/interp.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/ls.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/misc.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/module.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/panic.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/README#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/linuxolator/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/linuxolator/src/sys/bsm/audit.h#1 branch .. //depot/projects/linuxolator/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/linuxolator/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/linuxolator/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/00READ#1 branch .. //depot/projects/linuxolator/src/sys/coda/README#1 branch .. //depot/projects/linuxolator/src/sys/coda/TODO#1 branch .. //depot/projects/linuxolator/src/sys/coda/cnode.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_io.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_namecache.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_opstats.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_psdev.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_psdev.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_subr.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_venus.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_venus.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_vnops.c#1 branch .. //depot/projects/linuxolator/src/sys/coda/coda_vnops.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/linuxolator/src/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/linuxolator/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.amd64#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.arm#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.i386#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.ia64#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.pc98#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/linuxolator/src/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/linuxolator/src/sys/conf/NOTES#1 branch .. //depot/projects/linuxolator/src/sys/conf/defines#1 branch .. //depot/projects/linuxolator/src/sys/conf/files#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.amd64#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.arm#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.i386#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.ia64#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.pc98#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#1 branch .. //depot/projects/linuxolator/src/sys/conf/files.sparc64#1 branch .. //depot/projects/linuxolator/src/sys/conf/kern.mk#1 branch .. //depot/projects/linuxolator/src/sys/conf/kern.post.mk#1 branch .. //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#1 branch .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#1 branch .. //depot/projects/linuxolator/src/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/linuxolator/src/sys/conf/ldscript.amd64#1 branch .. //depot/projects/linuxolator/src/sys/conf/ldscript.arm#1 branch .. //depot/projects/linuxolator/src/sys/conf/ldscript.i386#1 branch .. //depot/projects/linuxolator/src/sys/conf/ldscript.ia64#1 branch .. //depot/projects/linuxolator/src/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/linuxolator/src/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/linuxolator/src/sys/conf/makeLINT.mk#1 branch .. //depot/projects/linuxolator/src/sys/conf/makeLINT.sed#1 branch .. //depot/projects/linuxolator/src/sys/conf/newvers.sh#1 branch .. //depot/projects/linuxolator/src/sys/conf/options#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.amd64#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.arm#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.i386#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.ia64#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.pc98#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.powerpc#1 branch .. //depot/projects/linuxolator/src/sys/conf/options.sparc64#1 branch .. //depot/projects/linuxolator/src/sys/conf/systags.sh#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_red.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 9 18:26:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2640E16A47B; Sat, 9 Sep 2006 18:26:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E941B16A40F for ; Sat, 9 Sep 2006 18:26:31 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8105743D46 for ; Sat, 9 Sep 2006 18:26:31 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89IQVBd088776 for ; Sat, 9 Sep 2006 18:26:31 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89IQVlx088773 for perforce@freebsd.org; Sat, 9 Sep 2006 18:26:31 GMT (envelope-from netchild@freebsd.org) Date: Sat, 9 Sep 2006 18:26:31 GMT Message-Id: <200609091826.k89IQVlx088773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 105905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 18:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=105905 Change 105905 by netchild@netchild_magellan on 2006/09/09 18:25:49 Add a README which points to more info on the wiki about the status of this branch. Affected files ... .. //depot/projects/linuxolator/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 9 18:56:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FEE716A415; Sat, 9 Sep 2006 18:56:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC5FA16A407 for ; Sat, 9 Sep 2006 18:56:09 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E2B143D4C for ; Sat, 9 Sep 2006 18:56:09 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89Iu9O0090216 for ; Sat, 9 Sep 2006 18:56:09 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89Iu9lN090213 for perforce@freebsd.org; Sat, 9 Sep 2006 18:56:09 GMT (envelope-from netchild@freebsd.org) Date: Sat, 9 Sep 2006 18:56:09 GMT Message-Id: <200609091856.k89Iu9lN090213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 105906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 18:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=105906 Change 105906 by netchild@netchild_magellan on 2006/09/09 18:56:01 Current Linux getsockopt() does not support SO_PEERCRED option used to fetch UNIX domain socket peer PID, UID and GID. Without this option ORACLE 10i Express Edition lsnrctl is unable to issue commands to a running listener (including "status" and "stop"). All invocations result in the message: TNS-01189: The listener could not authenticate the user Linux lsnrctl using so called "OS Authentication" mode probes if UNIX socket connection peer is the process run under to privileged "dba" group (or another group listed in the DBA_GROUP parameter of the $ORACLE_HOME/network/admin/listener.ora file). Security of this patch is not tested. Known problem: Peer PID recognition is not done, we always return zero. PR: 102956 Submitted by: Marcin Cieslak Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#2 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -659,6 +659,7 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 +#define LINUX_SO_PEERCRED 17 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -49,6 +50,7 @@ #include #include #include +#include #include #include @@ -292,6 +294,8 @@ return (SO_OOBINLINE); case LINUX_SO_LINGER: return (SO_LINGER); + case LINUX_SO_PEERCRED: + return (LOCAL_PEERCRED); } return (-1); } @@ -1171,7 +1175,13 @@ caddr_t val; int *avalsize; } */ bsd_args; - int error, name; + struct linux_ucred { + uint32_t pid; + uint32_t uid; + uint32_t gid; + } linux_ucred; + struct xucred xuc; + int error, name, optlen, rc, xuclen; if ((error = copyin(args, &linux_args, sizeof(linux_args)))) return (error); @@ -1193,12 +1203,43 @@ name = -1; break; } - if (name == -1) + if (name == -1) { + log(LOG_WARNING, "LINUX: 'getsockopt' level=0x%04x" + "optname=0x%04x not implemented\n", + linux_args.level, linux_args.optname); return (EINVAL); + }; bsd_args.name = name; - bsd_args.val = PTRIN(linux_args.optval); - bsd_args.avalsize = PTRIN(linux_args.optlen); + if (bsd_args.level == SOL_SOCKET && name == LOCAL_PEERCRED) { + if ((error = copyin(PTRIN(linux_args.optval), + &linux_ucred, sizeof(linux_ucred)))) + return (error); + if ((error = copyin(PTRIN(linux_args.optlen), + &optlen, sizeof(optlen)))) + return (error); + if (optlen < sizeof(linux_ucred)) + return (EFAULT); + xuclen = sizeof(xuc); + if ((rc = error = kern_getsockopt(td, bsd_args.s, + 0, bsd_args.name, + (caddr_t) &xuc, UIO_SYSSPACE, &xuclen))) + return (error); + if (xuc.cr_version != XUCRED_VERSION) + return (EINVAL); + /* XXX get PID */ + linux_ucred.pid = 0; + linux_ucred.uid = xuc.cr_uid; + linux_ucred.gid = xuc.cr_gid; + if ((error = copyout(&linux_ucred, + PTRIN(linux_args.optval), sizeof(linux_ucred)))) + return (error); + return (rc); + } else { + bsd_args.val = PTRIN(linux_args.optval); + bsd_args.avalsize = PTRIN(linux_args.optlen); + return (getsockopt(td, &bsd_args)); + } if (name == IPV6_NEXTHOP) { error = getsockopt(td, &bsd_args); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#2 (text+ko) ==== @@ -633,6 +633,7 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 +#define LINUX_SO_PEERCRED 17 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 From owner-p4-projects@FreeBSD.ORG Sat Sep 9 18:59:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A8BB16A47E; Sat, 9 Sep 2006 18:59:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59CB616A412 for ; Sat, 9 Sep 2006 18:59:21 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D28D43D78 for ; Sat, 9 Sep 2006 18:59:14 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89IxDSS090350 for ; Sat, 9 Sep 2006 18:59:13 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89IxDYC090344 for perforce@freebsd.org; Sat, 9 Sep 2006 18:59:13 GMT (envelope-from netchild@freebsd.org) Date: Sat, 9 Sep 2006 18:59:13 GMT Message-Id: <200609091859.k89IxDYC090344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 105907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 18:59:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=105907 Change 105907 by netchild@netchild_magellan on 2006/09/09 18:58:45 Simplify the if/else tingle-tangle a little bit. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#3 (text+ko) ==== @@ -1238,14 +1238,12 @@ } else { bsd_args.val = PTRIN(linux_args.optval); bsd_args.avalsize = PTRIN(linux_args.optlen); - return (getsockopt(td, &bsd_args)); } - if (name == IPV6_NEXTHOP) { - error = getsockopt(td, &bsd_args); + error = getsockopt(td, &bsd_args); + + if (name == IPV6_NEXTHOP) bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.val); - } else - error = getsockopt(td, &bsd_args); return (error); } From owner-p4-projects@FreeBSD.ORG Sat Sep 9 19:00:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F12216A4D2; Sat, 9 Sep 2006 19:00:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2300F16A4A7 for ; Sat, 9 Sep 2006 19:00:39 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F82D43D5A for ; Sat, 9 Sep 2006 19:00:15 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89J0FP0090413 for ; Sat, 9 Sep 2006 19:00:15 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89J0FVr090410 for perforce@freebsd.org; Sat, 9 Sep 2006 19:00:15 GMT (envelope-from netchild@freebsd.org) Date: Sat, 9 Sep 2006 19:00:15 GMT Message-Id: <200609091900.k89J0FVr090410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 105908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 19:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=105908 Change 105908 by netchild@netchild_magellan on 2006/09/09 19:00:08 Style Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -1205,25 +1205,25 @@ } if (name == -1) { log(LOG_WARNING, "LINUX: 'getsockopt' level=0x%04x" - "optname=0x%04x not implemented\n", - linux_args.level, linux_args.optname); + "optname=0x%04x not implemented\n", + linux_args.level, linux_args.optname); return (EINVAL); }; bsd_args.name = name; if (bsd_args.level == SOL_SOCKET && name == LOCAL_PEERCRED) { if ((error = copyin(PTRIN(linux_args.optval), - &linux_ucred, sizeof(linux_ucred)))) + &linux_ucred, sizeof(linux_ucred)))) return (error); if ((error = copyin(PTRIN(linux_args.optlen), - &optlen, sizeof(optlen)))) + &optlen, sizeof(optlen)))) return (error); if (optlen < sizeof(linux_ucred)) return (EFAULT); xuclen = sizeof(xuc); if ((rc = error = kern_getsockopt(td, bsd_args.s, - 0, bsd_args.name, - (caddr_t) &xuc, UIO_SYSSPACE, &xuclen))) + 0, bsd_args.name, + (caddr_t) &xuc, UIO_SYSSPACE, &xuclen))) return (error); if (xuc.cr_version != XUCRED_VERSION) return (EINVAL); @@ -1232,7 +1232,7 @@ linux_ucred.uid = xuc.cr_uid; linux_ucred.gid = xuc.cr_gid; if ((error = copyout(&linux_ucred, - PTRIN(linux_args.optval), sizeof(linux_ucred)))) + PTRIN(linux_args.optval), sizeof(linux_ucred)))) return (error); return (rc); } else { From owner-p4-projects@FreeBSD.ORG Sat Sep 9 22:55:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AE8016A47B; Sat, 9 Sep 2006 22:55:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EC5B16A416 for ; Sat, 9 Sep 2006 22:55:15 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50D5543D5A for ; Sat, 9 Sep 2006 22:55:11 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89MtBD5024221 for ; Sat, 9 Sep 2006 22:55:11 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89MtAfm024217 for perforce@freebsd.org; Sat, 9 Sep 2006 22:55:10 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 9 Sep 2006 22:55:10 GMT Message-Id: <200609092255.k89MtAfm024217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 105913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Sep 2006 22:55:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=105913 Change 105913 by soc-andrew@soc-andrew_serv on 2006/09/09 22:54:56 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#51 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/alpha/boot_crunch.conf#3 delete .. //depot/projects/soc2005/bsdinstaller/src/release/alpha/mkisoimages.sh#2 delete .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/examples/Makefile.relnotesng#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#13 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/kernels-install.sh#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/lib32-install.sh#1 branch .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#5 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/proflibs-install.sh#2 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.314 2006/05/17 09:33:05 phk Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.320 2006/09/02 20:58:37 marcel Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -18,6 +18,10 @@ aout .. .. + dtrace + .. + engines + .. .. libdata gcc @@ -669,12 +673,12 @@ cat3 .. cat4 - alpha - .. amd64 .. i386 .. + powerpc + .. sparc64 .. .. @@ -685,8 +689,6 @@ cat7 .. cat8 - alpha - .. amd64 .. i386 @@ -706,12 +708,12 @@ cat3 .. cat4 - alpha - .. amd64 .. i386 .. + powerpc + .. sparc64 .. .. @@ -722,8 +724,6 @@ cat7 .. cat8 - alpha - .. amd64 .. i386 @@ -782,12 +782,12 @@ man3 .. man4 - alpha - .. amd64 .. i386 .. + powerpc + .. sparc64 .. .. @@ -798,8 +798,6 @@ man7 .. man8 - alpha - .. amd64 .. i386 ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.911 2006/06/09 03:40:04 cperciva Exp $ +# $FreeBSD: src/release/Makefile,v 1.913 2006/09/08 19:54:36 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -206,17 +206,6 @@ MFSSIZE= 4320 MFSINODE= 8000 MFSLABEL= minimum3 -.elif ${TARGET_ARCH} == "alpha" -MAKE_FLOPPIES= true -FLOPPYSIZE= 1440 -FLOPPYSPLITSIZE= 1392 -FLOPPYINODE= 40000 -FLOPPYLABEL= fd1440 -BOOTINODE= 80000 -MFSSIZE= 4320 -MFSINODE= 8000 -MFSLABEL= auto -SPLIT_MFSROOT= .elif ${TARGET_ARCH} == "sparc64" DISKLABEL= sunlabel MFSSIZE= 4096 @@ -1244,7 +1233,7 @@ @mkdir -p ${RD}/dists/${TD} .if !defined(BSDINSTALLER) @( cd ${SD} && \ - tn=`echo ${TN} | tr 'A-Z' 'a-z' | cut -c1-8` && \ + tn=`echo ${TN} | tr 'A-Z' 'a-z'` && \ echo rolling ${TD}/$$tn tarball &&\ tar --exclude CVS --exclude obj --exclude BOOTMFS -cf - ${ARG} | \ ${ZIPNSPLIT} ${RD}/dists/${TD}/$$tn. && \ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#10 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.301 2006/05/14 01:55:06 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.304 2006/07/25 05:13:52 brueffer Exp $ Supported Devices @@ -248,10 +248,10 @@ &hwlist.lge; + &hwlist.mxge; + &hwlist.my; - &hwlist.myri10ge; - &hwlist.nge; &hwlist.nve; @@ -276,6 +276,8 @@ &hwlist.ste; + &hwlist.stge; + &hwlist.ti; &hwlist.tl; @@ -684,6 +686,8 @@ &hwlist.snd.emu10k1; + &hwlist.snd.envy24; + &hwlist.snd.es137x; &hwlist.snd.ess; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../../.. @@ -11,7 +11,7 @@ # SGML content SRCS+= article.sgml -# SRCS+= proc-ia64.sgml +SRCS+= proc-ia64.sgml SRCS+= ../common/hw.ent SRCS+= ../common/artheader.sgml SRCS+= ../common/dev.sgml ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Systems @@ -76,6 +76,9 @@ SPARCEngine Ultra AXmp + Ultra 1 (serial console) + + Ultra 1E @@ -127,9 +130,6 @@ All systems containing UltraSPARC III processor(s). - - Ultra 1 - ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/installation/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.938 2006/05/31 23:49:51 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.974 2006/09/07 23:49:26 bmah Exp $ 2000 @@ -192,6 +192,26 @@ security advisory FreeBSD-SA-06:16.smbfs. &merged; + A potential denial of service problem in &man.sendmail.8; + caused by excessive recursion which leads to stack + exhaustion when attempting delivery of a malformed + MIME message, has been fixed. For more details, + see security advisory FreeBSD-SA-06:17.sendmail. &merged; + + A potential buffer overflow condition in &man.sppp.4; has + been corrected. For more details, see security advisory + FreeBSD-SA-06:18.ppp. &merged; + + An OpenSSL bug related to validation of PKCS#1 v1.5 + signatures has been fixed. For more details, see security + advisory + FreeBSD-SA-06:19.openssl. &merged; + + A potential denial of service attack against &man.named.8; + has been fixed. For more details, see security advisory + FreeBSD-SA-06:20.bind. &merged; + @@ -207,6 +227,19 @@ extreme precaution, as disabling automatic fan control might overheat the hardware and lead to permanent damage. + The &man.apm.4; suspend/resume support has been improved. + + Security event auditing is now supported in the &os; kernel, + and is enabled by the AUDIT kernel + configuration option. More information can be found in the + &man.audit.4; manual page. + + The options COMPAT_43 kernel + configuration option has been deemed unnecessary and has been + removed from GENERIC and related kernel + configurations. This change may result in a small performance + increase for some workloads. + The &man.ddb.4; debugger now provides the show lock command. If the argument has a valid lock class, this displays various information about the lock and calls a @@ -219,13 +252,17 @@ for a sleep queue associated with that wait channel. DEFAULTS kernel configuration files - for each platform have been added. &merged; + for each platform have been added. These files contain + directives that are implicitly included in all kernel + configurations, and generally include basic, mandatory + functionality for each platform. &merged; - A bug in file descriptor handling such that simple + A bug in file descriptor handling such that a simple close(0); dup(fd) sequence does not return descriptor 0 in some cases, has been fixed. - The &man.firmware.9; subsystem has been added. This allows + The &man.firmware.9; subsystem has been added. This + subsystem provides a mechanism to load binary data into the kernel via a specially crafted module. &merged; @@ -240,49 +277,47 @@ &man.hwpmc.4; and &man.pmcstat.8; now support profiling of dynamically loaded kernel modules and - dlopen()'ed shared objects. + shared objects loaded with &man.dlopen.3;. &man.pmcstat.8; can now log over a network socket to a remote host. The &man.random.4; entropy device driver is now MPSAFE. &merged; + &os; now supports concurrent &man.read.2;/&man.readv.2; + access to a file. + + The experimental CORE process scheduler has been added, + enabled with the options SCHED_CORE kernel + configuration option. It is forked from the &man.sched.ule.4; + scheduler, but + with a different algorithm for detecting an interactive process. + More information can be found in the &man.sched.core.4; manual + page. + The SIGCHLD signal queuing has been added. For each child process whose status has been changed, - a SIGCHLD instance is queued. If the signal is still pending, + a SIGCHLD instance is queued. If the signal is still pending, and the process changed status several times, the signal information is updated to reflect the latest process status. There is a loader tunable kern.sigqueue.queue_sigchild which can control the behavior, setting it to zero disables the SIGCHLD queuing feature. - Instead of dumping the whole physical - memory, the kernel now defaults to dump only pages that are - actively mapped into kvm. A new sysctl variable - debug.minidump - can be used to turn off this behavior when set to zero. + Instead of including all of physical + memory in a kernel crash dump, the kernel now defaults to dumping only pages that are + actively mapped into kernel virtual memory. A new + debug.minidump sysctl variable + can be used to turn off this behavior when set to zero. &merged; A new sysctl variable kern.malloc_stats - has been added. This allows to export kernel malloc + has been added. This allows exporting of kernel malloc statistics via a binary structure stream. - A new sysctl variable kern.elf[32|64].can_exec_dyn - has been added. This allows to execute a ET_DYN binary - (shared object) when the variable is set to 1. - This is set to 0 by default and useful for some - Linux scripts which expect to be able to execute - /lib/ld-linux.so.2. - - A new sysctl variable kern.elf[32|64].can_exec_dyn - has been removed. Instead the brandinfo - structure has been extended to be able to provide the - BI_CAN_EXEC_DYN flag for all brands that usually - allow executing ELF dynamic binaries. - A new sysctl variable kern.forcesigexit has been added. This forces a process to sigexit if a trap signal is being held by the current thread or - ignored by the current process and is enabled by default. + ignored by the current process. It is enabled by default. Support for Linux emulation on the Alpha platform has been removed, due to the lack of a @@ -293,9 +328,9 @@ has been removed, as it had fallen out of sync with the rest of the kernel. - RedZone, a buffer corruption protection for kernel &man.malloc.9; - facility has been implemented. This detects both of buffer underflows and - buffer overflows bugs at runtime on &man.free.9; and &man.realloc.9;, + RedZone, a buffer corruption protection for the kernel &man.malloc.9; + facility has been implemented. This detects both buffer underflows and + overflows at runtime on &man.free.9; and &man.realloc.9;, and prints backtraces from where memory was allocated and from where it was freed. For more details, see the &man.redzone.9; manual page. @@ -304,7 +339,7 @@ biba/equal(equal-equal), has been added. This is useful where programs such as &man.dhclient.8; and &man.ppp.8;. which initialize network interfaces do not have any labeling support. - This variable is set as 0(disabled) by default. + This variable is set as 0 (disabled) by default. &merged; A new sysctl variable vm.zone_stats @@ -333,9 +368,10 @@ An experimental support for POSIX message queue has been implemented. - The support for Xbox, whose architecture is nearly identical - has been added. For details of the latest development, - see . + &os; now runs on the Xbox, whose architecture is nearly identical + to the i386. For details of the latest development, see + . + &merged; Boot Loader Changes @@ -349,28 +385,45 @@ A new loader tunable comconsole_speed to change the serial console speed has been added. - If the previous stage boot loader requested a serial console + If the previous stage boot loader requested a serial console, then the default speed is determined from the current serial port - speed, and otherwise it is set to 9600 or the value of - the kernel option BOOT_COMCONSOLE_SPEED - at compile time. &merged; + speed. Otherwise it is set to 9600 or the value of + the BOOT_COMCONSOLE_SPEED kernel option. + &merged; A bootable CDROM loader has been implemented - for the pc98 platform. + for the pc98 platform. &merged; + + A bug in the i386 boot loader, which could + cause filesystem corruption if + a nextboot.conf file was used and landed + after cylinder 1023, has been fixed. + Hardware Support - A &man.acpi.dock.4; driver has been added to provide + The &man.amdsmb.4; driver has been added. It provides + support for the AMD-8111 SMBus 2.0 controller. &merged; + + The &man.cardbus.4;, &man.pccard.4;, + &man.pccbb.4;, and &man.exca.4; drivers are now buildable + as kernel modules. + + An &man.acpi.dock.4; driver has been added to provide support for controlling laptop docking station functions via ACPI. The &man.acpi.thermal.4; driver now supports passive cooling. &merged; + The &man.acpi.thermal.4; driver now supports overriding + the _PSV, _HOT, and + _CRT temperature values. + @@ -387,11 +440,14 @@ The est &man.cpufreq.4; driver now supports frequency control for the VIA C7-M family of processors. - Support for the PadLock Security Co-processor in VIA C3 + Support for the PadLock Security Co-processor in VIA C3, + Eden, and C7 processors has been added to the &man.crypto.9; subsystem. + More information can be found in the &man.padlock.4; manual + page. &merged; - A bug which prevents the &man.ichsmb.4; kernel module + A bug which prevented the &man.ichsmb.4; kernel module from unloading has been fixed. Dual-core processors (such as the Intel @@ -402,7 +458,7 @@ has been added. OpenIPMI (Intelligent Platform Management Interface) is an open standard designed to enable remote monitoring and control of server, - networking and telecommunication platforms. + networking and telecommunication platforms. &merged; The &man.kbdmux.4; driver has been integrated into &man.syscons.4; and the kbd device driver. @@ -413,13 +469,16 @@ or at runtime via &man.kldload.8; and releasing the active keyboard. &merged; - The &man.kbdmux.4; driver has been included in the + The &man.kbdmux.4; driver is now included in the GENERIC kernel by default. Also, the Boot FreeBSD with USB keyboard menu item in the boot loader menu has been removed since this fixes USB keyboard probing problems. &merged; + The &man.nfsmb.4; driver, which supports the NVIDIA nForce + 2/3/4 SMBus 2.0 controller, has been added. &merged; + The loader tunable debug.mpsafevfs is set to 1 by default. @@ -434,22 +493,22 @@ The smbios(4) driver support for amd64 has been added. - The tnt4882(4) driver which supports National Instruments - PCI-GPIB card has been added. + The tnt4882(4) driver, which supports the National Instruments + PCI-GPIB card, has been added. The &man.uart.4; driver has been included in the GENERIC kernel by default. - When both &man.sio.4; and &man.uart.4; can handle a serial port, + When both &man.sio.4; and &man.uart.4; can handle a given serial port, &man.sio.4; will claim it. The &man.uart.4; driver now supports LOM (Lights Out Management) - and RSC (Remote System Control) devices as console. + and RSC (Remote System Control) devices as consoles. A new loader tunable hw.apic.enable_extint has been added. - This tunable can be used not to mask the ExtINT pin on the first - I/O APIC. At least one chipset for Intel Pentium III seems - to need this even though all of the pins in the 8259A's are masked. + This tunable can be used to disable masking of the ExtINT pin on the first + I/O APIC. At least one chipset for the Intel Pentium III seems + to need this, even though all of the pins in the 8259As are masked. The default is still to mask the ExtINT pin. Support has been improved for @@ -460,9 +519,13 @@ Multimedia Support - The &man.agp.4; driver now supports ATI IGP chipsets. + The &man.agp.4; driver now supports ATI AGP chipsets. &merged; + The new midi(4) driver which is based on NetBSD's one + has been added. This supports &man.snd.cmi.4; and + &man.snd.emu10k1.4; drivers. + The &man.sound.4; driver now supports wider range sampling rate, multiple precisions choice, and 24/32 bit PCM format conversion. &merged; @@ -477,6 +540,13 @@ The &man.snd.cmi.4; driver is now MPSAFE. + The &man.snd.emu10kx.4; driver has been added. It + supports Creative SoundBlaster Live! and Audigy series sound + cards with optional pseudo-multichannel playback. + + The &man.snd.envy24.4; driver has been added to support + the Envy24 series of audio chips. + The &man.snd.es137x.4; driver is now MPSAFE. &merged; The &man.snd.ich.4; driver is now MPSAFE. &merged; @@ -497,9 +567,14 @@ Network Interface Support The &man.ath.4; driver has been updated to - version 0.9.16.16. &merged; + HAL version 0.9.17.2. &merged; + + The &man.ath.4;, &man.ath.hal.4;, and + ath_rate_sample drivers have been + included in the GENERIC kernel by + default. &merged; - The &man.bce.4; driver, which supports Broadcom + The &man.bce.4; driver, which supports Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers, has been added. For more details, see &man.bce.4;. &merged; @@ -514,6 +589,8 @@ The &man.bge.4; driver now supports &man.polling.4; mode. &merged; + The &man.cm.4; driver is now MPSAFE. + The &man.dc.4; driver is now MPSAFE. &merged; The &man.de.4; driver has been converted to the &man.bus.dma.9; @@ -521,14 +598,15 @@ The &man.ed.4; driver is now MPSAFE. - The &man.el.4; driver has been removed. + The &man.el.4; driver has been removed due to lack of use. The &man.em.4; driver now supports big-endian architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 5.1.5 from Intel. Among other changes, it now supports - 82571 and 82572 based adapters. + version 6.1.4 from Intel. Among other changes, it now supports + 80003, 82571, 82571EB and 82572 based adapters, as well as + onboard-NICs on ICH8-based motherboards. &merged; The &man.em.4; driver now includes initial support for suspend and resume features. @@ -542,12 +620,21 @@ The &man.iwi.4; driver now supports big-endian architectures such as sparc64. + A number of improvements and bugfixes have been made to the + functionality of the &man.iwi.4; driver. This driver now + requires the firmware image in the + net/iwi-firmware-kmod + port/package; prior versions of this driver used the + net/iwi-firmware + port/package. &merged; + The &man.le.4; driver, which supports AMD Am7900 LANCE - and Am79C9xx PCnet NICs and is based on NetBSD's implementation, + and Am79C9xx PCnet NICs, has been added. While the &man.lnc.4; driver also supports these NICs, this driver has several advantages over it such as MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI - variants. &merged; + variants. This driver is based on NetBSD's implementation. + &merged; The &man.lge.4; driver is now MPSAFE. &merged; @@ -557,13 +644,19 @@ The &man.my.4; driver is now MPSAFE. &merged; - The &man.myri10ge.4; driver, + The &man.my.4; driver now supports &man.altq.4;. &merged; + + The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet adapters, has been added. For more details, see - &man.myri10ge.4;. + &man.mxge.4;. + + The &man.nfe.4; driver, an open-source driver for nForce + Ethernet devices, has been added, originally from + OpenBSD. The &man.nve.4; driver has been updated to version 1.0-0310 - (23-Nov-2005). It also now has &man.altq.4; support. + (23-Nov-2005). It also now has &man.altq.4; support. &merged; The &man.pcn.4; driver is now MPSAFE. &merged; @@ -572,9 +665,13 @@ The &man.sf.4; driver is now MPSAFE. &merged; - The &man.sk.4; driver is now MPSAFE. + The &man.sk.4; driver is now MPSAFE. &merged; + + The &man.ste.4; driver is now MPSAFE. &merged; - The &man.ste.4; driver is now MPSAFE. + The &man.stge.4; driver has been added. It supports the + Sundance/Tamarack TC9021 Gigabit Ethernet controller and was + ported from NetBSD. &merged; The &man.ti.4; driver now supports big-endian architectures such as sparc64. @@ -592,43 +689,63 @@ &man.acpi.video.4;, and &man.agp.4; can attach to it thus allowing multiple drivers for the same device. + The &man.wi.4; driver is now buildable as + a kernel module. + + The &man.wlan.wep.4;, + &man.wlan.ccmp.4;, and &man.wlan.tkip.4; drivers + have been included in the GENERIC + kernel by default. + + The network interface groups feature has been imported + from OpenBSD. This feature allows an administrator to, for + example, apply firewall rules to an entire group of + interfaces. More information can be found in + &man.ifconfig.8;. + Network Protocols - The &man.arp.8; retransmission algorithm has been - rewritten as that ARP requests are retransmitted without + The &man.arp.4; retransmission algorithm has been + rewritten so that ARP requests are retransmitted without suppression, while there is demand for such ARP entry. Due to this change, a sysctl variable net.link.ether.inet.host_down_time has been removed. &merged; - The &man.arp.8; now supports a sysctl variable + The &man.arp.4; protocol now supports a sysctl variable net.link.ether.inet.log_arp_permanent_modify to suppress logging of attempts to modify permanent ARP entries. &merged; - The &man.arp.8; utility now allows the - option together with the and options - to allow all entries for a given interface to be removed. - An experimental BPF Just-In-Time compiler - has been implemented. To enable this, - options BPF_JITTER kernel option is needed, - and a sysctl variable net.bpf.jitter.enable + has been implemented for both &man.bpf.4; and &man.ng.bpf.4;. + To enable this, the + options BPF_JITTER kernel option is needed. + The net.bpf_jitter.enable can be used to disable this feature. + Multiple copies of a packet received via different + &man.bpf.4; listeners now all have identical + timestamps. &merged; + The bridge(4) driver has been removed from the tree. Its functionality has been completely replaced by &man.if.bridge.4;. + The &man.enc.4; IPsec filtering pseudo-device has been + added. It allows firewall packages using the &man.pfil.9; + framework to examine (and filter) IPsec traffic before + outbound encryption and after inbound decryption. &merged; + The &man.gre.4; driver, which is for GRE encapsulation found in RFC 1701 and RFC 1702, now supports IPv6 over GRE. The &man.if.bridge.4; driver now supports - creating span ports, which transmit a copy of every frame + creating SPAN ports, which transmit a copy of every frame received by the bridge. This feature can be enabled by using &man.ifconfig.8;. &merged; @@ -643,15 +760,15 @@ memberships (formerly 20) has been removed. The path MTU discovery for multicast packets in the &os; - &man.ip6.4; stack has been disabled by default because - notifying path MTU by a lot of routers in multicast + IPv6 stack has been disabled by default. + Path MTU notification from a large number of multicast routers can be a kind of distributed Denial-of-Service attack to a router. This feature can be re-enabled by using a new sysctl variable net.inet6.ip6.mcast_pmtu. &merged; The &man.ipfw.4; IP packet filter now supports IPv6. &merged; - The &man.ipfw.4; now supports substitution of the action + The &man.ipfw.4; firewall system now supports substitution of the action argument with the value obtained from table lookup, which allows some optimization of rulesets. This is now applicable only to pipe, @@ -669,17 +786,29 @@ table 1 add x.x.x.y 4000 pipe tablearg ip from table(1) to any + The &man.ipfw.4; packet filter now supports + tag and untag rule keywords. + When a packet matches a rule with the tag + keyword, the numeric tag for the given number in the range + from 0 to 65535 will be attached to the packet. + The tag acts as an internal marker (it is not sent out over + the wire) that can be used to identify these packets later on, + for example, by using tagged + rule option. For more details, see &man.ipfw.8;. + + The IPFIREWALL_FORWARD_EXTENDED kernel + option has been removed. This option was used to permit + &man.ipfw.4; to redirect packets with local destinations. + This behavior is now always enabled when + the IPFIREWALL_FORWARD kernel option is + enabled. &merged; + The ip6fw(8) packet filter has been removed. Since &man.ipfw.4; has gained IPv6 support, it should be used instead. Please note that some rules might need to be adjusted. The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE. - The &man.ng.bpf.4; Netgraph node now supports BPF Just-In-Time compiler. - Also, the sysctl has been changed from net.bpf.jitter.enable - to net.bpf_jitter.enable and this controls - both &man.bpf.4; and &man.ng.bpf.4; now. - The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged; @@ -687,9 +816,18 @@ when the server sent a FIN. This problem had occurred with Solaris NFS servers. &merged; + The default retransmit timer for NFS over TCP is now 60 seconds. + This change prevents the unnecessary retransmission of + non-idempotent NFS requests. The nfs_access_cache + variable in &man.rc.conf.5; has also been changed to 60. + + The default minimum number of nfsiod kernel threads + (&man.sysctl.8; variable vfs.nfs.iodmin) + has been changed from 4 to 0. + The sysctl variables net.inet.ip.portrange.reservedhigh and net.inet.ip.portrange.reservedlow - can be used with IPv6 now. + can be used with IPv6 now. &merged; A new sysctl variable net.inet.icmp.reply_from_interface has been added. This allows the &man.icmp.4; @@ -716,25 +854,25 @@ A new socket option IP_MINTTL has been added. This may be used to set the minimum acceptable TTL a packet must have when received on a socket. - All packets with a lower TTL are silently dropped, - and this works on already connected/connecting and + All packets with a lower TTL are silently dropped. + This works on already connected/connecting and listening sockets for RAW, UDP, and TCP. This option - is only really useful when set to 255 preventing packets + is only really useful when set to 255, preventing packets from outside the directly connected networks reaching local listeners on sockets. Also, this option allows userland implementation of The Generalized TTL Security Mechanism (GTSM) found in RFC 3682. - The stealth forwarding now supports IPv6 as well as IPv4. + Stealth forwarding now supports IPv6 as well as IPv4. This behavior can be controlled by using a new sysctl variable net.inet6.ip6.stealth. - A bug that IPV6_V6ONLY socket option - does not work for UDP has been fixed. + The IPV6_V6ONLY socket option + now works for UDP. The TCP bandwidth-delay product limiting feature has been disabled when the RTT is below a certain threshold. - This optimization does not make sense on a LAN as it has + This optimization does not make sense on a LAN, as it has trouble figuring out the maximal bandwidth due to the coarse tick granularity. A new sysctl variable net.inet.tcp.inflight.rttthresh specifies @@ -771,16 +909,16 @@ Fasttrak TX4300. &merged; - The &man.ata.4; driver now supports DMA for kernel crash dumps - and crash dumping to an &man.ataraid.4; device. + The &man.ata.4; driver now supports DMA for kernel crash dumps, + as well as crash dumping to an &man.ataraid.4; device. &merged; The &man.ata.4; driver now supports USB mass storage class devices. To enable it, a line device atausb in the kernel configuration file or loading the atausb kernel module is needed. - Note that this conflicts with &man.umass.4; and cannot coexist with - each other. + Note that this functionality cannot coexist with the + &man.umass.4; driver. The &man.ataraid.4; driver now supports JMicron ATA RAID metadata. &merged; @@ -810,12 +948,12 @@ &merged; The GEOM_MIRROR and GEOM_RAID3 - classes now use parallel I/O request for synchronization + classes now use parallel I/O requests for synchronization to improve the performance. New sysctl variables kern.geom.mirror.sync_requests and kern.geom.raid3.sync_requests define how many parallel I/O requests should be used. - Also, sysctl variables + Also, the sysctl variables kern.geom.mirror.reqs_per_sync, kern.geom.mirror.syncs_per_sec, kern.geom.raid3.reqs_per_sync, and @@ -860,7 +998,7 @@ and supports different cryptographic algorithms. See &man.geli.8; for more information. &merged; - The &man.geli.8; now supports loading keyfiles before the root + The &man.geli.8; disk encryption system now supports loading keyfiles before the root file system is mounted. &merged; For example, the following entries can be used in /boot/loader.conf to enable >>> TRUNCATED FOR MAIL (1000 lines) <<<